Add support for saving colorspace to PNGs

Also fixes interaction with QImageReader gamma correction

Change-Id: I108f253697f7ff60be6940bca17faa9f9ceb577b
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index d17a171728..8b42b139a3 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 
 #include <QBuffer>
+#include <QColorSpace>
 #include <QDebug>
 #include <QImage>
 #include <QImageReader>
@@ -158,6 +159,9 @@ private slots:
     void saveFormat_data();
     void saveFormat();
 
+    void saveColorSpace_data();
+    void saveColorSpace();
+
     void readText_data();
     void readText();
 
@@ -1883,6 +1887,33 @@ void tst_QImageReader::saveFormat()
     QCOMPARE(stored, converted);
 }
 
+void tst_QImageReader::saveColorSpace_data()
+{
+    QTest::addColumn<QColorSpace::ColorSpaceId>("colorspaceId");
+
+    QTest::newRow("Undefined")    << QColorSpace::Undefined;
+    QTest::newRow("sRGB")         << QColorSpace::SRgb;
+    QTest::newRow("sRGB(linear)") << QColorSpace::SRgbLinear;
+    QTest::newRow("AdobeRGB")     << QColorSpace::AdobeRgb;
+    QTest::newRow("DisplayP3")    << QColorSpace::DisplayP3;
+    QTest::newRow("ProPhotoRgb")  << QColorSpace::ProPhotoRgb;
+}
+
+void tst_QImageReader::saveColorSpace()
+{
+    QFETCH(QColorSpace::ColorSpaceId, colorspaceId);
+
+    QImage orig(":/images/kollada.png");
+
+    orig.setColorSpace(colorspaceId);
+    QBuffer buf;
+    buf.open(QIODevice::WriteOnly);
+    QVERIFY(orig.save(&buf, "png"));
+    buf.close();
+    QImage stored = QImage::fromData(buf.buffer(), "png");
+
+    QCOMPARE(stored, orig);
+}
 
 void tst_QImageReader::readText_data()
 {