qiurui
/
qtimageformats
mirror of https://github.com/qt/qtimageformats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake 

Change-Id: I99e95abde299432d6ea63eabd8d1f0b5b82a3039
This commit is contained in:
Alexandru Croitor 2019-06-17 16:14:33 +02:00
parent 80653c4467 2762073738
commit 981aa49d19
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@ -1,3 +1,3 @@
load(qt_build_config) load(qt_build_config)
MODULE_VERSION = 5.14.0 MODULE_VERSION = 6.0.0

6
CMakeLists.txt
View File

@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.14.0) cmake_minimum_required(VERSION 3.15.0)
project(QtImageFormats project(QtImageFormats
VERSION 5.14.0 VERSION 6.0.0
DESCRIPTION "Qt ImageFormats Libraries" DESCRIPTION "Qt ImageFormats Libraries"
HOMEPAGE_URL "https://qt.io/" HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C LANGUAGES CXX C
) )
find_package(Qt5 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Gui) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Gui)
qt_build_repo() qt_build_repo()

3
src/plugins/imageformats/macheif/qmacheifhandler.cpp
View File

@ -98,8 +98,7 @@ bool QMacHeifHandler::supportsOption(ImageOption option) const
{ {
return option == Quality return option == Quality
|| option == Size || option == Size
|| option == ImageTransformation || option == ImageTransformation;
|| option == TransformedByDefault;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/plugins/imageformats/tiff/qtiffhandler.cpp
View File

@ -843,8 +843,7 @@ bool QTiffHandler::supportsOption(ImageOption option) const
return option == CompressionRatio return option == CompressionRatio
|| option == Size || option == Size
|| option == ImageFormat || option == ImageFormat
|| option == ImageTransformation || option == ImageTransformation;
|| option == TransformedByDefault;
} }
bool QTiffHandler::jumpToNextImage() bool QTiffHandler::jumpToNextImage()

3
tests/auto/heif/tst_qheif.cpp
View File

@ -65,6 +65,7 @@ void tst_qheif::readImage()
QString path = QStringLiteral(":/heif/") + fileName; QString path = QStringLiteral(":/heif/") + fileName;
QImageReader reader(path); QImageReader reader(path);
reader.setAutoTransform(true);
QVERIFY(reader.canRead()); QVERIFY(reader.canRead());
QImage image = reader.read(); QImage image = reader.read();
QVERIFY(!image.isNull()); QVERIFY(!image.isNull());
@ -86,6 +87,7 @@ void tst_qheif::readProperties()
QString path = QStringLiteral(":/heif/") + fileName; QString path = QStringLiteral(":/heif/") + fileName;
QImageReader reader(path); QImageReader reader(path);
reader.setAutoTransform(true);
QCOMPARE(reader.size(), rawSize); QCOMPARE(reader.size(), rawSize);
QCOMPARE(int(reader.transformation()), transform); QCOMPARE(int(reader.transformation()), transform);
@ -138,6 +140,7 @@ void tst_qheif::writeImage()
QImage rimg2; QImage rimg2;
buf2.open(QIODevice::ReadOnly); buf2.open(QIODevice::ReadOnly);
QImageReader reader(&buf2); QImageReader reader(&buf2);
reader.setAutoTransform(true);
QVERIFY(reader.read(&rimg2)); QVERIFY(reader.read(&rimg2));
buf2.close(); buf2.close();
QVERIFY(rimg2.size() == img.size().transposed()); QVERIFY(rimg2.size() == img.size().transposed());

9
tests/auto/tiff/tst_qtiff.cpp
View File

@ -420,8 +420,7 @@ void tst_qtiff::readWriteNonDestructive()
QImageReader reader(&buf); QImageReader reader(&buf);
QCOMPARE(reader.imageFormat(), expectedFormat); QCOMPARE(reader.imageFormat(), expectedFormat);
QCOMPARE(reader.size(), image.size()); QCOMPARE(reader.size(), image.size());
QCOMPARE(reader.autoTransform(), true); QCOMPARE(reader.autoTransform(), false);
reader.setAutoTransform(false);
QCOMPARE(reader.transformation(), transformation); QCOMPARE(reader.transformation(), transformation);
QImage image2 = reader.read(); QImage image2 = reader.read();
QVERIFY2(!image.isNull(), qPrintable(reader.errorString())); QVERIFY2(!image.isNull(), qPrintable(reader.errorString()));
@ -466,8 +465,7 @@ void tst_qtiff::supportsOption_data()
QTest::newRow("tiff") << (QIntList() QTest::newRow("tiff") << (QIntList()
<< QImageIOHandler::Size << QImageIOHandler::Size
<< QImageIOHandler::CompressionRatio << QImageIOHandler::CompressionRatio
<< QImageIOHandler::ImageTransformation << QImageIOHandler::ImageTransformation);
<< QImageIOHandler::TransformedByDefault);
} }
void tst_qtiff::supportsOption() void tst_qtiff::supportsOption()
@ -489,8 +487,7 @@ void tst_qtiff::supportsOption()
<< QImageIOHandler::Endianness << QImageIOHandler::Endianness
<< QImageIOHandler::Animation << QImageIOHandler::Animation
<< QImageIOHandler::BackgroundColor << QImageIOHandler::BackgroundColor
<< QImageIOHandler::ImageTransformation << QImageIOHandler::ImageTransformation;
<< QImageIOHandler::TransformedByDefault;
QImageWriter writer; QImageWriter writer;
writer.setFormat("tiff"); writer.setFormat("tiff");