[patch] tiff-4.0.2-jpeg7.patch

tiff-4.0.2-jpeg7.patch (text/plain), 2.93 KB, created by David Leverton on 2012-09-18 20:08:22 UTC

Index: libtiff/tif_jpeg.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_jpeg.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- libtiff/tif_jpeg.c	3 Jul 2012 00:57:50 -0000	1.109
+++ libtiff/tif_jpeg.c	6 Jul 2012 17:05:16 -0000	1.110
@@ -1138,6 +1138,9 @@
 	if (downsampled_output) {
 		/* Need to use raw-data interface to libjpeg */
 		sp->cinfo.d.raw_data_out = TRUE;
+#if JPEG_LIB_VERSION >= 70
+		sp->cinfo.d.do_fancy_upsampling = FALSE;
+#endif /* JPEG_LIB_VERSION >= 70 */
 		tif->tif_decoderow = DecodeRowError;
 		tif->tif_decodestrip = JPEGDecodeRaw;
 		tif->tif_decodetile = JPEGDecodeRaw;
Index: test/raw_decode.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/test/raw_decode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test/raw_decode.c	4 Jul 2012 19:45:32 -0000	1.3
+++ test/raw_decode.c	6 Jul 2012 17:05:16 -0000	1.4
@@ -42,6 +42,8 @@
 
 #include "tiffio.h"
 
+#include "jpeglib.h" /* Needed for JPEG_LIB_VERSION */
+
 static unsigned char cluster_0[] = { 0, 0, 2, 0, 138, 139 };
 static unsigned char cluster_64[] = { 0, 0, 9, 6, 134, 119 };
 static unsigned char cluster_128[] = { 44, 40, 63, 59, 230, 95 };
@@ -111,6 +113,7 @@
 	unsigned char *buffer;
 	uint32 *rgba_buffer;
 	tsize_t sz, szout;
+	unsigned int pixel_status = 0;
 
         (void) argc;
         (void) argv;
@@ -188,11 +191,15 @@
 		return 1;
 	}
 
-	if (check_rgb_pixel( 0, 15, 0, 18, buffer )
-	    || check_rgb_pixel( 64, 0, 0, 2, buffer )
-	    || check_rgb_pixel( 512, 6, 36, 182, buffer ) ) {
-		exit(1);
-	}	
+#if JPEG_LIB_VERSION >= 70
+	pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer );
+	pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer );
+	pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer );
+#else
+	pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer );
+	pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer );
+	pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer );
+#endif
 
 	free( buffer );
 
@@ -217,14 +224,22 @@
 	 * accomplish it from the YCbCr subsampled buffer ourselves in which
 	 * case the results may be subtly different but similar.
 	 */
-	if (check_rgba_pixel( 0, 15, 0, 18, 255, buffer )
-	    || check_rgba_pixel( 64, 0, 0, 2, 255, buffer )
-	    || check_rgba_pixel( 512, 6, 36, 182, 255, buffer ) ) {
-		exit(1);
-	}	
+#if JPEG_LIB_VERSION >= 70
+	pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, buffer );
+	pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, buffer );
+	pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, buffer );
+#else
+	pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, buffer );
+	pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, buffer );
+	pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, buffer );
+#endif
 
 	free( buffer );
 	TIFFClose(tif);
+
+	if (pixel_status) {
+		exit(1);
+	}
 	
 	exit( 0 );
 }