Merge lp:~fboucault/ubuntu-ui-toolkit/scaling_image_provider_respect_size into lp:ubuntu-ui-toolkit

[Florian Boucault]

UCScalingImageProvider: respect 'requestedSize' parameter. That ensures that the 'sourceSize' property of Image is respected even when the toolkit automatically scales the asset for the device.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1045/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1045

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1045/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

No complains, pretty straight forward :)

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp'
--- modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2012-10-28 02:23:12 +0000
+++ modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2013-04-20 01:20:35 +0000
@@ -38,8 +38,6 @@
 
 QImage UCScalingImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    Q_UNUSED(requestedSize);
-
     int separatorPosition = id.indexOf("/");
     float scaleFactor = id.left(separatorPosition).toFloat();
     QString path = id.mid(separatorPosition+1);
@@ -48,12 +46,25 @@
     if (file.open(QIODevice::ReadOnly)) {
         QImage image;
         QImageReader imageReader(&file);
+        QSize realSize = imageReader.size();
+        QSize scaledSize = realSize;
+        QSize constrainedSize;
+
         if (!qFuzzyCompare(scaleFactor, (float)1.0)) {
-            QSize realSize = imageReader.size();
-            imageReader.setScaledSize(realSize * scaleFactor);
-        }
+            scaledSize = realSize * scaleFactor;
+        }
+        if (requestedSize.isValid() && (requestedSize.width() < realSize.width() || requestedSize.height() < realSize.height())) {
+            constrainedSize = scaledSize.scaled(requestedSize, Qt::KeepAspectRatio);
+        }
+
+        if (constrainedSize.isValid()) {
+            imageReader.setScaledSize(constrainedSize);
+        } else if (scaledSize != realSize) {
+            imageReader.setScaledSize(scaledSize);
+        }
+
         imageReader.read(&image);
-        *size = image.size();
+        *size = scaledSize;
         return image;
     } else {
         return QImage();

=== added file 'tests/unit/tst_scaling_image_provider/input128x256.png'
Binary files tests/unit/tst_scaling_image_provider/input128x256.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_scaling_image_provider/input128x256.png	2013-04-20 01:20:35 +0000 differ
=== modified file 'tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp'
--- tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp	2012-10-28 00:57:40 +0000
+++ tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp	2013-04-20 01:20:35 +0000
@@ -50,6 +50,45 @@
         QCOMPARE(result, expected);
         QCOMPARE(returnedSize, expected.size());
     }
+
+    void respectRequestedSize_data() {
+        QTest::addColumn<QString>("inputFile");
+        QTest::addColumn<QString>("scalingFactor");
+        QTest::addColumn<QSize>("requestedSize");
+        QTest::addColumn<QSize>("returnedSize");
+        QTest::addColumn<QSize>("resultSize");
+
+        QString inputFile(QDir::currentPath() + QDir::separator() + "input128x256.png");
+        QTest::newRow("no scaling, bigger width and height") << inputFile << "1.0" << QSize(1000, 1000) << QSize(128, 256) << QSize(128, 256);
+        QTest::newRow("no scaling, smaller width")           << inputFile << "1.0" << QSize(50, 1000) << QSize(128, 256) << QSize(50, 100);
+        QTest::newRow("no scaling, smaller height")          << inputFile << "1.0" << QSize(1000, 50) << QSize(128, 256) << QSize(25, 50);
+        QTest::newRow("no scaling, smaller width and height")<< inputFile << "1.0" << QSize(50, 50) << QSize(128, 256) << QSize(25, 50);
+        QTest::newRow("downscaling, bigger width and height")<< inputFile << "0.5" << QSize(1000, 1000) << QSize(64, 128) << QSize(64, 128);
+        QTest::newRow("downscaling, smaller width")          << inputFile << "0.5" << QSize(50, 1000) << QSize(64, 128) << QSize(50, 100);
+        QTest::newRow("downscaling, smaller height")         << inputFile << "0.5" << QSize(1000, 50) << QSize(64, 128) << QSize(25, 50);
+        QTest::newRow("downscaling, smaller width and height")<< inputFile << "0.5" << QSize(50, 50) << QSize(64, 128) << QSize(25, 50);
+        QTest::newRow("upscaling, bigger width and height")  << inputFile << "2.0" << QSize(1000, 1000) << QSize(256, 512) << QSize(256, 512);
+        QTest::newRow("upscaling, smaller width")            << inputFile << "2.0" << QSize(50, 1000) << QSize(256, 512) << QSize(50, 100);
+        QTest::newRow("upscaling, smaller height")           << inputFile << "2.0" << QSize(1000, 50) << QSize(256, 512) << QSize(25, 50);
+        QTest::newRow("upscaling, smaller width and height") << inputFile << "2.0" << QSize(50, 50) << QSize(256, 512) << QSize(25, 50);
+    }
+
+    void respectRequestedSize() {
+        UCScalingImageProvider provider;
+        QImage result;
+        QSize size;
+
+        QFETCH(QString, inputFile);
+        QFETCH(QString, scalingFactor);
+        QFETCH(QSize, requestedSize);
+        QFETCH(QSize, returnedSize);
+        QFETCH(QSize, resultSize);
+
+        result = provider.requestImage(scalingFactor + "/" + inputFile, &size, requestedSize);
+
+        QCOMPARE(size, returnedSize);
+        QCOMPARE(result.size(), resultSize);
+    }
 };
 
 QTEST_MAIN(tst_UCScalingImageProvider)