13 files changed, 25 insertions, 5 deletions

diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp
index bec2ca2..1a96ab3 100644
--- a/tests/auto/tiff/tst_qtiff.cpp
+++ b/tests/auto/tiff/tst_qtiff.cpp
@@ -139,6 +139,7 @@ void tst_qtiff::readImage_data()
     QTest::newRow("mono_orientation_7") << QString("mono_orientation_7.tiff") << QSize(64, 64);
     QTest::newRow("mono_orientation_8") << QString("mono_orientation_8.tiff") << QSize(64, 64);
     QTest::newRow("original_indexed") << QString("original_indexed.tiff") << QSize(64, 64);
+    QTest::newRow("original_grayscale") << QString("original_grayscale.tiff") << QSize(64, 64);
     QTest::newRow("original_mono") << QString("original_mono.tiff") << QSize(64, 64);
     QTest::newRow("original_rgb") << QString("original_rgb.tiff") << QSize(64, 64);
     QTest::newRow("rgba_adobedeflate_littleendian") << QString("rgba_adobedeflate_littleendian.tif") << QSize(200, 200);
@@ -156,8 +157,14 @@ 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("indexed_nontiled") << QString("indexed_nontiled.tif") << QSize(512, 384);
-    QTest::newRow("indexed_tiled") << QString("indexed_tiled.tif") << QSize(512, 384);
+    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);
+    QTest::newRow("tiled_indexed") << QString("tiled_indexed.tiff") << QSize(64, 64);
+    QTest::newRow("tiled_grayscale") << QString("tiled_grayscale.tiff") << QSize(64, 64);
+    QTest::newRow("tiled_mono") << QString("tiled_mono.tiff") << QSize(64, 64);
+    QTest::newRow("tiled_oddsize_grayscale") << QString("tiled_oddsize_grayscale.tiff") << QSize(59, 71);
+    QTest::newRow("tiled_oddsize_mono") << QString("tiled_oddsize_mono.tiff") << QSize(59, 71);
 }
 
 void tst_qtiff::readImage()
@@ -566,7 +573,12 @@ void tst_qtiff::tiled_data()
 {
     QTest::addColumn<QString>("expectedFile");
     QTest::addColumn<QString>("tiledFile");
-    QTest::newRow("Indexed") << "indexed_nontiled.tif" << "indexed_tiled.tif";
+    QTest::newRow("RGB") << "original_rgb.tiff" << "tiled_rgb.tiff";
+    QTest::newRow("Indexed") << "original_indexed.tiff" << "tiled_indexed.tiff";
+    QTest::newRow("Grayscale") << "original_grayscale.tiff" << "tiled_grayscale.tiff";
+    QTest::newRow("Mono") << "original_mono.tiff" << "tiled_mono.tiff";
+    QTest::newRow("Oddsize (Grayscale)") << "oddsize_grayscale.tiff" << "tiled_oddsize_grayscale.tiff";
+    QTest::newRow("Oddsize (Mono)") << "oddsize_mono.tiff" << "tiled_oddsize_mono.tiff";
 }
 
 void tst_qtiff::tiled()
@@ -576,6 +588,7 @@ void tst_qtiff::tiled()
 
     QImage expectedImage(prefix + expectedFile);
     QImage tiledImage(prefix + tiledFile);
+    QVERIFY(!tiledImage.isNull());
     QCOMPARE(expectedImage, tiledImage);
 }
 
diff --git a/tests/shared/images/tiff.qrc b/tests/shared/images/tiff.qrc
index 258acf0..19675ba 100644
--- a/tests/shared/images/tiff.qrc
+++ b/tests/shared/images/tiff.qrc
@@ -41,7 +41,14 @@
         <file>tiff/rgb_orientation_8.tiff</file>
         <file>tiff/teapot.tiff</file>
         <file>tiff/colorful.bmp</file>
-        <file>tiff/indexed_tiled.tif</file>
-        <file>tiff/indexed_nontiled.tif</file>
+        <file>tiff/tiled_grayscale.tiff</file>
+        <file>tiff/tiled_oddsize_grayscale.tiff</file>
+        <file>tiff/oddsize_grayscale.tiff</file>
+        <file>tiff/original_grayscale.tiff</file>
+        <file>tiff/tiled_indexed.tiff</file>
+        <file>tiff/tiled_mono.tiff</file>
+        <file>tiff/tiled_oddsize_mono.tiff</file>
+        <file>tiff/oddsize_mono.tiff</file>
+        <file>tiff/tiled_rgb.tiff</file>
     </qresource>
 </RCC>
diff --git a/tests/shared/images/tiff/indexed_nontiled.tif b/tests/shared/images/tiff/indexed_nontiled.tif
deleted file mode 100644
index d0b7cef..0000000
--- a/tests/shared/images/tiff/indexed_nontiled.tif
+++ /dev/null
diff --git a/tests/shared/images/tiff/indexed_tiled.tif b/tests/shared/images/tiff/indexed_tiled.tif
deleted file mode 100644
index 4ed11dd..0000000
--- a/tests/shared/images/tiff/indexed_tiled.tif
+++ /dev/null
diff --git a/tests/shared/images/tiff/oddsize_grayscale.tiff b/tests/shared/images/tiff/oddsize_grayscale.tiff
new file mode 100644
index 0000000..d519cd2
--- /dev/null
+++ b/tests/shared/images/tiff/oddsize_grayscale.tiff
diff --git a/tests/shared/images/tiff/oddsize_mono.tiff b/tests/shared/images/tiff/oddsize_mono.tiff
new file mode 100644
index 0000000..fbac0ed
--- /dev/null
+++ b/tests/shared/images/tiff/oddsize_mono.tiff
diff --git a/tests/shared/images/tiff/original_grayscale.tiff b/tests/shared/images/tiff/original_grayscale.tiff
new file mode 100644
index 0000000..174c2cf
--- /dev/null
+++ b/tests/shared/images/tiff/original_grayscale.tiff
diff --git a/tests/shared/images/tiff/tiled_grayscale.tiff b/tests/shared/images/tiff/tiled_grayscale.tiff
new file mode 100644
index 0000000..894ba8b
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_grayscale.tiff
diff --git a/tests/shared/images/tiff/tiled_indexed.tiff b/tests/shared/images/tiff/tiled_indexed.tiff
new file mode 100644
index 0000000..2bd266a
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_indexed.tiff
diff --git a/tests/shared/images/tiff/tiled_mono.tiff b/tests/shared/images/tiff/tiled_mono.tiff
new file mode 100644
index 0000000..cbcda19
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_mono.tiff
diff --git a/tests/shared/images/tiff/tiled_oddsize_grayscale.tiff b/tests/shared/images/tiff/tiled_oddsize_grayscale.tiff
new file mode 100644
index 0000000..27bc9d4
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_oddsize_grayscale.tiff
diff --git a/tests/shared/images/tiff/tiled_oddsize_mono.tiff b/tests/shared/images/tiff/tiled_oddsize_mono.tiff
new file mode 100644
index 0000000..e858e90
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_oddsize_mono.tiff
diff --git a/tests/shared/images/tiff/tiled_rgb.tiff b/tests/shared/images/tiff/tiled_rgb.tiff
new file mode 100644
index 0000000..90291b9
--- /dev/null
+++ b/tests/shared/images/tiff/tiled_rgb.tiff