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

fewer warnings on tiffload

Browse Source 
We were setting TIFFTAG_JPEGCOLORMODE == JPEGCOLORMODE_RGB for *all*
images, but libtiff warns if you use it on an image which is not
jpg-compressed.

Only set it for jpg-compressed images.

See https://github.com/libvips/libvips/issues/1329
This commit is contained in:
John Cupitt 2019-07-02 12:23:53 +01:00
parent 01a92679b5
commit 26100041e7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,7 @@ magic number [przemyslawpluta]
- disable Orc if building with CET [lovell] - disable Orc if building with CET [lovell]
- fix vipsthumbnail with pyr tiff [kleisauke] - fix vipsthumbnail with pyr tiff [kleisauke]
- text autofit could occasionally terminate early [levmorozov] - text autofit could occasionally terminate early [levmorozov]
- fewer warnings on tiffload [chregu]
21/9/18 started 8.8.0 21/9/18 started 8.8.0
- much faster smartcrop [lovell] - much faster smartcrop [lovell]

13
libvips/foreign/tiff2vips.c
View File

@ -254,6 +254,7 @@ typedef struct _RtiffHeader {
gboolean separate; gboolean separate;
int orientation; int orientation;
gboolean premultiplied; gboolean premultiplied;
uint16 compression;
/* Result of TIFFIsTiled(). /* Result of TIFFIsTiled().
*/ */
@ -1331,9 +1332,12 @@ rtiff_set_header( Rtiff *rtiff, VipsImage *out )
uint32 data_length; uint32 data_length;
void *data; void *data;
/* Request YCbCr expansion. /* Request YCbCr expansion. libtiff complains if you do this for
* non-jpg images.
*/ */
TIFFSetField( rtiff->tiff, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB ); if( rtiff->header.compression == COMPRESSION_JPEG )
TIFFSetField( rtiff->tiff,
TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB );
out->Xsize = rtiff->header.width; out->Xsize = rtiff->header.width;
out->Ysize = rtiff->header.height * rtiff->n; out->Ysize = rtiff->header.height * rtiff->n;
@ -2074,7 +2078,6 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
{ {
uint16 extra_samples_count; uint16 extra_samples_count;
uint16 *extra_samples_types; uint16 *extra_samples_types;
uint16 compression;
if( !tfget32( rtiff->tiff, TIFFTAG_IMAGEWIDTH, &header->width ) || if( !tfget32( rtiff->tiff, TIFFTAG_IMAGEWIDTH, &header->width ) ||
!tfget32( rtiff->tiff, TIFFTAG_IMAGELENGTH, &header->height ) || !tfget32( rtiff->tiff, TIFFTAG_IMAGELENGTH, &header->height ) ||
@ -2088,8 +2091,8 @@ rtiff_header_read( Rtiff *rtiff, RtiffHeader *header )
return( -1 ); return( -1 );
TIFFGetFieldDefaulted( rtiff->tiff, TIFFGetFieldDefaulted( rtiff->tiff,
TIFFTAG_COMPRESSION, &compression ); TIFFTAG_COMPRESSION, &header->compression );
if( compression == COMPRESSION_JPEG ) if( header->compression == COMPRESSION_JPEG )
/* We want to always expand subsampled YCBCR images to full /* We want to always expand subsampled YCBCR images to full
* RGB. * RGB.
*/ */