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

check read order for strip tiffs

Browse Source 
double-check seq is working, related to https://github.com/libvips/libvips/issues/1158
This commit is contained in:
John Cupitt 2018-11-13 17:29:36 +00:00
parent d6c7d86e12
commit b84bf6d4f4
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libvips/foreign/tiff2vips.c
View File

@ -319,6 +319,10 @@ typedef struct _Rtiff {
* strips or tiles interleaved. * strips or tiles interleaved.
*/ */
tdata_t contig_buf; tdata_t contig_buf;
/* The Y we are reading at. Used to verify strip read is sequential.
*/
int y_pos;
} Rtiff; } Rtiff;
/* Test for field exists. /* Test for field exists.
@ -492,6 +496,7 @@ rtiff_new( VipsImage *out, int page, int n, gboolean autorotate )
rtiff->memcpy = FALSE; rtiff->memcpy = FALSE;
rtiff->plane_buf = NULL; rtiff->plane_buf = NULL;
rtiff->contig_buf = NULL; rtiff->contig_buf = NULL;
rtiff->y_pos = 0;
g_signal_connect( out, "close", g_signal_connect( out, "close",
G_CALLBACK( rtiff_close_cb ), rtiff ); G_CALLBACK( rtiff_close_cb ), rtiff );
@ -1825,8 +1830,9 @@ rtiff_stripwise_generate( VipsRegion *or,
int y; int y;
#ifdef DEBUG #ifdef DEBUG
printf( "tiff2vips: read_stripwise_generate: top = %d, height = %d\n", printf( "rtiff_stripwise_generate: top = %d, height = %d\n",
r->top, r->height ); r->top, r->height );
printf( "rtiff_stripwise_generate: y_top = %d\n", rtiff->y_pos );
#endif /*DEBUG*/ #endif /*DEBUG*/
/* We're inside a tilecache where tiles are the full image width, so /* We're inside a tilecache where tiles are the full image width, so
@ -1846,6 +1852,15 @@ rtiff_stripwise_generate( VipsRegion *or,
g_assert( r->height == g_assert( r->height ==
VIPS_MIN( rows_per_strip, or->im->Ysize - r->top ) ); VIPS_MIN( rows_per_strip, or->im->Ysize - r->top ) );
/* And check that y_pos is correct. It should be, since we are inside
* a vips_sequential().
*/
if( r->top != rtiff->y_pos ) {
vips_error( "tiff2vips",
_( "out of order read at line %d" ), rtiff->y_pos );
return( -1 );
}
VIPS_GATE_START( "rtiff_stripwise_generate: work" ); VIPS_GATE_START( "rtiff_stripwise_generate: work" );
y = 0; y = 0;
@ -1943,12 +1958,17 @@ rtiff_stripwise_generate( VipsRegion *or,
} }
y += hit.height; y += hit.height;
rtiff->y_pos += hit.height;
} }
/* Shut down the input file as soon as we can. /* Shut down the input file as soon as we can.
*/ */
if( r->top + y >= or->im->Ysize ) if( rtiff->y_pos >= or->im->Ysize ) {
#ifdef DEBUG
printf( "rtiff_stripwise_generate: early shutdown\n" );
#endif /*DEBUG*/
rtiff_free( rtiff ); rtiff_free( rtiff );
}
VIPS_GATE_STOP( "rtiff_stripwise_generate: work" ); VIPS_GATE_STOP( "rtiff_stripwise_generate: work" );

2
libvips/foreign/tiffload.c
View File

@ -253,7 +253,7 @@ vips_foreign_load_tiff_buffer_get_flags( VipsForeignLoad *load )
VipsForeignFlags flags; VipsForeignFlags flags;
flags = 0; flags = 0;
if( vips__istifftiled_buffer( buffer->buf->data, buffer->buf->length ) ) if( vips__istifftiled_buffer( buffer->buf->data, buffer->buf->length ) )
flags |= VIPS_FOREIGN_PARTIAL; flags |= VIPS_FOREIGN_PARTIAL;
else else
flags |= VIPS_FOREIGN_SEQUENTIAL; flags |= VIPS_FOREIGN_SEQUENTIAL;