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

jpeg read oops

Browse Source
This commit is contained in:
John Cupitt 2012-11-05 14:41:31 +00:00
parent 9b197dbd17
commit 2048ec2356
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libvips/foreign/jpeg2vips.c
View File

@ -842,7 +842,6 @@ read_jpeg_generate( VipsRegion *or,
struct jpeg_decompress_struct *cinfo = &jpeg->cinfo; struct jpeg_decompress_struct *cinfo = &jpeg->cinfo;
int sz = cinfo->output_width * cinfo->output_components; int sz = cinfo->output_width * cinfo->output_components;
JSAMPROW row_pointer[8];
int y; int y;
#ifdef DEBUG #ifdef DEBUG
@ -871,18 +870,20 @@ read_jpeg_generate( VipsRegion *or,
if( setjmp( jpeg->eman.jmp ) ) if( setjmp( jpeg->eman.jmp ) )
return( -1 ); return( -1 );
for( y = 0; y < r->height; y++ ) for( y = 0; y < r->height; y++ ) {
row_pointer[y] = (JSAMPLE *) JSAMPROW row_pointer[1];
row_pointer[0] = (JSAMPLE *)
VIPS_REGION_ADDR( or, 0, r->top + y ); VIPS_REGION_ADDR( or, 0, r->top + y );
jpeg_read_scanlines( cinfo, &row_pointer[0], r->height ); jpeg_read_scanlines( cinfo, &row_pointer[0], 1 );
if( jpeg->invert_pels ) { if( jpeg->invert_pels ) {
int x; int x;
for( y = 0; y < r->height; y++ )
for( x = 0; x < sz; x++ ) for( x = 0; x < sz; x++ )
row_pointer[y][x] = 255 - row_pointer[y][x]; row_pointer[0][x] = 255 - row_pointer[0][x];
}
} }
return( 0 ); return( 0 );