diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:55:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:56:07 +0200 |
| commit | 05aed6f25fbe0f685224f0afb7a46092d8710c09 (patch) | |
| tree | 0e1df2691c40a962eaa503bd651a35ff2ac80c13 /tests | |
| parent | 19fbb62ab0f70bd3d28758b149d709ad87479e22 (diff) | |
| parent | 20b25042dee9e76a3d371377877960e6d3c134be (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Change-Id: I1b25b31fb8e8cd8f3e73c51cc0e4a233b6ef3363
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/heif/tst_qheif.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/tiff/tst_qtiff.cpp | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/heif/tst_qheif.cpp b/tests/auto/heif/tst_qheif.cpp index 26ddf73..1b68074 100644 --- a/tests/auto/heif/tst_qheif.cpp +++ b/tests/auto/heif/tst_qheif.cpp @@ -65,6 +65,7 @@ void tst_qheif::readImage() QString path = QStringLiteral(":/heif/") + fileName; QImageReader reader(path); + reader.setAutoTransform(true); QVERIFY(reader.canRead()); QImage image = reader.read(); QVERIFY(!image.isNull()); @@ -86,6 +87,7 @@ void tst_qheif::readProperties() QString path = QStringLiteral(":/heif/") + fileName; QImageReader reader(path); + reader.setAutoTransform(true); QCOMPARE(reader.size(), rawSize); QCOMPARE(int(reader.transformation()), transform); @@ -138,6 +140,7 @@ void tst_qheif::writeImage() QImage rimg2; buf2.open(QIODevice::ReadOnly); QImageReader reader(&buf2); + reader.setAutoTransform(true); QVERIFY(reader.read(&rimg2)); buf2.close(); QVERIFY(rimg2.size() == img.size().transposed()); diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp index be02460..87fdfa8 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -423,8 +423,7 @@ void tst_qtiff::readWriteNonDestructive() QImageReader reader(&buf); QCOMPARE(reader.imageFormat(), expectedFormat); QCOMPARE(reader.size(), image.size()); - QCOMPARE(reader.autoTransform(), true); - reader.setAutoTransform(false); + QCOMPARE(reader.autoTransform(), false); QCOMPARE(reader.transformation(), transformation); QImage image2 = reader.read(); QVERIFY2(!image.isNull(), qPrintable(reader.errorString())); @@ -469,8 +468,7 @@ void tst_qtiff::supportsOption_data() QTest::newRow("tiff") << (QIntList() << QImageIOHandler::Size << QImageIOHandler::CompressionRatio - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault); + << QImageIOHandler::ImageTransformation); } void tst_qtiff::supportsOption() @@ -492,8 +490,7 @@ void tst_qtiff::supportsOption() << QImageIOHandler::Endianness << QImageIOHandler::Animation << QImageIOHandler::BackgroundColor - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault; + << QImageIOHandler::ImageTransformation; QImageWriter writer; writer.setFormat("tiff"); |