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

don't call jpeg_finish_decompress()

Browse Source 
all it does is verify the trailing bytes in the file

see https://github.com/lovell/sharp/issues/151
This commit is contained in:
John Cupitt 2015-01-20 16:55:35 +00:00
parent 3afbb51365
commit 6ff1d5320b
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libvips/foreign/jpeg2vips.c
View File

@ -61,6 +61,9 @@
* - support "none" as a resolution unit * - support "none" as a resolution unit
* 16/10/14 * 16/10/14
* - add "autorotate" option * - add "autorotate" option
* 20/1/15
* - don't call jpeg_finish_decompress(), all it does is read and check
* the tail of the file
*/ */
/* /*
@ -153,10 +156,6 @@ typedef struct _ReadJpeg {
ErrorManager eman; ErrorManager eman;
gboolean invert_pels; gboolean invert_pels;
/* Set if we need to finish the decompress.
*/
gboolean decompressing;
/* Track the y pos during a read with this. /* Track the y pos during a read with this.
*/ */
int y_pos; int y_pos;
@ -191,14 +190,10 @@ readjpeg_free( ReadJpeg *jpeg )
jpeg->eman.pub.num_warnings = 0; jpeg->eman.pub.num_warnings = 0;
} }
if( jpeg->decompressing ) { /* Don't call jpeg_finish_decompress(). It just checks the tail of the
/* jpeg_finish_decompress() can fail ... catch any errors. * file and who cares about that. All mem is freed in
*/ * jpeg_destroy_decompress().
if( !setjmp( jpeg->eman.jmp ) ) */
jpeg_finish_decompress( &jpeg->cinfo );
jpeg->decompressing = FALSE;
}
VIPS_FREEF( fclose, jpeg->eman.fp ); VIPS_FREEF( fclose, jpeg->eman.fp );
VIPS_FREE( jpeg->filename ); VIPS_FREE( jpeg->filename );
@ -231,7 +226,6 @@ readjpeg_new( VipsImage *out,
jpeg->fail = fail; jpeg->fail = fail;
jpeg->readbehind = readbehind; jpeg->readbehind = readbehind;
jpeg->filename = NULL; jpeg->filename = NULL;
jpeg->decompressing = FALSE;
jpeg->cinfo.err = jpeg_std_error( &jpeg->eman.pub ); jpeg->cinfo.err = jpeg_std_error( &jpeg->eman.pub );
jpeg->eman.pub.error_exit = vips__new_error_exit; jpeg->eman.pub.error_exit = vips__new_error_exit;
jpeg->eman.pub.output_message = vips__new_output_message; jpeg->eman.pub.output_message = vips__new_output_message;
@ -1024,11 +1018,7 @@ read_jpeg_image( ReadJpeg *jpeg, VipsImage *out )
if( read_jpeg_header( jpeg, t[0] ) ) if( read_jpeg_header( jpeg, t[0] ) )
return( -1 ); return( -1 );
/* Set decompressing to make readjpeg_free() call
* jpeg_stop_decompress().
*/
jpeg_start_decompress( cinfo ); jpeg_start_decompress( cinfo );
jpeg->decompressing = TRUE;
#ifdef DEBUG #ifdef DEBUG
printf( "read_jpeg_image: starting decompress\n" ); printf( "read_jpeg_image: starting decompress\n" );

2
libvips/foreign/vips2tiff.c
View File

@ -1496,7 +1496,7 @@ tiff_copy( TiffWrite *tw, TIFF *out, TIFF *in )
/* Enable rgb->ycbcr conversion in the jpeg write. /* Enable rgb->ycbcr conversion in the jpeg write.
*/ */
if( !tw->rgbjpeg && if( !tw->rgbjpeg &&
tw->jpqual >= 90 ) tw->jpqual < 90 )
TIFFSetField( out, TIFFSetField( out,
TIFFTAG_JPEGCOLORMODE, TIFFTAG_JPEGCOLORMODE,
JPEGCOLORMODE_RGB ); JPEGCOLORMODE_RGB );