|
 |
d00bc4 |
Use the spec-mandated default YCbCrSubSampling values in strip size
|
|
|
d00bc4 |
calculations, if the YCBCRSUBSAMPLING tag hasn't been provided.
|
|
|
d00bc4 |
See bug #603703.
|
|
|
d00bc4 |
|
|
|
d00bc4 |
Filed upstream at http://bugzilla.maptools.org/show_bug.cgi?id=2215
|
|
|
d00bc4 |
|
|
|
d00bc4 |
NB: must be applied after libtiff-scanlinesize.patch to avoid fuzz issues.
|
|
|
d00bc4 |
|
|
|
d00bc4 |
|
|
|
d00bc4 |
diff -Naur tiff-3.9.2.orig/libtiff/tif_strip.c tiff-3.9.2/libtiff/tif_strip.c
|
|
|
d00bc4 |
--- tiff-3.9.2.orig/libtiff/tif_strip.c 2006-03-25 13:04:35.000000000 -0500
|
|
|
d00bc4 |
+++ tiff-3.9.2/libtiff/tif_strip.c 2010-06-14 12:00:49.000000000 -0400
|
|
|
d00bc4 |
@@ -124,9 +124,9 @@
|
|
|
d00bc4 |
uint16 ycbcrsubsampling[2];
|
|
|
d00bc4 |
tsize_t w, scanline, samplingarea;
|
|
|
d00bc4 |
|
|
|
d00bc4 |
- TIFFGetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
- ycbcrsubsampling + 0,
|
|
|
d00bc4 |
- ycbcrsubsampling + 1 );
|
|
|
d00bc4 |
+ TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 0,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 1);
|
|
|
d00bc4 |
|
|
|
d00bc4 |
samplingarea = ycbcrsubsampling[0]*ycbcrsubsampling[1];
|
|
|
d00bc4 |
if (samplingarea == 0) {
|
|
|
d00bc4 |
@@ -234,9 +234,9 @@
|
|
|
d00bc4 |
&& !isUpSampled(tif)) {
|
|
|
d00bc4 |
uint16 ycbcrsubsampling[2];
|
|
|
d00bc4 |
|
|
|
d00bc4 |
- TIFFGetField(tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
- ycbcrsubsampling + 0,
|
|
|
d00bc4 |
- ycbcrsubsampling + 1);
|
|
|
d00bc4 |
+ TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 0,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 1);
|
|
|
d00bc4 |
|
|
|
d00bc4 |
if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) {
|
|
|
d00bc4 |
TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
|
|
|
d00bc4 |
@@ -308,9 +308,9 @@
|
|
|
d00bc4 |
&& !isUpSampled(tif)) {
|
|
|
d00bc4 |
uint16 ycbcrsubsampling[2];
|
|
|
d00bc4 |
|
|
|
d00bc4 |
- TIFFGetField(tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
- ycbcrsubsampling + 0,
|
|
|
d00bc4 |
- ycbcrsubsampling + 1);
|
|
|
d00bc4 |
+ TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRSUBSAMPLING,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 0,
|
|
|
d00bc4 |
+ ycbcrsubsampling + 1);
|
|
|
d00bc4 |
|
|
|
d00bc4 |
if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) {
|
|
|
d00bc4 |
TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
|