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

fix thumbnail crop on rotated images

Browse Source 
crop after rotate so we don't need to rotate the crop box

thanks ElHeineken!

see https://github.com/jcupitt/libvips/issues/608
This commit is contained in:
John Cupitt 2017-02-23 20:26:59 +00:00
parent 4bcbcbbf49
commit 6cbda61ec1
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libvips/resample/thumbnail.c
View File

@ -464,18 +464,6 @@ vips_thumbnail_build( VipsObject *object )
in = out; in = out;
} }
if( thumbnail->crop ) {
int left = (in->Xsize - thumbnail->width) / 2;
int top = (in->Ysize - thumbnail->height) / 2;
g_info( "cropping to %dx%d",
thumbnail->width, thumbnail->height );
if( vips_extract_area( in, &t[8], left, top,
thumbnail->width, thumbnail->height, NULL ) )
return( -1 );
in = t[8];
}
if( thumbnail->auto_rotate && if( thumbnail->auto_rotate &&
thumbnail->angle != VIPS_ANGLE_D0 ) { thumbnail->angle != VIPS_ANGLE_D0 ) {
VipsAngle angle = vips_autorot_get_angle( in ); VipsAngle angle = vips_autorot_get_angle( in );
@ -493,6 +481,21 @@ vips_thumbnail_build( VipsObject *object )
vips_autorot_remove_angle( in ); vips_autorot_remove_angle( in );
} }
/* Crop after rotate so we don't need to rotate the crop box.
*/
if( thumbnail->crop ) {
int left = (in->Xsize - thumbnail->width) / 2;
int top = (in->Ysize - thumbnail->height) / 2;
g_info( "cropping to %dx%d",
thumbnail->width, thumbnail->height );
if( vips_extract_area( in, &t[8], left, top,
thumbnail->width, thumbnail->height, NULL ) )
return( -1 );
in = t[8];
}
g_object_set( thumbnail, "out", vips_image_new(), NULL ); g_object_set( thumbnail, "out", vips_image_new(), NULL );
if( vips_image_write( in, thumbnail->out ) ) if( vips_image_write( in, thumbnail->out ) )