Merge lp:~jpakkane/thumbnailer/fix-1319698 into lp:thumbnailer/trusty

[Jussi Pakkanen]

SRU backport of patch to make file names with chinese characters work.

SRU backport of patch to make file names with chinese characters work.

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

[lp:~jpakkane/thumbnailer/fix-1319698]

15. By Jussi Pakkanen on 2015-02-05

Added bzr-builddeb conf file to make this branch citrain ready.

[Robert Bruce Park (robru)]

lp:thumbnailer/trusty is an alias to lp:~jpakkane/thumbnailer/trusty, which is a privately owned branch (as opposed to team-owned). As a result of this, CI Train is not able to merge this MP for you. The resulting release branch has been pushed to lp:~ci-train-bot/thumbnailer/latestsnapshot-ubuntu-recup which you must now manually merge into lp:thumbnailer/trusty.

If you intend to do future landings with CI Train and lp:thumbnailer/trusty, please change the branch ownership to a team that contains ~ci-train-bot as a member, such as ~unity-team (the same owner as lp:thumbnailer).

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-02-05 11:42:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'src/imagescaler.cpp'
--- src/imagescaler.cpp	2014-03-19 20:16:40 +0000
+++ src/imagescaler.cpp	2015-02-05 11:42:28 +0000
@@ -137,6 +137,15 @@
         string mtime_str = to_string(mtime);
         save_ok = gdk_pixbuf_save(dst.get(), ofilename_tmp.c_str(), "png", &err,
                 "tEXt::Thumb::URI", uri.c_str(), "tEXt::Thumb::MTime", mtime_str.c_str(), NULL);
+        if(!save_ok) {
+            // Sigh. PNG text chunks are encoded in ISO-8859-1 but this is impossible if
+            // the file name contains e.g. Chinese characters. Fall back to writing the
+            // thumbnail without metadata. This does not conform to the thumbnailing standard
+            // but at least it will give us a working thumbnail.
+            g_error_free(err);
+            err = nullptr;
+            save_ok = gdk_pixbuf_save(dst.get(), ofilename_tmp.c_str(), "png", &err, NULL);
+        }
     }
     if(!save_ok) {
         string msg = err->message;