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

Merge branch '8.10'

Browse Source
This commit is contained in:
John Cupitt 2020-09-03 19:33:09 +01:00
commit 610eea5462
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -10,6 +10,7 @@
- ensure SVG loader skips input with chars outside x09-x7F range [lovell] - ensure SVG loader skips input with chars outside x09-x7F range [lovell]
- better mask sizing in gaussmat [johntrunc] - better mask sizing in gaussmat [johntrunc]
- fix tiffsave "squash" handling [barryspearce] - fix tiffsave "squash" handling [barryspearce]
- fix jpegload autorotate [chregu]
24/1/20 started 8.10.0 24/1/20 started 8.10.0
- more conformat IIIF output from dzsave [regisrob] - more conformat IIIF output from dzsave [regisrob]

10
libvips/foreign/jpeg2vips.c
View File

@ -837,7 +837,7 @@ read_jpeg_image( ReadJpeg *jpeg, VipsImage *out )
{ {
struct jpeg_decompress_struct *cinfo = &jpeg->cinfo; struct jpeg_decompress_struct *cinfo = &jpeg->cinfo;
VipsImage **t = (VipsImage **) VipsImage **t = (VipsImage **)
vips_object_local_array( VIPS_OBJECT( out ), 4 ); vips_object_local_array( VIPS_OBJECT( out ), 5 );
VipsImage *im; VipsImage *im;
@ -872,11 +872,13 @@ read_jpeg_image( ReadJpeg *jpeg, VipsImage *out )
if( jpeg->autorotate && if( jpeg->autorotate &&
vips_image_get_orientation( im ) != 1 ) { vips_image_get_orientation( im ) != 1 ) {
/* This will go via a huge memory buffer :-( /* We have to copy to memory before calling autorot, since it
* needs random access.
*/ */
if( vips_autorot( im, &t[3], NULL ) ) if( !(t[3] = vips_image_copy_memory( im )) ||
vips_autorot( t[3], &t[4], NULL ) )
return( -1 ); return( -1 );
im = t[3]; im = t[4];
} }
if( vips_image_write( im, out ) ) if( vips_image_write( im, out ) )