21 lines
825 B
Diff
21 lines
825 B
Diff
Back-patch upstream patch of 2012-12-12 ("Fix TIFF_VARIABLE/TIFF_VARIABLE2
|
|
confusion in TIFFPrintDirectory").
|
|
|
|
|
|
diff -Naur tiff-4.0.3.orig/libtiff/tif_print.c tiff-4.0.3/libtiff/tif_print.c
|
|
--- tiff-4.0.3.orig/libtiff/tif_print.c 2012-08-19 12:56:35.000000000 -0400
|
|
+++ tiff-4.0.3/libtiff/tif_print.c 2012-12-12 16:53:05.355927641 -0500
|
|
@@ -582,10 +582,10 @@
|
|
continue;
|
|
|
|
if(fip->field_passcount) {
|
|
- if (fip->field_readcount == TIFF_VARIABLE ) {
|
|
+ if (fip->field_readcount == TIFF_VARIABLE2 ) {
|
|
if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
|
|
continue;
|
|
- } else if (fip->field_readcount == TIFF_VARIABLE2 ) {
|
|
+ } else if (fip->field_readcount == TIFF_VARIABLE ) {
|
|
uint16 small_value_count;
|
|
if(TIFFGetField(tif, tag, &small_value_count, &raw_data) != 1)
|
|
continue;
|