Changeset 13659

Timestamp:

02/01/08 16:53:51 (3 months ago)

Author:

warmerdam

Message:

Modified so that the RGBA interface is not used for YCbCr mode JPEG
compressed data. Set JPEGCOLORMODE to RGB at the point a directory is read
to avoid error report if doing it later during writing. This fixes the GDAL
1.5.0 issues with writing YCbCr JPEG compressed data. Also includes a patch
in libtiff/tif_jpeg.c to avoid subsamplingfixup if no data written yet.(#2189)

Files:

• branches/1.5/gdal/frmts/gtiff/geotiff.cpp (modified) (3 diffs)
• branches/1.5/gdal/frmts/gtiff/libtiff/tif_jpeg.c (modified) (2 diffs)

branches/1.5/gdal/frmts/gtiff/geotiff.cpp

@@ -1900 +1900 @@
-    if( nLoadedBlock == nBlockId )
-        return CE_None;
-
-/* -------------------------------------------------------------------- */
-/*      This is rather overkill, but relatively harmless so we do it    */
-/*      here to be sure.                                                */
-/* -------------------------------------------------------------------- */
-    if( nCompression == COMPRESSION_JPEG 
-        && nPhotometric == PHOTOMETRIC_YCBCR 
-        && CSLTestBoolean( CPLGetConfigOption("CONVERT_YCBCR_TO_RGB",
-                                              "YES") ) )
-    {
-        TIFFSetField(hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
-    }
-
-/* -------------------------------------------------------------------- */
@@ -3101 +3089 @@
-        nPhotometric == PHOTOMETRIC_LOGLUV ||
-        ( nPhotometric == PHOTOMETRIC_YCBCR 
-
-
+
-    {
-        char    szMessage[1024];
@@ -3117 +3104 @@
-    }
-        
+/* -------------------------------------------------------------------- */
+/*      YCbCr JPEG compressed images should be translated on the fly    */
+/*      to RGB by libtiff/libjpeg unless specifically requested         */
+/*      otherwise.                                                      */
+/* -------------------------------------------------------------------- */
+    if( nCompression == COMPRESSION_JPEG 
+        && nPhotometric == PHOTOMETRIC_YCBCR 
+        && CSLTestBoolean( CPLGetConfigOption("CONVERT_YCBCR_TO_RGB",
+                                              "YES") ) )
+    {
+        TIFFSetField(hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+    }
+
-/* -------------------------------------------------------------------- */
-/*      Should we treat this via the odd bits interface?                */

branches/1.5/gdal/frmts/gtiff/libtiff/tif_jpeg.c

@@ -1 @@
-5 2007/12/10 19:58:41
+6 2008/02/01 21:50:24
-
-/*
@@ -682 +682 @@
-        static const char module[] = "JPEGFixupTagsSubsampling";
-        struct JPEGFixupTagsSubsamplingData m;
+
+        if( tif->tif_dir.td_stripbytecount == NULL
+            || tif->tif_dir.td_stripbytecount[0] == 0 )
+        {
+            /* Do not even try to check if the first strip/tile does not
+               yet exist, as occurs when GDAL has created a new NULL file
+               for instance. */
+            return;
+        }
+
-        m.tif=tif;
-        m.buffersize=2048;