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

fix tiff load for plane-separate images

Browse Source 
need an extra case in geometry sanity check
This commit is contained in:
John Cupitt 2013-09-26 11:58:46 +01:00
parent d435a5c14d
commit 425060a1d0
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libvips/foreign/tiff2vips.c
View File

@ -1018,12 +1018,22 @@ parse_header( ReadTiff *rtiff, VipsImage *out )
/* Double check: in memcpy mode, the vips linesize should exactly
* match the tiff line size.
*/
if( rtiff->memcpy &&
TIFFScanlineSize( rtiff->tiff ) !=
VIPS_IMAGE_SIZEOF_LINE( out ) ) {
vips_error( "tiff2vips",
"%s", _( "unsupported tiff image type" ) );
return( -1 );
if( rtiff->memcpy ) {
size_t vips_line_size;
/* Lines are smaller in plane-separated mode.
*/
if( rtiff->separate )
vips_line_size =
VIPS_IMAGE_SIZEOF_ELEMENT( out ) * width;
else
vips_line_size = VIPS_IMAGE_SIZEOF_LINE( out );
if( TIFFScanlineSize( rtiff->tiff ) != vips_line_size ) {
vips_error( "tiff2vips",
"%s", _( "unsupported tiff image type" ) );
return( -1 );
}
}
/* Read any ICC profile.