Merge lp:~jpakkane/thumbnailer/manual-orient into lp:thumbnailer

[Jussi Pakkanen]

Reorient images manually to work around a bug in GdkPixbuf.

Reorient images manually to work around a bug in GdkPixbuf.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/32/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good. Hopefully the workaround can be removed at some point.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-10 09:08:21 +0000
+++ CMakeLists.txt	2014-03-05 09:32:01 +0000
@@ -30,7 +30,7 @@
 
 include(FindPkgConfig)
 pkg_check_modules(GST_DEPS REQUIRED gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-pbutils-1.0 gstreamer-app-1.0)
-pkg_check_modules(IMG_DEPS REQUIRED gdk-pixbuf-2.0)
+pkg_check_modules(IMG_DEPS REQUIRED gdk-pixbuf-2.0 libexif)
 
 include_directories(${GST_DEPS_INCLUDE_DIRS})
 include_directories(${IMG_DEPS_INCLUDE_DIRS})

=== modified file 'debian/control'
--- debian/control	2013-09-30 15:55:07 +0000
+++ debian/control	2014-03-05 09:32:01 +0000
@@ -10,6 +10,7 @@
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
                shared-mime-info,
+               libexif-dev,
 Homepage: https://launchpad.net/thumbnailer
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the

=== modified file 'src/imagescaler.cpp'
--- src/imagescaler.cpp	2014-02-25 09:26:09 +0000
+++ src/imagescaler.cpp	2014-03-05 09:32:01 +0000
@@ -19,6 +19,7 @@
 #include<internal/imagescaler.h>
 #include<internal/gobj_memory.h>
 #include<gdk-pixbuf/gdk-pixbuf.h>
+#include<libexif/exif-loader.h>
 #include<memory>
 #include<stdexcept>
 #include<sys/stat.h>
@@ -49,6 +50,37 @@
     }
 }
 
+static GdkPixbuf* fix_orientation(const char *infile, GdkPixbuf *src) {
+    ExifLoader *l;
+    l = exif_loader_new();
+    ExifData *ed;
+    exif_loader_write_file(l, infile);
+    ed = exif_loader_get_data(l);
+    exif_loader_unref(l);
+    GdkPixbuf *rot = nullptr;
+    // Have to do this manually because of
+    // https://bugzilla.gnome.org/show_bug.cgi?id=725582
+    if(ed) {
+      ExifEntry *e = exif_data_get_entry(ed, EXIF_TAG_ORIENTATION);
+      int orientation = exif_get_short(e->data, exif_data_get_byte_order(ed));
+      if(orientation == 6) {
+        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+      } else if (orientation == 8) {
+        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
+      } else if (orientation == 3) {
+        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
+      } else {
+          // We don't do mirrored images, at least not yet.
+      }
+    }
+    if(!rot) {
+        // This entire function should only contain this call, really.
+      rot = gdk_pixbuf_apply_embedded_orientation(src);
+    }
+    exif_data_unref(ed);
+    return rot;
+}
+
 class ImageScalerPrivate {
 };
 
@@ -68,12 +100,16 @@
     GError *err = nullptr;
     string ofilename_tmp = ofilename;
     ofilename_tmp += ".tmp." + to_string(rnd());
-    unique_gobj<GdkPixbuf> src(gdk_pixbuf_new_from_file(ifilename.c_str(), &err));
+    unique_gobj<GdkPixbuf> orig(gdk_pixbuf_new_from_file(ifilename.c_str(), &err));
     if(err) {
         string msg = err->message;
         g_error_free(err);
         throw runtime_error(msg);
     }
+    unique_gobj<GdkPixbuf> src(fix_orientation(ifilename.c_str(), orig.get()));
+    if(!src) {
+        throw runtime_error("Unknown error reorienting image.");
+    }
     const int w = gdk_pixbuf_get_width(src.get());
     const int h = gdk_pixbuf_get_height(src.get());
     if(w == 0 || h == 0) {

=== modified file 'tests/basic.cpp'
--- tests/basic.cpp	2014-02-20 17:01:39 +0000
+++ tests/basic.cpp	2014-03-05 09:32:01 +0000
@@ -23,6 +23,7 @@
 #include<gdk-pixbuf/gdk-pixbuf.h>
 
 #define TESTIMAGE TESTDATADIR "/testimage.jpg"
+#define ROTTESTIMAGE TESTDATADIR "/testrotate.jpg"
 #define TESTVIDEO TESTDATADIR "/testvideo.ogg"
 
 using namespace std;
@@ -79,6 +80,23 @@
     file_test(tn, imfile);
 }
 
+void rotate_test() {
+    Thumbnailer tn;
+    string imfile(ROTTESTIMAGE);
+    int w, h;
+    assert(file_exists(imfile));
+    string thumbfile = tn.get_thumbnail(imfile, TN_SIZE_LARGE);
+    unlink(thumbfile.c_str());
+    assert(!file_exists(thumbfile));
+    string thumbfile2 = tn.get_thumbnail(imfile, TN_SIZE_LARGE);
+    assert(thumbfile == thumbfile2);
+    assert(file_exists(thumbfile));
+    assert(gdk_pixbuf_get_file_info(imfile.c_str(), &w, &h));
+    assert(w > h); // gdk_pixbuf does not reorient images automatically.
+    assert(gdk_pixbuf_get_file_info(thumbfile.c_str(), &w, &h));
+    assert(h > w); // Has the orientation been straightened during scaling?
+}
+
 void video_test() {
     Thumbnailer tn;
     string videofile(TESTVIDEO);
@@ -155,6 +173,7 @@
 #else
     trivial_test();
     image_test();
+    rotate_test();
     video_test();
     video_original_test();
     size_test();

=== added file 'tests/testrotate.jpg'
Binary files tests/testrotate.jpg	1970-01-01 00:00:00 +0000 and tests/testrotate.jpg	2014-03-05 09:32:01 +0000 differ