diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:05:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:05:27 +0200 |
| commit | 19fbb62ab0f70bd3d28758b149d709ad87479e22 (patch) | |
| tree | 715d583c01e9ee70a3d90b3e78b659bfd0320ace | |
| parent | e6ab94c607d8bc078e3d6ba776aa2b69a1448466 (diff) | |
| parent | 0a035b58c211a4359b98063b1bf6df1c1c01a79a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
| -rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 2 | ||||
| -rw-r--r-- | 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<QColorSpace::ColorSpaceId>("colorspaceId"); + QTest::addColumn<decltype(QColorSpace::SRgb)>("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); } |