summaryrefslogtreecommitdiff
path: root/src/Photo.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2019-07-12 16:16:34 +0200
committerJörg Frings-Fürst <debian@jff.email>2019-07-12 16:16:34 +0200
commite905afb102569e93e2f6ece9a9ab515ac1fd4f04 (patch)
tree56c764f3a3fe3848ef2aa161d143f33cb2eaeb8e /src/Photo.vala
parent71137cc5832110d91599d68790402cf196762ed3 (diff)
parentcb774d1baf242adcc03a1df5eed6d100f7e3bd55 (diff)
Merge branch 'release/debian/0.30.4-1'debian/0.30.4-1
Diffstat (limited to 'src/Photo.vala')
-rw-r--r--src/Photo.vala16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/Photo.vala b/src/Photo.vala
index 0d8e955..ae0f489 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -429,7 +429,7 @@ public abstract class Photo : PhotoSource, Dateable {
// need to remove all transformations as they're keyed to the editable's
// coordinate system
- internal_remove_all_transformations(false);
+ remove_all_transformations(false);
}
}
@@ -1519,7 +1519,7 @@ public abstract class Photo : PhotoSource, Dateable {
row.master = original_master;
row.master.copy_from(reimport_state.row.master);
if (!reimport_state.metadata_only)
- internal_remove_all_transformations(false);
+ remove_all_transformations(false);
}
if (reimport_state.metadata != null)
@@ -1596,7 +1596,7 @@ public abstract class Photo : PhotoSource, Dateable {
lock (row) {
editable = reimport_state.backing_state;
set_orientation(reimport_state.backing_state.original_orientation);
- internal_remove_all_transformations(false);
+ remove_all_transformations(false);
}
} else {
set_orientation(reimport_state.backing_state.original_orientation);
@@ -2820,11 +2820,7 @@ public abstract class Photo : PhotoSource, Dateable {
return committed;
}
- public void remove_all_transformations() {
- internal_remove_all_transformations(true);
- }
-
- private void internal_remove_all_transformations(bool notify) {
+ public void remove_all_transformations(bool notify = true) {
bool is_altered = false;
lock (row) {
is_altered = PhotoTable.get_instance().remove_all_transformations(row.photo_id);
@@ -3907,7 +3903,7 @@ public abstract class Photo : PhotoSource, Dateable {
// transformations are in the master's coordinate system, not the editable's ... don't
// notify photo is altered *yet* because update_editable will notify, and want to avoid
// stacking them up
- internal_remove_all_transformations(false);
+ remove_all_transformations(false);
update_editable(false, file_format.create_reader(file.get_path()));
}
@@ -4077,7 +4073,7 @@ public abstract class Photo : PhotoSource, Dateable {
}
if (remove_transformations)
- internal_remove_all_transformations(false);
+ remove_all_transformations(false);
if (has_editable) {
notify_baseline_replaced();