added support for reading chunky multi-sample data

jkriege2 · Oct 12, 2020 · c9d5fd6 · c9d5fd6
1 parent c95aa91
commit c9d5fd6
Show file tree

Hide file tree

Showing 10 changed files with 125 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,8 @@ This library currently support TIFF files, which meet the following criteria:
 * uncompressed frames
 * one, or more samples per frame
 * data types: UINT, INT, FLOAT, 8-64bit
-* planar data organization only, for multi-sample data
+* planar and chunky data organization, for multi-sample data
+* no suppoer for palleted images
 * stripped TIFFs only, tiling is not supported
 
 ## Usage

diff --git a/doc/dox/mainpage.dox b/doc/dox/mainpage.dox
@@ -17,7 +17,8 @@ This is a lightweight C++ library that allows to read and write TIFF files. It o
     - uncompressed frames
     - one, or more samples per frame
     - data types: UINT, INT, FLOAT, 8-64bit
-	- planar data organization only, for multi-sample data
+	- planar and chunky data organization, for multi-sample data
+	- no suppoer for palleted images
 	- stripped TIFFs only, tiling is not supported
 .
 

diff --git a/src/tinytiffreader.c b/src/tinytiffreader.c
diff --git a/tests/tinytiffreader_test/CMakeLists.txt b/tests/tinytiffreader_test/CMakeLists.txt
@@ -23,6 +23,11 @@ install(FILES ${CMAKE_CURRENT_LIST_DIR}/circuit.tif DESTINATION ${CMAKE_INSTALL_
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/galaxy.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/mri.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_grey.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_grey16.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_greyalpha.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_rgb.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_rgb48.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/corel_photopaint_rgba.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/imagej_32bit_ramp_tiled.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/circuit_nocompression.tif DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/galaxy_nocompression.tif DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/tests/tinytiffreader_test/corel_photopaint_grey16.tif b/tests/tinytiffreader_test/corel_photopaint_grey16.tif
diff --git a/tests/tinytiffreader_test/corel_photopaint_greyalpha.tif b/tests/tinytiffreader_test/corel_photopaint_greyalpha.tif
diff --git a/tests/tinytiffreader_test/corel_photopaint_rgb.tif b/tests/tinytiffreader_test/corel_photopaint_rgb.tif
diff --git a/tests/tinytiffreader_test/corel_photopaint_rgb48.tif b/tests/tinytiffreader_test/corel_photopaint_rgb48.tif
diff --git a/tests/tinytiffreader_test/corel_photopaint_rgba.tif b/tests/tinytiffreader_test/corel_photopaint_rgba.tif
diff --git a/tests/tinytiffreader_test/tinytiffreader_test.cpp b/tests/tinytiffreader_test/tinytiffreader_test.cpp
@@ -685,11 +685,16 @@ int main(int argc, char *argv[]) {
     TEST_AGAINST_LIBTIFF<uint8_t>("multi-channel-time-series.ome.tif",  test_results);
     TEST_AGAINST_LIBTIFF<uint16_t>("test16m_imagej.tif",  test_results);
     TEST_AGAINST_LIBTIFF<float>("imagej_32bit_ramp.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint8_t>("imagej_32bit_ramp_tiled.tif",  test_results);
     TEST_AGAINST_LIBTIFF<uint8_t>("circuit_nocompression.tif",  test_results);
     TEST_AGAINST_LIBTIFF<uint8_t>("mri_nocompression.tif",  test_results);
     TEST_AGAINST_LIBTIFF<uint8_t>("galaxy_nocompression.tif",  test_results);
-    //TEST_AGAINST_LIBTIFF<uint8_t>("corel_photopaint_grey.tif",  test_results);
-    TEST_AGAINST_LIBTIFF<uint8_t>("imagej_32bit_ramp_tiled.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint8_t>("corel_photopaint_grey.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint16_t>("corel_photopaint_grey16.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint8_t>("corel_photopaint_greyalpha.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint8_t>("corel_photopaint_rgb.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint16_t>("corel_photopaint_rgb48.tif",  test_results);
+    TEST_AGAINST_LIBTIFF<uint8_t>("corel_photopaint_rgba.tif",  test_results);
 #else
     //TEST_SIMPLE<uint16_t>("2K_source_Stack.tif",  test_results);
     //TEST_SIMPLE<uint16_t>("2K_tiff_image.tif",  test_results);
@@ -700,11 +705,17 @@ int main(int argc, char *argv[]) {
     TEST_SIMPLE<uint8_t>("multi-channel-time-series.ome.tif",  test_results);
     TEST_SIMPLE<uint16_t>("test16m_imagej.tif",  test_results);
     TEST_SIMPLE<float>("imagej_32bit_ramp.tif",  test_results);
+    TEST_SIMPLE<uint8_t>("imagej_32bit_ramp_tiled.tif",  test_results);
     TEST_SIMPLE<uint8_t>("circuit_nocompression.tif",  test_results);
     TEST_SIMPLE<uint8_t>("mri_nocompression.tif",  test_results);
     TEST_SIMPLE<uint8_t>("galaxy_nocompression.tif",  test_results);
-    //TEST_SIMPLE<uint8_t>("corel_photopaint_grey.tif",  test_results);
-    TEST_SIMPLE<uint8_t>("imagej_32bit_ramp_tiled.tif",  test_results);
+    TEST_SIMPLE<uint8_t>("corel_photopaint_grey.tif",  test_results);
+    TEST_SIMPLE<uint16_t>("corel_photopaint_grey16.tif",  test_results);
+    TEST_SIMPLE<uint8_t>("corel_photopaint_greyalpha.tif",  test_results);
+    TEST_SIMPLE<uint8_t>("corel_photopaint_rgb.tif",  test_results);
+    TEST_SIMPLE<uint16_t>("corel_photopaint_rgb48.tif",  test_results);
+    TEST_SIMPLE<uint8_t>("corel_photopaint_rgba.tif",  test_results);
+
 
 #endif