summaryrefslogtreecommitdiff
path: root/src/PhotoPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-12-29 18:43:43 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-12-29 18:43:43 +0100
commit14bc7db2e07c5d1ccfb4d723c9dba395e6c93171 (patch)
tree7b00861348dedd18d3651537128bbe783dab364c /src/PhotoPage.vala
parent1bf62485f701b52ae27433e3570ac24cd7da886f (diff)
parent67d142325abb0d9345baef77f00a047a7dc1eca3 (diff)
Merge branch 'release/debian/0.32.4-1'HEADdebian/0.32.4-1master
Diffstat (limited to 'src/PhotoPage.vala')
-rw-r--r--src/PhotoPage.vala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index a279d89..5e94c24 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -966,7 +966,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return photo.has_transformations() || photo.has_editable();
}
- private void on_pixbuf_fetched(Photo photo, Gdk.Pixbuf? pixbuf, Error? err) {
+ private void on_pixbuf_fetched(Photo photo, owned Gdk.Pixbuf? pixbuf, Error? err) {
// if not of the current photo, nothing more to do
if (!photo.equals(get_photo()))
return;
@@ -986,7 +986,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
photo, out tool_pixbuf_dim);
if (tool_pixbuf != null) {
- pixbuf = tool_pixbuf;
+ pixbuf = tool_pixbuf;
max_dim = tool_pixbuf_dim;
}
} catch(Error err) {
@@ -1410,7 +1410,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
Gdk.Pixbuf original;
try {
original = get_photo().get_original_orientation().rotate_pixbuf(
- get_photo().get_prefetched_copy());
+ get_photo().get_master_pixbuf(cache.get_scaling()));
} catch (Error err) {
return;
}