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

tiny tiff2vips cleanup

This commit is contained in:
John Cupitt 2016-11-14 09:04:17 +00:00
parent 85be55fe4f
commit 92c549e995
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libvips/foreign/tiff2vips.c
View File

@ -1824,35 +1824,31 @@ readtiff_new( VipsImage *out,
return( rtiff );
}
static int
readtiff_set_directory( ReadTiff *rtiff, int page )
{
if( !TIFFSetDirectory( rtiff->tiff, page ) ) {
vips_error( "tiff2vips",
_( "TIFF does not contain page %d" ), rtiff->page );
return( -1 );
}
return( 0 );
}
static ReadTiff *
readtiff_new_filename( const char *filename, VipsImage *out,
int page, gboolean autorotate, gboolean readbehind )
{
ReadTiff *rtiff;
int i;
if( !(rtiff = readtiff_new( out, page, autorotate, readbehind )) )
if( !(rtiff = readtiff_new( out, page, autorotate, readbehind )) ||
!(rtiff->tiff = vips__tiff_openin( filename )) ||
readtiff_set_directory( rtiff, page ) )
return( NULL );
rtiff->filename = vips_strdup( VIPS_OBJECT( out ), filename );
/* No mmap --- no performance advantage with libtiff, and it burns up
* our VM if the tiff file is large.
*/
if( !(rtiff->tiff = vips__tiff_openin( filename )) ) {
vips_error( "tiff2vips", _( "unable to open \"%s\" for input" ),
filename );
return( NULL );
}
for( i = 0; i < page; i++ )
if( !TIFFReadDirectory( rtiff->tiff ) ) {
vips_error( "tiff2vips",
_( "TIFF does not contain page %d" ),
rtiff->page );
return( NULL );
}
return( rtiff );
}
@ -1861,22 +1857,12 @@ readtiff_new_buffer( const void *buf, size_t len, VipsImage *out,
int page, gboolean autorotate, gboolean readbehind )
{
ReadTiff *rtiff;
int i;
if( !(rtiff = readtiff_new( out, page, autorotate, readbehind )) )
if( !(rtiff = readtiff_new( out, page, autorotate, readbehind )) ||
!(rtiff->tiff = vips__tiff_openin_buffer( out, buf, len )) ||
readtiff_set_directory( rtiff, page ) )
return( NULL );
if( !(rtiff->tiff = vips__tiff_openin_buffer( out, buf, len )) )
return( NULL );
for( i = 0; i < page; i++ )
if( !TIFFReadDirectory( rtiff->tiff ) ) {
vips_error( "tiff2vips",
_( "TIFF does not contain page %d" ),
rtiff->page );
return( NULL );
}
return( rtiff );
}