Merge lp:~mzanetti/reminders-app/fix-black-image-in-editor into lp:reminders-app

[Michael Zanetti]

scale down images for the rtf editor

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:339
http://91.189.93.70:8080/job/reminders-app-ci/642/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1054
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1054/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/63

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/642/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

See inline comment

review: Needs Information

[Michael Zanetti (mzanetti)]

See inline reply :)

[Riccardo Padovani (rpadovani)]

Thanks for the explanation :-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/384/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2065/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/106/console

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/fix-black-image-in-editor]

340. By Michael Zanetti on 2015-02-20

merge trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/libqtevernote/resource.cpp'
--- src/libqtevernote/resource.cpp	2014-12-08 10:25:48 +0000
+++ src/libqtevernote/resource.cpp	2015-02-20 18:30:26 +0000
@@ -121,11 +121,11 @@
         if (!fi.exists()) {
             QImage image(m_filePath);
             if (size.height() > 0 && size.width() > 0) {
-                image = image.scaled(size);
+                image = image.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
             } else if (size.height() > 0) {
-                image = image.scaledToHeight(size.height());
+                image = image.scaledToHeight(size.height(), Qt::SmoothTransformation);
             } else {
-                image = image.scaledToWidth(size.width());
+                image = image.scaledToWidth(size.width(), Qt::SmoothTransformation);
             }
             image.save(finalFilePath);
         }

=== modified file 'src/libqtevernote/resourceimageprovider.cpp'
--- src/libqtevernote/resourceimageprovider.cpp	2015-02-12 22:57:46 +0000
+++ src/libqtevernote/resourceimageprovider.cpp	2015-02-20 18:30:26 +0000
@@ -26,9 +26,11 @@
 
     QImage image;
     if (mediaType.startsWith("image")) {
-        qDebug() << "image requested" << NotesStore::instance()->note(noteGuid)->resource(resourceHash);
-        image = QImage::fromData(NotesStore::instance()->note(noteGuid)->resource(resourceHash)->imageData(requestedSize));
-        qDebug() << "done...";
+        QSize tmpSize = requestedSize;
+        if (!requestedSize.isValid() || requestedSize.width() > 1024 || requestedSize.height() > 1024) {
+            tmpSize = QSize(1024, 1024);
+        }
+        image = QImage::fromData(NotesStore::instance()->note(noteGuid)->resource(resourceHash)->imageData(tmpSize));
     } else if (mediaType.startsWith("audio")) {
         image.load("/usr/share/icons/ubuntu-mobile/actions/scalable/media-playback-start.svg");
     } else {