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

fix affine in a better way 

argh this time
This commit is contained in:
John Cupitt 2014-06-18 12:34:20 +01:00
parent d01beb5411
commit 5e57c13af7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvips/resample/affine.c
View File

@ -355,7 +355,10 @@ vips_affine_gen( VipsRegion *or, void *seq, void *a, void *b, gboolean *stop )
/* Clipping! /* Clipping!
*/ */
if( fx < ile || fx >= iri || fy < ito || fy >= ibo ) { if( fx < ile ||
fx > iri ||
fy < ito ||
fy > ibo ) {
for( z = 0; z < ps; z++ ) for( z = 0; z < ps; z++ )
q[z] = 0; q[z] = 0;
} }
@ -416,8 +419,8 @@ vips_affine_build( VipsObject *object )
window_offset = window_offset =
vips_interpolate_get_window_offset( affine->interpolate ); vips_interpolate_get_window_offset( affine->interpolate );
affine->trn.iarea.left = 0; affine->trn.iarea.left = window_offset;
affine->trn.iarea.top = 0; affine->trn.iarea.top = window_offset;
affine->trn.iarea.width = in->Xsize; affine->trn.iarea.width = in->Xsize;
affine->trn.iarea.height = in->Ysize; affine->trn.iarea.height = in->Ysize;
affine->trn.a = ((double *) affine->matrix->data)[0]; affine->trn.a = ((double *) affine->matrix->data)[0];
@ -457,7 +460,8 @@ vips_affine_build( VipsObject *object )
* output space inside INT_MAX / TRANSFORM_SCALE. * output space inside INT_MAX / TRANSFORM_SCALE.
*/ */
edge = INT_MAX / VIPS_TRANSFORM_SCALE; edge = INT_MAX / VIPS_TRANSFORM_SCALE;
if( affine->trn.oarea.left < -edge || affine->trn.oarea.top < -edge || if( affine->trn.oarea.left < -edge ||
affine->trn.oarea.top < -edge ||
VIPS_RECT_RIGHT( &affine->trn.oarea ) > edge || VIPS_RECT_RIGHT( &affine->trn.oarea ) > edge ||
VIPS_RECT_BOTTOM( &affine->trn.oarea ) > edge ) { VIPS_RECT_BOTTOM( &affine->trn.oarea ) > edge ) {
vips_error( class->nickname, vips_error( class->nickname,