summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2024-04-05 01:08:15 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2024-04-08 08:36:57 +0200
commite4c8cd1f09d0a32af17beab69c5f746e27291255 (patch)
tree72e82d0cc82213c64a805020eb28ace4db6e05ed
parent3cf129582ba6bee6fc00784e57e99c95d594786d (diff)
TIFF: add an autotest for CMYK images
This work has been kindly sponsored by the QGIS project (https://qgis.org/). Change-Id: I09cf744f1b8c907a296a8525ec11a4980282d743 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--tests/auto/tiff/CMakeLists.txt1
-rw-r--r--tests/auto/tiff/tst_qtiff.cpp4
-rw-r--r--tests/shared/images/tiff.qrc1
-rw-r--r--tests/shared/images/tiff/teapot_cmyk.tiffbin0 -> 327972 bytes
4 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/tiff/CMakeLists.txt b/tests/auto/tiff/CMakeLists.txt
index ec0d34a..05cea63 100644
--- a/tests/auto/tiff/CMakeLists.txt
+++ b/tests/auto/tiff/CMakeLists.txt
@@ -65,6 +65,7 @@ set(tiff_resource_files
"../../shared/images/tiff/rgba_packbits_littleendian.tif"
"../../shared/images/tiff/rgba_zipdeflate_littleendian.tif"
"../../shared/images/tiff/teapot.tiff"
+ "../../shared/images/tiff/teapot_cmyk.tiff"
"../../shared/images/tiff/tiled_grayscale.tiff"
"../../shared/images/tiff/tiled_indexed.tiff"
"../../shared/images/tiff/tiled_mono.tiff"
diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp
index 94d20fa..c5083f3 100644
--- a/tests/auto/tiff/tst_qtiff.cpp
+++ b/tests/auto/tiff/tst_qtiff.cpp
@@ -141,6 +141,7 @@ void tst_qtiff::readImage_data()
QTest::newRow("rgb_orientation_7") << QString("rgb_orientation_7.tiff") << QSize(64, 64);
QTest::newRow("rgb_orientation_8") << QString("rgb_orientation_8.tiff") << QSize(64, 64);
QTest::newRow("teapot") << QString("teapot.tiff") << QSize(256, 256);
+ QTest::newRow("teapot_cmyk") << QString("teapot_cmyk.tiff") << QSize(256, 256);
QTest::newRow("oddsize_grayscale") << QString("oddsize_grayscale.tiff") << QSize(59, 71);
QTest::newRow("oddsize_mono") << QString("oddsize_mono.tiff") << QSize(59, 71);
QTest::newRow("tiled_rgb") << QString("tiled_rgb.tiff") << QSize(64, 64);
@@ -396,6 +397,9 @@ void tst_qtiff::readWriteNonDestructive_data()
QTest::newRow("tiff rgba32fpx4pm") << QImage::Format_RGBA32FPx4_Premultiplied
<< QImage::Format_RGBA32FPx4_Premultiplied
<< QImageIOHandler::TransformationNone;
+ QTest::newRow("tiff cmyk") << QImage::Format_CMYK8888
+ << QImage::Format_CMYK8888
+ << QImageIOHandler::TransformationNone;
}
void tst_qtiff::readWriteNonDestructive()
diff --git a/tests/shared/images/tiff.qrc b/tests/shared/images/tiff.qrc
index 2c876af..0814a49 100644
--- a/tests/shared/images/tiff.qrc
+++ b/tests/shared/images/tiff.qrc
@@ -41,6 +41,7 @@
<file>tiff/rgb_orientation_7.tiff</file>
<file>tiff/rgb_orientation_8.tiff</file>
<file>tiff/teapot.tiff</file>
+ <file>tiff/teapot_cmyk.tiff</file>
<file>tiff/colorful.bmp</file>
<file>tiff/tiled_grayscale.tiff</file>
<file>tiff/tiled_oddsize_grayscale.tiff</file>
diff --git a/tests/shared/images/tiff/teapot_cmyk.tiff b/tests/shared/images/tiff/teapot_cmyk.tiff
new file mode 100644
index 0000000..aae07c4
--- /dev/null
+++ b/tests/shared/images/tiff/teapot_cmyk.tiff
Binary files differ