From 44000c87d352e4f88b7eea3d441a807b755698d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 5 Sep 2019 10:44:56 +0200 Subject: Fix build after QColorSpace API changes Change-Id: Iff3186cf4eccae5fc7e7e3c55c5e6eb662be9519 Reviewed-by: Allan Sandfeld Jensen --- src/plugins/imageformats/webp/qwebphandler.cpp | 2 -- tests/auto/tiff/tst_qtiff.cpp | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp index 3916996..f0b8caf 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -171,8 +171,6 @@ bool QWebpHandler::read(QImage *image) m_colorSpace = QColorSpace::fromIccProfile(iccProfile); // ### consider parsing EXIF and/or XMP metadata too. WebPDemuxReleaseChunkIterator(&metaDataIter); - } else { - m_colorSpace = QColorSpace::Undefined; } // Go to first frame diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp index 61d49db..be02460 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -632,9 +632,8 @@ void tst_qtiff::readGray16() void tst_qtiff::colorSpace_data() { - QTest::addColumn("colorspaceId"); + QTest::addColumn("namedColorSpace"); - QTest::newRow("Undefined") << QColorSpace::Undefined; QTest::newRow("sRGB") << QColorSpace::SRgb; QTest::newRow("sRGB(linear)") << QColorSpace::SRgbLinear; QTest::newRow("AdobeRGB") << QColorSpace::AdobeRgb; @@ -644,12 +643,12 @@ void tst_qtiff::colorSpace_data() void tst_qtiff::colorSpace() { - QFETCH(QColorSpace::ColorSpaceId, colorspaceId); + QFETCH(decltype(QColorSpace::SRgb), namedColorSpace); QImage image(prefix + "colorful.bmp"); QVERIFY(!image.isNull()); - image.setColorSpace(colorspaceId); + image.setColorSpace(namedColorSpace); QByteArray output; QBuffer buf(&output); @@ -662,7 +661,7 @@ void tst_qtiff::colorSpace() QImageReader reader(&buf); QImage image2 = reader.read(); - QCOMPARE(image2.colorSpace(), QColorSpace(colorspaceId)); + QCOMPARE(image2.colorSpace(), namedColorSpace); QCOMPARE(image2, image); } -- cgit v1.2.3