Extend support for tiled tiff files to all color formatsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1

This commit extends the recently added support for tiled tiff images
of color index format to also cover grayscale and mono images. RGB
images were already covered, since the libtiff API used for those
handles tiled images transparently.

This commit also simplifies the tiff read() function by sharing
common code among the different formats.

[ChangeLog][TIFF] Extend support for tiled tiff files to all color formats

Change-Id: I13f94bbca65dd6a35384a415906034e245ad8b79
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

12 files changed, 9 insertions, 2 deletions

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