diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-17 16:14:33 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-17 16:14:46 +0200 |
commit | 981aa49d195ade2aed4ebd11e762653bc424d20b (patch) | |
tree | ecf726610fa601e369d9bc6951d6bb4c013477eb /tests | |
parent | 80653c446702bacf3086a7d317c5458d83dfa6bb (diff) | |
parent | 2762073738d0343b2ba6e38624de2040c34bc393 (diff) | |
download | qtimageformats-981aa49d195ade2aed4ebd11e762653bc424d20b.tar.gz |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I99e95abde299432d6ea63eabd8d1f0b5b82a3039
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 b2c5546..f1db377 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -420,8 +420,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())); @@ -466,8 +465,7 @@ void tst_qtiff::supportsOption_data() QTest::newRow("tiff") << (QIntList() << QImageIOHandler::Size << QImageIOHandler::CompressionRatio - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault); + << QImageIOHandler::ImageTransformation); } void tst_qtiff::supportsOption() @@ -489,8 +487,7 @@ void tst_qtiff::supportsOption() << QImageIOHandler::Endianness << QImageIOHandler::Animation << QImageIOHandler::BackgroundColor - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault; + << QImageIOHandler::ImageTransformation; QImageWriter writer; writer.setFormat("tiff"); |