8ca2e9
Fix misbehavior on 64-bit machines when trying to flip a downsampled image
8ca2e9
vertically: unsigned ints will be widened to 64 bits the wrong way.
8ca2e9
See RH bug #583081.
8ca2e9
8ca2e9
Filed upstream at http://bugzilla.maptools.org/show_bug.cgi?id=2207
8ca2e9
8ca2e9
8ca2e9
diff -Naur tiff-3.9.2.orig/libtiff/tif_getimage.c tiff-3.9.2/libtiff/tif_getimage.c
8ca2e9
--- tiff-3.9.2.orig/libtiff/tif_getimage.c	2009-08-30 12:21:46.000000000 -0400
8ca2e9
+++ tiff-3.9.2/libtiff/tif_getimage.c	2010-06-10 15:07:28.000000000 -0400
8ca2e9
@@ -1846,6 +1846,7 @@
8ca2e9
 DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
8ca2e9
 {
8ca2e9
 	uint32* cp2;
8ca2e9
+	int32 incr = 2*toskew+w;
8ca2e9
 	(void) y;
8ca2e9
 	fromskew = (fromskew / 2) * 6;
8ca2e9
 	cp2 = cp+w+toskew;
8ca2e9
@@ -1872,8 +1873,8 @@
8ca2e9
 			cp2 ++ ;
8ca2e9
 			pp += 6;
8ca2e9
 		}
8ca2e9
-		cp += toskew*2+w;
8ca2e9
-		cp2 += toskew*2+w;
8ca2e9
+		cp += incr;
8ca2e9
+		cp2 += incr;
8ca2e9
 		pp += fromskew;
8ca2e9
 		h-=2;
8ca2e9
 	}
8ca2e9
@@ -1939,6 +1940,7 @@
8ca2e9
 DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
8ca2e9
 {
8ca2e9
 	uint32* cp2;
8ca2e9
+	int32 incr = 2*toskew+w;
8ca2e9
 	(void) y;
8ca2e9
 	fromskew = (fromskew / 2) * 4;
8ca2e9
 	cp2 = cp+w+toskew;
8ca2e9
@@ -1953,8 +1955,8 @@
8ca2e9
 			cp2 ++;
8ca2e9
 			pp += 4;
8ca2e9
 		} while (--x);
8ca2e9
-		cp += toskew*2+w;
8ca2e9
-		cp2 += toskew*2+w;
8ca2e9
+		cp += incr;
8ca2e9
+		cp2 += incr;
8ca2e9
 		pp += fromskew;
8ca2e9
 		h-=2;
8ca2e9
 	}