Changeset 13773

Show
Ignore:
Timestamp:
02/13/08 02:24:51 (3 months ago)
Author:
warmerdam
Message:

reintroduce JPEGCOLORMODE setting in OpenOffset?() (#2189)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/gdal/frmts/gtiff/geotiff.cpp

    r13771 r13773  
    30753075    if( !TIFFGetField( hTIFF, TIFFTAG_COMPRESSION, &(nCompression) ) ) 
    30763076        nCompression = COMPRESSION_NONE; 
     3077 
     3078/* -------------------------------------------------------------------- */ 
     3079/*      YCbCr JPEG compressed images should be translated on the fly    */ 
     3080/*      to RGB by libtiff/libjpeg unless specifically requested         */ 
     3081/*      otherwise.                                                      */ 
     3082/* -------------------------------------------------------------------- */ 
     3083    if( nCompression == COMPRESSION_JPEG  
     3084        && nPhotometric == PHOTOMETRIC_YCBCR  
     3085        && CSLTestBoolean( CPLGetConfigOption("CONVERT_YCBCR_TO_RGB", 
     3086                                              "YES") ) ) 
     3087    { 
     3088        int nColorMode; 
     3089 
     3090        TIFFGetField( hTIFF, TIFFTAG_JPEGCOLORMODE, &nColorMode ); 
     3091        if( nColorMode != JPEGCOLORMODE_RGB ) 
     3092            TIFFSetField(hTIFF, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB); 
     3093    } 
    30773094 
    30783095/* -------------------------------------------------------------------- */