Merge branch 'release/debian/0.32.4-1'HEADdebian/0.32.4-1master

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;
         }