Long live QColorSpace and friends

Adds QColorSpace and QColorTransform classes,
and parsing of a common subset of ICC profiles
found in images, and also parses the ICC profiles
in PNG and JPEGs.

For backwards compatibility no automatic color
handling is done by this patch.

[ChangeLog][QtGui] A QColorSpace class has been added,
and color spaces are now parsed from PNG and JPEG images.
No automatic color space conversion is done however, and
applications must request it.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 72bad03a6a..46a2d73ece 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -33,7 +33,7 @@
 
 #include <qcolor.h>
 #include <qdebug.h>
-#include <private/qcolorprofile_p.h>
+#include <private/qcolortrclut_p.h>
 #include <private/qdrawingprimitive_sse2_p.h>
 #include <qrgba64.h>
 
@@ -1632,14 +1632,13 @@ void tst_QColor::qcolorprofile_data()
     QTest::newRow("gamma=1.7") << qreal(1.7) << 2;
     QTest::newRow("gamma=2.0") << qreal(2.0) << 8;
     QTest::newRow("gamma=2.31") << qreal(2.31) << 33;
-    QTest::newRow("SRgb") << qreal(0.0) << 7;
 }
 
 void tst_QColor::qcolorprofile()
 {
     QFETCH(qreal, gammaC);
     QFETCH(int, tolerance);
-    QColorProfile *cp = (gammaC == 0) ? QColorProfile::fromSRgb(): QColorProfile::fromGamma(gammaC);
+    QColorTrcLut *cp = QColorTrcLut::fromGamma(gammaC);
 
     // Test we are accurate for most values after converting through gamma-correction.
     int error = 0;