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

Merge branch '8.5'

Browse Source
This commit is contained in:
John Cupitt 2017-05-05 14:28:21 +01:00
commit e897311af8
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -7,7 +7,7 @@
23/4/17 started 8.5.5 23/4/17 started 8.5.5
- doc polishing - doc polishing
- more improvements for tuncated PNG files, thanks juyunsang - more improvements for truncated PNG files, thanks juyunsang
23/4/17 started 8.5.4 23/4/17 started 8.5.4
- don't depend on image width when setting n_lines, thanks kleisauke - don't depend on image width when setting n_lines, thanks kleisauke

31
libvips/foreign/vipspng.c
View File

@ -125,7 +125,11 @@
static void static void
user_error_function( png_structp png_ptr, png_const_charp error_msg ) user_error_function( png_structp png_ptr, png_const_charp error_msg )
{ {
vips_error( "vipspng", "%s", error_msg ); #ifdef DEBUG
printf( "user_error_function: %s\n", error_msg );
#endif /*DEBUG*/
g_warning( "%s", error_msg );
/* This function must not return or the default error handler will be /* This function must not return or the default error handler will be
* invoked. * invoked.
@ -136,7 +140,11 @@ user_error_function( png_structp png_ptr, png_const_charp error_msg )
static void static void
user_warning_function( png_structp png_ptr, png_const_charp warning_msg ) user_warning_function( png_structp png_ptr, png_const_charp warning_msg )
{ {
vips_error( "vipspng", "%s", warning_msg ); #ifdef DEBUG
printf( "user_warning_function: %s\n", warning_msg );
#endif /*DEBUG*/
g_warning( "%s", warning_msg );
} }
/* What we track during a PNG read. /* What we track during a PNG read.
@ -523,7 +531,7 @@ png2vips_generate( VipsRegion *or,
for( y = 0; y < r->height; y++ ) { for( y = 0; y < r->height; y++ ) {
png_bytep q = (png_bytep) VIPS_REGION_ADDR( or, 0, r->top + y ); png_bytep q = (png_bytep) VIPS_REGION_ADDR( or, 0, r->top + y );
/* We need to catch and ignore errors from read_row(). /* We need to catch errors from read_row().
*/ */
if( !setjmp( png_jmpbuf( read->pPng ) ) ) if( !setjmp( png_jmpbuf( read->pPng ) ) )
png_read_row( read->pPng, q, NULL ); png_read_row( read->pPng, q, NULL );
@ -541,21 +549,28 @@ png2vips_generate( VipsRegion *or,
g_thread_self() ); g_thread_self() );
#endif /*DEBUG*/ #endif /*DEBUG*/
/* ... except if fail is on, in which case we bail out. /* And bail if fail is on. We have to add an error
* message, since the handler we install just does
* g_warning().
*/ */
if( read->fail ) if( read->fail ) {
vips_error( "vipspng",
"%s", _( "libpng read error" ) );
return( -1 ); return( -1 );
} }
}
read->y_pos += 1; read->y_pos += 1;
} }
/* Turn errors back on. png_read_end() can trigger them too, for /* Catch errors from png_read_end(). This can fail on a truncated
* example for a truncated file. * file.
*/ */
if( setjmp( png_jmpbuf( read->pPng ) ) ) { if( setjmp( png_jmpbuf( read->pPng ) ) ) {
if( read->fail ) if( read->fail ) {
vips_error( "vipspng", "%s", _( "libpng read error" ) );
return( -1 ); return( -1 );
}
return( 0 ); return( 0 );
} }