sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix TIFFReadScanline() call

Browse Source 
We were passing in 0 instead of -1, which could trigger an assert in
libtiff with some logluv images.

Also, fix logluv decode. We were not always resetting the decode format.
This commit is contained in:
John Cupitt 2020-06-21 12:17:05 +01:00
parent c0daa8ffd2
commit e129dfc27a
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libvips/foreign/tiff2vips.c
View File

@ -605,7 +605,7 @@ rtiff_strip_read( Rtiff *rtiff, int strip, tdata_t buf )
if( rtiff->header.read_scanlinewise ) if( rtiff->header.read_scanlinewise )
length = TIFFReadScanline( rtiff->tiff, length = TIFFReadScanline( rtiff->tiff,
buf, strip, (tsize_t) -1 ); buf, strip, (tsample_t) 0 );
else else
length = TIFFReadEncodedStrip( rtiff->tiff, length = TIFFReadEncodedStrip( rtiff->tiff,
strip, buf, (tsize_t) -1 ); strip, buf, (tsize_t) -1 );
@ -619,6 +619,25 @@ rtiff_strip_read( Rtiff *rtiff, int strip, tdata_t buf )
return( 0 ); return( 0 );
} }
/* We need to hint to libtiff what format we'd like pixels in.
*/
static void
rtiff_set_decode_format( Rtiff *rtiff )
{
/* Ask for YCbCr->RGB for jpg data.
*/
if( rtiff->header.compression == COMPRESSION_JPEG )
TIFFSetField( rtiff->tiff,
TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB );
/* Ask for SGI LOGLUV as 3xfloat.
*/
if( rtiff->header.photometric_interpretation ==
PHOTOMETRIC_LOGLUV )
TIFFSetField( rtiff->tiff,
TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_FLOAT );
}
static int static int
rtiff_set_page( Rtiff *rtiff, int page ) rtiff_set_page( Rtiff *rtiff, int page )
{ {
@ -665,12 +684,10 @@ rtiff_set_page( Rtiff *rtiff, int page )
rtiff->current_page = page; rtiff->current_page = page;
/* This can get unset when we change directories. Make sure /* These can get unset when we change directories. Make sure
* it's set again. * they are set again.
*/ */
if( rtiff->header.compression == COMPRESSION_JPEG ) rtiff_set_decode_format( rtiff );
TIFFSetField( rtiff->tiff,
TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB );
} }
return( 0 ); return( 0 );
@ -1601,21 +1618,10 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
uint32 data_length; uint32 data_length;
void *data; void *data;
/* Request YCbCr expansion. libtiff complains if you do this for rtiff_set_decode_format( rtiff );
* non-jpg images.
*/
if( rtiff->header.compression == COMPRESSION_JPEG )
TIFFSetField( rtiff->tiff,
TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB );
/* Ask for LOGLUV as 3 x float XYZ.
*/
if( rtiff->header.photometric_interpretation == PHOTOMETRIC_LOGLUV ) {
TIFFSetField( rtiff->tiff,
TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_FLOAT );
if( rtiff->header.photometric_interpretation == PHOTOMETRIC_LOGLUV )
vips_image_set_double( out, "stonits", rtiff->header.stonits ); vips_image_set_double( out, "stonits", rtiff->header.stonits );
}
out->Xsize = rtiff->header.width; out->Xsize = rtiff->header.width;
out->Ysize = rtiff->header.height * rtiff->n; out->Ysize = rtiff->header.height * rtiff->n;
@ -2371,14 +2377,16 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
TIFFGetFieldDefaulted( rtiff->tiff, TIFFGetFieldDefaulted( rtiff->tiff,
TIFFTAG_COMPRESSION, &header->compression ); TIFFTAG_COMPRESSION, &header->compression );
/* We must set this here since it'll change the value of scanline_size.
*/
rtiff_set_decode_format( rtiff );
/* Request YCbCr expansion. libtiff complains if you do this for /* Request YCbCr expansion. libtiff complains if you do this for
* non-jpg images. We must set this here since it changes the result * non-jpg images. We must set this here since it changes the result
* of scanline_size. * of scanline_size.
*/ */
if( header->compression == COMPRESSION_JPEG ) if( header->compression != COMPRESSION_JPEG &&
TIFFSetField( rtiff->tiff, header->photometric_interpretation == PHOTOMETRIC_YCBCR ) {
TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB );
else if( header->photometric_interpretation == PHOTOMETRIC_YCBCR ) {
/* We rely on the jpg decompressor to upsample chroma /* We rely on the jpg decompressor to upsample chroma
* subsampled images. If there is chroma subsampling but * subsampled images. If there is chroma subsampling but
* no jpg compression, we have to give up. * no jpg compression, we have to give up.
@ -2404,12 +2412,6 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
"%s", _( "not SGI-compressed LOGLUV" ) ); "%s", _( "not SGI-compressed LOGLUV" ) );
return( -1 ); return( -1 );
} }
/* Always get LOGLUV as 3 x float XYZ. We must set this here
* since it'll change the value of scanline_size.
*/
TIFFSetField( rtiff->tiff,
TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_FLOAT );
} }
/* For logluv, the calibration factor to get to absolute luminance. /* For logluv, the calibration factor to get to absolute luminance.