tiffinfo: Updated to parse through SubIFDs and show their tags.

Author: SuLaus

test/CMakeLists.txt

@@ -372,6 +372,7 @@ add_reader_test(tiffdump "" "images/miniswhite-1c-1b.tiff")
 # tiffinfo
 add_reader_test(tiffinfo "-c -D -d -j -s" "images/custom_dir_EXIF_GPS.tiff")
 add_reader_test(tiffinfo "-c -D -d -j -s" "images/minisblack-1c-16b.tiff")
+add_reader_test(tiffinfo " " "images/tiff_with_subifd_chain.tif")
 
 # tiffcp split/join
 foreach(image ${UNCOMPRESSEDIMAGES})

test/Makefile.am

@@ -209,6 +209,7 @@ IMAGES_EXTRA_DIST = \
 	images/miniswhite-1c-1b.g3 \
 	images/test_float64_predictor2_le_lzw.tif \
 	images/test_float64_predictor2_be_lzw.tif \
+	images/tiff_with_subifd_chain.tif \
 	$(PNMIMAGES) \
 	$(TIFFIMAGES)
 

test/common.sh

@@ -48,6 +48,7 @@ IMG_MINISWHITE_1C_1B_PBM=${IMAGES}/miniswhite-1c-1b.pbm
 IMG_MINISBLACK_1C_8B_PGM=${IMAGES}/minisblack-1c-8b.pgm
 IMG_RGB_3C_16B_PPM=${IMAGES}/rgb-3c-16b.ppm
 IMG_RGB_3C_8B_PPM=${IMAGES}/rgb-3c-8b.ppm
+IMG_TIFF_WITH_SUBIFD_CHAIN=${IMAGES}/tiff_with_subifd_chain.tif
 
 # All uncompressed image files
 IMG_UNCOMPRESSED="${IMG_MINISBLACK_1C_16B} ${IMG_MINISBLACK_1C_8B} ${IMG_MINISWHITE_1C_1B} ${IMG_PALETTE_1C_1B} ${IMG_PALETTE_1C_4B} ${IMG_PALETTE_1C_4B} ${IMG_PALETTE_1C_8B} ${IMG_RGB_3C_8B} ${IMG_RGB_3C_16B}"

test/images/tiff_with_subifd_chain.tif

@@ -4,3 +4,4 @@
 #
 . ${srcdir:-.}/common.sh
 f_test_reader "${TIFFINFO} -c -D -d -j -s " "${IMG_MINISBLACK_1C_16B}"
+f_test_reader "${TIFFINFO}  " "${IMG_TIFF_WITH_SUBIFD_CHAIN}"

test/tiffinfo.sh

@@ -151,7 +151,7 @@ main(int argc, char* argv[])
 	multiplefiles = (argc - optind > 1);
 	for (; optind < argc; optind++) {
 		if (multiplefiles)
-			printf("%s:\n", argv[optind]);
+			printf("File %s:\n", argv[optind]);
 		tif = TIFFOpen(argv[optind], chopstrips ? "rC" : "rc");
 		if (tif != NULL) {
 			if (dirnum != -1) {
@@ -168,6 +168,7 @@ main(int argc, char* argv[])
 					tiffinfo(tif, order, flags, 1);
 					if (TIFFGetField(tif, TIFFTAG_EXIFIFD,
 						&offset)) {
+						printf("--- EXIF directory within directory %d \n", curdir);
 						if (TIFFReadEXIFDirectory(tif, offset)) {
 							tiffinfo(tif, order, flags, 0);
 							/*-- Go back to previous directory, (directory is reloaded from file!) */
@@ -176,11 +177,43 @@ main(int argc, char* argv[])
 					}
 					if (TIFFGetField(tif, TIFFTAG_GPSIFD,
 						&offset)) {
+						printf("--- GPS directory within directory %d \n", curdir);
 						if (TIFFReadGPSDirectory(tif, offset)) {
 							tiffinfo(tif, order, flags, 0);
 							TIFFSetDirectory(tif, curdir);
 						}
 					}
+					/*-- Check for SubIFDs --*/
+					uint16_t nCount;
+					void *vPtr;
+					uint64_t *subIFDoffsets = NULL;
+					if (TIFFGetField(tif, TIFFTAG_SUBIFD, &nCount, &vPtr)) {
+						if (nCount > 0) {
+							subIFDoffsets = malloc(nCount * sizeof(uint64_t));
+							if (subIFDoffsets != NULL) {
+								memcpy(subIFDoffsets, vPtr, nCount * sizeof(subIFDoffsets[0]));
+								printf("--- SubIFD image descriptor tag within TIFF directory %d with array of %d SubIFD chains ---\n", curdir, nCount);
+								for (int i = 0; i < nCount; i++) {
+									offset = subIFDoffsets[i];
+									int s = 0;
+									if (TIFFSetSubDirectory(tif, offset)) {
+										/* print info and check for SubIFD chain */
+										do {
+											printf("--- SubIFD %d of chain %d at offset 0x%"PRIx64" (%"PRIu64"):\n", s, i, offset, offset);
+											tiffinfo(tif, order, flags, 0);
+											s++;
+										} while (TIFFReadDirectory(tif));
+									}
+								}
+								TIFFSetDirectory(tif, curdir);
+								free(subIFDoffsets);
+								subIFDoffsets = NULL;
+							} else {
+								fprintf(stderr, "Error: Could not allocate memory for SubIFDs list. SubIFDs not parsed.\n");
+							}
+						}
+					}
+					printf("\n");
 				} while (TIFFReadDirectory(tif));
 			}
 			TIFFClose(tif);