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

tiff load from buffer done

Browse Source
This commit is contained in:
John Cupitt 2014-04-22 13:19:21 +01:00
parent 3f11403346
commit 567487cb33
2 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libvips/foreign/tiff2vips.c
View File

@ -1686,7 +1686,7 @@ readtiff_new_filename( const char *filename, VipsImage *out, int page,
ReadTiff *rtiff;
int i;
if( !(rtiff = readtiff_new_filename( out, page, readbehind )) )
if( !(rtiff = readtiff_new( out, page, readbehind )) )
return( NULL );
rtiff->filename = vips_strdup( VIPS_OBJECT( out ), filename );
@ -1728,18 +1728,14 @@ my_tiff_read( thandle_t st, tdata_t buffer, tsize_t size )
static tsize_t
my_tiff_write( thandle_t st, tdata_t buffer, tsize_t size )
{
ReadTiff *rtiff = (ReadTiff *) st;
g_assert( 0 );
return( 0 );
}
static int
my_tiff_close( thandle_t )
my_tiff_close( thandle_t st )
{
ReadTiff *rtiff = (ReadTiff *) st;
return 0;
}
@ -1769,20 +1765,16 @@ my_tiff_size( thandle_t st )
}
static int
my_tiff_map( thandle_t, tdata_t *, toff_t * )
my_tiff_map( thandle_t st, tdata_t *start, toff_t *len )
{
ReadTiff *rtiff = (ReadTiff *) st;
g_assert( 0 );
return 0;
}
static void
my_tiff_unmap( thandle_t, tdata_t, toff_t )
my_tiff_unmap( thandle_t st, tdata_t start, toff_t len )
{
ReadTiff *rtiff = (ReadTiff *) st;
g_assert( 0 );
return;
@ -1801,7 +1793,7 @@ readtiff_new_buffer( void *buf, size_t len, VipsImage *out, int page,
rtiff->buf = buf;
rtiff->len = len;
if( !(rtiff->tiff = TIFFClientOpen( "Memory", "w",
if( !(rtiff->tiff = TIFFClientOpen( "memory buffer", "rm",
(thandle_t) rtiff,
my_tiff_read, my_tiff_write, my_tiff_seek, my_tiff_close,
my_tiff_size, my_tiff_map, my_tiff_unmap )) ) {
@ -1821,35 +1813,6 @@ readtiff_new_buffer( void *buf, size_t len, VipsImage *out, int page,
return( rtiff );
}
/* Pull out the nth directory from a TIFF file.
*/
static TIFF *
get_directory( const char *filename, int page )
{
TIFF *tif;
int i;
/* No mmap --- no performance advantage with libtiff, and it burns up
* our VM if the tiff file is large.
*/
if( !(tif = TIFFOpen( filename, "rm" )) ) {
vips_error( "tiff2vips",
_( "unable to open \"%s\" for input" ),
filename );
return( NULL );
}
for( i = 0; i < page; i++ )
if( !TIFFReadDirectory( tif ) ) {
/* Run out of directories.
*/
TIFFClose( tif );
return( NULL );
}
return( tif );
}
/*
FIXME ... Unused for now, perhaps if we add another format flag.

11
libvips/iofuncs/util.c
View File

@ -765,16 +765,13 @@ vips__file_open_write( const char *filename, gboolean text_mode )
char *
vips__file_read( FILE *fp, const char *filename, unsigned int *length_out )
{
long len;
gint64 len;
size_t read;
char *str;
/* Find length.
*/
fseek( fp, 0L, 2 );
len = ftell( fp );
if( len > 20 * 1024 * 1024 ) {
/* Seems crazy!
len = vips_file_length( fileno( fp ) );
if( len > 1024 * 1024 * 1024 ) {
/* Over a gb? Seems crazy!
*/
vips_error( "vips__file_read",
_( "\"%s\" too long" ), filename );