Merge lp:~fboucault/thumbnailer/thumbnail_qml_provider_respects_size into lp:thumbnailer

[Florian Boucault]

QML thumbnail provider: make sure sourceSize (aka requestedSize) is respected by downscaling at loading time if necessary. Makes TN_SIZE_ORIGINAL case much faster.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/113/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[Jussi Pakkanen (jpakkane)]

The build failure is unrelated. I kicked jenkins for a rebuild.

As far the code is concerned, it looks fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/115/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-armhf-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-i386-ci/7

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp	2015-01-05 09:28:03 +0000
+++ plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp	2015-01-15 10:41:44 +0000
@@ -21,6 +21,7 @@
 #include <QDebug>
 #include <QMimeDatabase>
 #include <QUrl>
+#include <QImageReader>
 
 static const char *DEFAULT_VIDEO_ART = "/usr/share/thumbnailer/icons/video_missing.png";
 static const char *DEFAULT_ALBUM_ART = "/usr/share/thumbnailer/icons/album_missing.png";
@@ -61,7 +62,23 @@
         if(!tgt_path.empty()) {
             QString tgt(tgt_path.c_str());
             QImage image;
-            image.load(tgt);
+            QImageReader reader;
+            reader.setFileName(tgt);
+            QSize imageSize = reader.size();
+            if (!requestedSize.isNull() &&
+                (imageSize.width() > requestedSize.width() ||
+                 imageSize.height() > requestedSize.height())) {
+                QSize validRequestedSize = requestedSize;
+                if (validRequestedSize.width() == 0) {
+                    validRequestedSize.setWidth(imageSize.width());
+                }
+                if (validRequestedSize.height() == 0) {
+                    validRequestedSize.setHeight(imageSize.height());
+                }
+                imageSize.scale(validRequestedSize, Qt::KeepAspectRatio);
+                reader.setScaledSize(imageSize);
+            }
+            image = reader.read();
             *realSize = image.size();
             return image;
         }