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

fix some autorot issues 

and a problem with vipsthumbnail of tif

see https://github.com/libvips/libvips/issues/1515
This commit is contained in:
John Cupitt 2020-01-07 09:00:14 +00:00
parent 5b09845bd5
commit 1338def535
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvips/foreign/jpeg2vips.c
View File

@ -829,7 +829,7 @@ read_jpeg_generate( VipsRegion *or,
static VipsImage * static VipsImage *
read_jpeg_rotate( VipsObject *process, VipsImage *im ) read_jpeg_rotate( VipsObject *process, VipsImage *im )
{ {
VipsImage **t = (VipsImage **) vips_object_local_array( process, 2 ); VipsImage **t = (VipsImage **) vips_object_local_array( process, 3 );
VipsAngle angle = vips_autorot_get_angle( im ); VipsAngle angle = vips_autorot_get_angle( im );
if( angle != VIPS_ANGLE_D0 ) { if( angle != VIPS_ANGLE_D0 ) {
@ -848,6 +848,10 @@ read_jpeg_rotate( VipsObject *process, VipsImage *im )
return( NULL ); return( NULL );
im = t[1]; im = t[1];
if( vips_copy( im, &t[2], NULL ) )
return( NULL );
im = t[2];
vips_autorot_remove_angle( im ); vips_autorot_remove_angle( im );
} }

33
libvips/foreign/tiff2vips.c
View File

@ -1722,19 +1722,31 @@ rtiff_autorotate( Rtiff *rtiff, VipsImage *in, VipsImage **out )
const guint64 image_size = VIPS_IMAGE_SIZEOF_IMAGE( in ); const guint64 image_size = VIPS_IMAGE_SIZEOF_IMAGE( in );
const guint64 disc_threshold = vips_get_disc_threshold(); const guint64 disc_threshold = vips_get_disc_threshold();
VipsImage *im;
VipsImage *x; VipsImage *x;
if( image_size > disc_threshold ) if( image_size > disc_threshold )
x = vips_image_new_temp_file( "%s.v" ); im = vips_image_new_temp_file( "%s.v" );
else else
x = vips_image_new_memory(); im = vips_image_new_memory();
if( vips_image_write( in, x ) || if( vips_image_write( in, im ) ) {
vips_rot( x, out, angle, NULL ) ) { g_object_unref( im );
g_object_unref( x );
return( -1 ); return( -1 );
} }
g_object_unref( x );
if( vips_rot( im, &x, angle, NULL ) ) {
g_object_unref( im );
return( -1 );
}
g_object_unref( im );
im = x;
if( vips_copy( im, out, NULL ) ) {
g_object_unref( im );
return( -1 );
}
g_object_unref( im );
/* We must remove the tag to prevent accidental /* We must remove the tag to prevent accidental
* double rotations. * double rotations.
@ -1901,6 +1913,7 @@ static int
rtiff_stripwise_generate( VipsRegion *or, rtiff_stripwise_generate( VipsRegion *or,
void *seq, void *a, void *b, gboolean *stop ) void *seq, void *a, void *b, gboolean *stop )
{ {
VipsImage *out = or->im;
Rtiff *rtiff = (Rtiff *) a; Rtiff *rtiff = (Rtiff *) a;
int read_height = rtiff->header.read_height; int read_height = rtiff->header.read_height;
int page_height = rtiff->header.height; int page_height = rtiff->header.height;
@ -1964,17 +1977,17 @@ rtiff_stripwise_generate( VipsRegion *or,
*/ */
image.left = 0; image.left = 0;
image.top = 0; image.top = 0;
image.width = rtiff->out->Xsize; image.width = out->Xsize;
image.height = rtiff->out->Ysize; image.height = out->Ysize;
page.left = 0; page.left = 0;
page.top = page_height * ((r->top + y) / page_height); page.top = page_height * ((r->top + y) / page_height);
page.width = rtiff->out->Xsize; page.width = out->Xsize;
page.height = page_height; page.height = page_height;
strip.left = 0; strip.left = 0;
strip.top = page.top + strip_no * read_height; strip.top = page.top + strip_no * read_height;
strip.width = rtiff->out->Xsize; strip.width = out->Xsize;
strip.height = read_height; strip.height = read_height;
/* Clip strip against page and image ... the final strip will /* Clip strip against page and image ... the final strip will