Fix the pixel shift within reduce (#703)
This commit is contained in:
Kleis Auke Wolthuizen
parent
ba0dea001d
commit
ac358ff4b8
|
|
@ -6,6 +6,8 @@
|
|||
* - rename xshrink -> hshrink for greater consistency
|
||||
* 9/9/16
|
||||
* - add @centre option
|
||||
* 6/6/20 kleisauke
|
||||
* - deprecate @centre option, it's now always on
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -78,14 +80,10 @@
|
|||
* Optional arguments:
|
||||
*
|
||||
* * @kernel: #VipsKernel to use to interpolate (default: lanczos3)
|
||||
* * @centre: %gboolean use centre rather than corner sampling convention
|
||||
*
|
||||
* Reduce @in vertically by a float factor. The pixels in @out are
|
||||
* interpolated with a 1D mask generated by @kernel.
|
||||
*
|
||||
* Set @centre to use centre rather than corner sampling convention. Centre
|
||||
* convention can be useful to match the behaviour of other systems.
|
||||
*
|
||||
* This is a very low-level operation: see vips_resize() for a more
|
||||
* convenient way to resize images.
|
||||
*
|
||||
|
|
@ -107,14 +105,10 @@
|
|||
* Optional arguments:
|
||||
*
|
||||
* * @kernel: #VipsKernel to use to interpolate (default: lanczos3)
|
||||
* * @centre: %gboolean use centre rather than corner sampling convention
|
||||
*
|
||||
* Reduce @in horizontally by a float factor. The pixels in @out are
|
||||
* interpolated with a 1D mask generated by @kernel.
|
||||
*
|
||||
* Set @centre to use centre rather than corner sampling convention. Centre
|
||||
* convention can be useful to match the behaviour of other systems.
|
||||
*
|
||||
* This is a very low-level operation: see vips_resize() for a more
|
||||
* convenient way to resize images.
|
||||
*
|
||||
|
|
@ -136,7 +130,7 @@ typedef struct _VipsReduce {
|
|||
*/
|
||||
VipsKernel kernel;
|
||||
|
||||
/* Use centre rather than corner sampling convention.
|
||||
/* Deprecated.
|
||||
*/
|
||||
gboolean centre;
|
||||
|
||||
|
|
@ -152,18 +146,16 @@ vips_reduce_build( VipsObject *object )
|
|||
VipsResample *resample = VIPS_RESAMPLE( object );
|
||||
VipsReduce *reduce = (VipsReduce *) object;
|
||||
VipsImage **t = (VipsImage **)
|
||||
vips_object_local_array( object, 3 );
|
||||
vips_object_local_array( object, 2 );
|
||||
|
||||
if( VIPS_OBJECT_CLASS( vips_reduce_parent_class )->build( object ) )
|
||||
return( -1 );
|
||||
|
||||
if( vips_reducev( resample->in, &t[0], reduce->vshrink,
|
||||
"kernel", reduce->kernel,
|
||||
"centre", reduce->centre,
|
||||
NULL ) ||
|
||||
vips_reduceh( t[0], &t[1], reduce->hshrink,
|
||||
"kernel", reduce->kernel,
|
||||
"centre", reduce->centre,
|
||||
NULL ) ||
|
||||
vips_image_write( t[1], resample->out ) )
|
||||
return( -1 );
|
||||
|
|
@ -210,13 +202,6 @@ vips_reduce_class_init( VipsReduceClass *class )
|
|||
G_STRUCT_OFFSET( VipsReduce, kernel ),
|
||||
VIPS_TYPE_KERNEL, VIPS_KERNEL_LANCZOS3 );
|
||||
|
||||
VIPS_ARG_BOOL( class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduce, centre ),
|
||||
FALSE );
|
||||
|
||||
/* The old names .. now use h and v everywhere.
|
||||
*/
|
||||
VIPS_ARG_DOUBLE( class, "xshrink", 8,
|
||||
|
|
@ -233,6 +218,15 @@ vips_reduce_class_init( VipsReduceClass *class )
|
|||
G_STRUCT_OFFSET( VipsReduce, vshrink ),
|
||||
1.0, 1000000.0, 1.0 );
|
||||
|
||||
/* We used to let people pick centre or corner, but it's automatic now.
|
||||
*/
|
||||
VIPS_ARG_BOOL( class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED,
|
||||
G_STRUCT_OFFSET( VipsReduce, centre ),
|
||||
FALSE );
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -252,14 +246,10 @@ vips_reduce_init( VipsReduce *reduce )
|
|||
* Optional arguments:
|
||||
*
|
||||
* * @kernel: #VipsKernel to use to interpolate (default: lanczos3)
|
||||
* * @centre: %gboolean use centre rather than corner sampling convention
|
||||
*
|
||||
* Reduce @in by a pair of factors with a pair of 1D kernels. This
|
||||
* will not work well for shrink factors greater than three.
|
||||
*
|
||||
* Set @centre to use centre rather than corner sampling convention. Centre
|
||||
* convention can be useful to match the behaviour of other systems.
|
||||
*
|
||||
* This is a very low-level operation: see vips_resize() for a more
|
||||
* convenient way to resize images.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
* - rename xshrink as hshrink for consistency
|
||||
* 9/9/16
|
||||
* - add @centre option
|
||||
* 6/6/20 kleisauke
|
||||
* - deprecate @centre option, it's now always on
|
||||
* - fix pixel shift
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -66,14 +69,14 @@ typedef struct _VipsReduceh {
|
|||
*/
|
||||
VipsKernel kernel;
|
||||
|
||||
/* Use centre rather than corner sampling convention.
|
||||
*/
|
||||
gboolean centre;
|
||||
|
||||
/* Number of points in kernel.
|
||||
*/
|
||||
int n_point;
|
||||
|
||||
/* Horizontal displacement.
|
||||
*/
|
||||
double hoffset;
|
||||
|
||||
/* Precalculated interpolation matrices. int (used for pel
|
||||
* sizes up to short), and double (for all others). We go to
|
||||
* scale + 1 so we can round-to-nearest safely.
|
||||
|
|
@ -81,6 +84,10 @@ typedef struct _VipsReduceh {
|
|||
int *matrixi[VIPS_TRANSFORM_SCALE + 1];
|
||||
double *matrixf[VIPS_TRANSFORM_SCALE + 1];
|
||||
|
||||
/* Deprecated.
|
||||
*/
|
||||
gboolean centre;
|
||||
|
||||
} VipsReduceh;
|
||||
|
||||
typedef VipsResampleClass VipsReducehClass;
|
||||
|
|
@ -315,12 +322,10 @@ vips_reduceh_gen( VipsRegion *out_region, void *seq,
|
|||
r->width, r->height, r->left, r->top );
|
||||
#endif /*DEBUG*/
|
||||
|
||||
s.left = r->left * reduceh->hshrink;
|
||||
s.left = r->left * reduceh->hshrink - reduceh->hoffset;
|
||||
s.top = r->top;
|
||||
s.width = r->width * reduceh->hshrink + reduceh->n_point;
|
||||
s.height = r->height;
|
||||
if( reduceh->centre )
|
||||
s.width += 1;
|
||||
if( vips_region_prepare( ir, &s ) )
|
||||
return( -1 );
|
||||
|
||||
|
|
@ -334,9 +339,8 @@ vips_reduceh_gen( VipsRegion *out_region, void *seq,
|
|||
|
||||
q = VIPS_REGION_ADDR( out_region, r->left, r->top + y );
|
||||
|
||||
X = r->left * reduceh->hshrink;
|
||||
if( reduceh->centre )
|
||||
X += 0.5;
|
||||
X = (r->left + 0.5) * reduceh->hshrink - 0.5 -
|
||||
reduceh->hoffset;
|
||||
|
||||
/* We want p0 to be the start (ie. x == 0) of the input
|
||||
* scanline we are reading from. We can then calculate the p we
|
||||
|
|
@ -351,7 +355,7 @@ vips_reduceh_gen( VipsRegion *out_region, void *seq,
|
|||
ir->valid.left * ps;
|
||||
|
||||
for( int x = 0; x < r->width; x++ ) {
|
||||
int ix = (int) X;
|
||||
const int ix = (int) X;
|
||||
VipsPel *p = p0 + ix * ps;
|
||||
const int sx = X * VIPS_TRANSFORM_SCALE * 2;
|
||||
const int six = sx & (VIPS_TRANSFORM_SCALE * 2 - 1);
|
||||
|
|
@ -441,7 +445,7 @@ vips_reduceh_build( VipsObject *object )
|
|||
vips_object_local_array( object, 2 );
|
||||
|
||||
VipsImage *in;
|
||||
int width;
|
||||
double width, extra_pixels;
|
||||
|
||||
if( VIPS_OBJECT_CLASS( vips_reduceh_parent_class )->build( object ) )
|
||||
return( -1 );
|
||||
|
|
@ -457,8 +461,6 @@ vips_reduceh_build( VipsObject *object )
|
|||
if( reduceh->hshrink == 1 )
|
||||
return( vips_image_write( in, resample->out ) );
|
||||
|
||||
/* Build the tables of pre-computed coefficients.
|
||||
*/
|
||||
reduceh->n_point =
|
||||
vips_reduce_get_points( reduceh->kernel, reduceh->hshrink );
|
||||
g_info( "reduceh: %d point mask", reduceh->n_point );
|
||||
|
|
@ -467,6 +469,28 @@ vips_reduceh_build( VipsObject *object )
|
|||
"%s", _( "reduce factor too large" ) );
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
/* Output size. We need to always round to nearest, so round(), not
|
||||
* rint().
|
||||
*/
|
||||
width = VIPS_ROUND_UINT(
|
||||
(double) resample->in->Xsize / reduceh->hshrink );
|
||||
|
||||
/* How many pixels we are inventing in the input, -ve for
|
||||
* discarding.
|
||||
*/
|
||||
extra_pixels =
|
||||
width * reduceh->hshrink - resample->in->Xsize;
|
||||
|
||||
/* If we are rounding down, we are not using some input
|
||||
* pixels. We need to move the origin *inside* the input image
|
||||
* by half that distance so that we discard pixels equally
|
||||
* from left and right.
|
||||
*/
|
||||
reduceh->hoffset = (1 + extra_pixels) / 2.0;
|
||||
|
||||
/* Build the tables of pre-computed coefficients.
|
||||
*/
|
||||
for( int x = 0; x < VIPS_TRANSFORM_SCALE + 1; x++ ) {
|
||||
reduceh->matrixf[x] =
|
||||
VIPS_ARRAY( object, reduceh->n_point, double );
|
||||
|
|
@ -499,15 +523,10 @@ vips_reduceh_build( VipsObject *object )
|
|||
in = t[0];
|
||||
|
||||
/* Add new pixels around the input so we can interpolate at the edges.
|
||||
* In centre mode, we read 0.5 pixels more to the right, so we must
|
||||
* enlarge a little further.
|
||||
*/
|
||||
width = in->Xsize + reduceh->n_point - 1;
|
||||
if( reduceh->centre )
|
||||
width += 1;
|
||||
if( vips_embed( in, &t[1],
|
||||
reduceh->n_point / 2 - 1, 0,
|
||||
width, in->Ysize,
|
||||
in->Xsize + reduceh->n_point, in->Ysize,
|
||||
"extend", VIPS_EXTEND_COPY,
|
||||
(void *) NULL ) )
|
||||
return( -1 );
|
||||
|
|
@ -524,8 +543,7 @@ vips_reduceh_build( VipsObject *object )
|
|||
* example, vipsthumbnail knows the true reduce factor (including the
|
||||
* fractional part), we just see the integer part here.
|
||||
*/
|
||||
resample->out->Xsize = VIPS_ROUND_UINT(
|
||||
resample->in->Xsize / reduceh->hshrink );
|
||||
resample->out->Xsize = width;
|
||||
if( resample->out->Xsize <= 0 ) {
|
||||
vips_error( object_class->nickname,
|
||||
"%s", _( "image has shrunk to nothing" ) );
|
||||
|
|
@ -574,20 +592,13 @@ vips_reduceh_class_init( VipsReducehClass *reduceh_class )
|
|||
G_STRUCT_OFFSET( VipsReduceh, hshrink ),
|
||||
1, 1000000, 1 );
|
||||
|
||||
VIPS_ARG_ENUM( reduceh_class, "kernel", 3,
|
||||
VIPS_ARG_ENUM( reduceh_class, "kernel", 4,
|
||||
_( "Kernel" ),
|
||||
_( "Resampling kernel" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduceh, kernel ),
|
||||
VIPS_TYPE_KERNEL, VIPS_KERNEL_LANCZOS3 );
|
||||
|
||||
VIPS_ARG_BOOL( reduceh_class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduceh, centre ),
|
||||
FALSE );
|
||||
|
||||
/* Old name.
|
||||
*/
|
||||
VIPS_ARG_DOUBLE( reduceh_class, "xshrink", 3,
|
||||
|
|
@ -597,6 +608,15 @@ vips_reduceh_class_init( VipsReducehClass *reduceh_class )
|
|||
G_STRUCT_OFFSET( VipsReduceh, hshrink ),
|
||||
1, 1000000, 1 );
|
||||
|
||||
/* We used to let people pick centre or corner, but it's automatic now.
|
||||
*/
|
||||
VIPS_ARG_BOOL( reduceh_class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED,
|
||||
G_STRUCT_OFFSET( VipsReduceh, centre ),
|
||||
FALSE );
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@
|
|||
* - add @centre option
|
||||
* 7/3/17
|
||||
* - add a seq line cache
|
||||
* 6/6/20 kleisauke
|
||||
* - deprecate @centre option, it's now always on
|
||||
* - fix pixel shift
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -104,14 +107,14 @@ typedef struct _VipsReducev {
|
|||
*/
|
||||
VipsKernel kernel;
|
||||
|
||||
/* Use centre rather than corner sampling convention.
|
||||
*/
|
||||
gboolean centre;
|
||||
|
||||
/* Number of points in kernel.
|
||||
*/
|
||||
int n_point;
|
||||
|
||||
/* Vertical displacement.
|
||||
*/
|
||||
double voffset;
|
||||
|
||||
/* Precalculated interpolation matrices. int (used for pel
|
||||
* sizes up to short), and double (for all others). We go to
|
||||
* scale + 1 so we can round-to-nearest safely.
|
||||
|
|
@ -128,6 +131,10 @@ typedef struct _VipsReducev {
|
|||
int n_pass;
|
||||
Pass pass[MAX_PASS];
|
||||
|
||||
/* Deprecated.
|
||||
*/
|
||||
gboolean centre;
|
||||
|
||||
} VipsReducev;
|
||||
|
||||
typedef VipsResampleClass VipsReducevClass;
|
||||
|
|
@ -531,22 +538,22 @@ vips_reducev_gen( VipsRegion *out_region, void *vseq,
|
|||
#endif /*DEBUG*/
|
||||
|
||||
s.left = r->left;
|
||||
s.top = r->top * reducev->vshrink;
|
||||
s.top = r->top * reducev->vshrink - reducev->voffset;
|
||||
s.width = r->width;
|
||||
s.height = r->height * reducev->vshrink + reducev->n_point;
|
||||
if( reducev->centre )
|
||||
s.height += 1;
|
||||
if( vips_region_prepare( ir, &s ) )
|
||||
return( -1 );
|
||||
|
||||
VIPS_GATE_START( "vips_reducev_gen: work" );
|
||||
|
||||
double Y = (r->top + 0.5) * reducev->vshrink - 0.5 -
|
||||
reducev->voffset;
|
||||
|
||||
for( int y = 0; y < r->height; y ++ ) {
|
||||
VipsPel *q =
|
||||
VIPS_REGION_ADDR( out_region, r->left, r->top + y );
|
||||
const double Y = (r->top + y) * reducev->vshrink +
|
||||
(reducev->centre ? 0.5 : 0.0);
|
||||
VipsPel *p = VIPS_REGION_ADDR( ir, r->left, (int) Y );
|
||||
const int py = (int) Y;
|
||||
VipsPel *p = VIPS_REGION_ADDR( ir, r->left, py );
|
||||
const int sy = Y * VIPS_TRANSFORM_SCALE * 2;
|
||||
const int siy = sy & (VIPS_TRANSFORM_SCALE * 2 - 1);
|
||||
const int ty = (siy + 1) >> 1;
|
||||
|
|
@ -606,13 +613,15 @@ vips_reducev_gen( VipsRegion *out_region, void *vseq,
|
|||
case VIPS_FORMAT_DPCOMPLEX:
|
||||
case VIPS_FORMAT_DOUBLE:
|
||||
reducev_notab<double>( reducev,
|
||||
q, p, ne, lskip, Y - (int) Y );
|
||||
q, p, ne, lskip, Y - py );
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
break;
|
||||
}
|
||||
|
||||
Y += reducev->vshrink;
|
||||
}
|
||||
|
||||
VIPS_GATE_STOP( "vips_reducev_gen: work" );
|
||||
|
|
@ -646,9 +655,8 @@ vips_reducev_vector_gen( VipsRegion *out_region, void *vseq,
|
|||
s.left = r->left;
|
||||
s.top = r->top * reducev->vshrink;
|
||||
s.width = r->width;
|
||||
s.height = r->height * reducev->vshrink + reducev->n_point;
|
||||
if( reducev->centre )
|
||||
s.height += 1;
|
||||
s.height = r->height * reducev->vshrink + reducev->n_point -
|
||||
reducev->voffset;
|
||||
if( vips_region_prepare( ir, &s ) )
|
||||
return( -1 );
|
||||
|
||||
|
|
@ -663,11 +671,12 @@ vips_reducev_vector_gen( VipsRegion *out_region, void *vseq,
|
|||
|
||||
VIPS_GATE_START( "vips_reducev_vector_gen: work" );
|
||||
|
||||
double Y = (r->top + 0.5) * reducev->vshrink - 0.5 -
|
||||
reducev->voffset;
|
||||
|
||||
for( int y = 0; y < r->height; y ++ ) {
|
||||
VipsPel *q =
|
||||
VIPS_REGION_ADDR( out_region, r->left, r->top + y );
|
||||
const double Y = (r->top + y) * reducev->vshrink +
|
||||
(reducev->centre ? 0.5 : 0.0);
|
||||
const int py = (int) Y;
|
||||
const int sy = Y * VIPS_TRANSFORM_SCALE * 2;
|
||||
const int siy = sy & (VIPS_TRANSFORM_SCALE * 2 - 1);
|
||||
|
|
@ -682,7 +691,7 @@ vips_reducev_vector_gen( VipsRegion *out_region, void *vseq,
|
|||
printf( "first column of pixel values:\n" );
|
||||
for( int i = 0; i < reducev->n_point; i++ )
|
||||
printf( "\t%d - %d\n", i,
|
||||
*VIPS_REGION_ADDR( ir, r->left, r->top + y + i ) );
|
||||
*VIPS_REGION_ADDR( ir, r->left, py ) );
|
||||
#endif /*DEBUG_PIXELS*/
|
||||
|
||||
/* We run our n passes to generate this scanline.
|
||||
|
|
@ -709,6 +718,8 @@ vips_reducev_vector_gen( VipsRegion *out_region, void *vseq,
|
|||
printf( "pixel result:\n" );
|
||||
printf( "\t%d\n", *q );
|
||||
#endif /*DEBUG_PIXELS*/
|
||||
|
||||
Y += reducev->vshrink;
|
||||
}
|
||||
|
||||
VIPS_GATE_STOP( "vips_reducev_vector_gen: work" );
|
||||
|
|
@ -830,7 +841,7 @@ vips_reducev_build( VipsObject *object )
|
|||
VipsImage **t = (VipsImage **) vips_object_local_array( object, 4 );
|
||||
|
||||
VipsImage *in;
|
||||
int height;
|
||||
double height, extra_pixels;
|
||||
|
||||
if( VIPS_OBJECT_CLASS( vips_reducev_parent_class )->build( object ) )
|
||||
return( -1 );
|
||||
|
|
@ -855,6 +866,25 @@ vips_reducev_build( VipsObject *object )
|
|||
return( -1 );
|
||||
}
|
||||
|
||||
/* Output size. We need to always round to nearest, so round(), not
|
||||
* rint().
|
||||
*/
|
||||
height = VIPS_ROUND_UINT(
|
||||
(double) resample->in->Ysize / reducev->vshrink );
|
||||
|
||||
/* How many pixels we are inventing in the input, -ve for
|
||||
* discarding.
|
||||
*/
|
||||
extra_pixels =
|
||||
height * reducev->vshrink - resample->in->Ysize;
|
||||
|
||||
/* If we are rounding down, we are not using some input
|
||||
* pixels. We need to move the origin *inside* the input image
|
||||
* by half that distance so that we discard pixels equally
|
||||
* from left and right.
|
||||
*/
|
||||
reducev->voffset = (1 + extra_pixels) / 2.0;
|
||||
|
||||
/* Unpack for processing.
|
||||
*/
|
||||
if( vips_image_decode( in, &t[0] ) )
|
||||
|
|
@ -863,12 +893,9 @@ vips_reducev_build( VipsObject *object )
|
|||
|
||||
/* Add new pixels around the input so we can interpolate at the edges.
|
||||
*/
|
||||
height = in->Ysize + reducev->n_point - 1;
|
||||
if( reducev->centre )
|
||||
height += 1;
|
||||
if( vips_embed( in, &t[1],
|
||||
0, reducev->n_point / 2 - 1,
|
||||
in->Xsize, height,
|
||||
in->Xsize, in->Ysize + reducev->n_point,
|
||||
"extend", VIPS_EXTEND_COPY,
|
||||
(void *) NULL ) )
|
||||
return( -1 );
|
||||
|
|
@ -939,13 +966,6 @@ vips_reducev_class_init( VipsReducevClass *reducev_class )
|
|||
G_STRUCT_OFFSET( VipsReducev, kernel ),
|
||||
VIPS_TYPE_KERNEL, VIPS_KERNEL_LANCZOS3 );
|
||||
|
||||
VIPS_ARG_BOOL( reducev_class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReducev, centre ),
|
||||
FALSE );
|
||||
|
||||
/* Old name.
|
||||
*/
|
||||
VIPS_ARG_DOUBLE( reducev_class, "yshrink", 3,
|
||||
|
|
@ -955,6 +975,15 @@ vips_reducev_class_init( VipsReducevClass *reducev_class )
|
|||
G_STRUCT_OFFSET( VipsReducev, vshrink ),
|
||||
1, 1000000, 1 );
|
||||
|
||||
/* We used to let people pick centre or corner, but it's automatic now.
|
||||
*/
|
||||
VIPS_ARG_BOOL( reducev_class, "centre", 7,
|
||||
_( "Centre" ),
|
||||
_( "Use centre sampling convention" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED,
|
||||
G_STRUCT_OFFSET( VipsReducev, centre ),
|
||||
FALSE );
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -232,7 +232,6 @@ vips_resize_build( VipsObject *object )
|
|||
g_info( "residual reducev by %g", vscale );
|
||||
if( vips_reducev( in, &t[2], 1.0 / vscale,
|
||||
"kernel", resize->kernel,
|
||||
"centre", TRUE,
|
||||
NULL ) )
|
||||
return( -1 );
|
||||
in = t[2];
|
||||
|
|
@ -243,7 +242,6 @@ vips_resize_build( VipsObject *object )
|
|||
hscale );
|
||||
if( vips_reduceh( in, &t[3], 1.0 / hscale,
|
||||
"kernel", resize->kernel,
|
||||
"centre", TRUE,
|
||||
NULL ) )
|
||||
return( -1 );
|
||||
in = t[3];
|
||||
|
|
|
|||
|
|
@ -82,8 +82,9 @@ class TestResample:
|
|||
|
||||
for fac in [1, 1.1, 1.5, 1.999]:
|
||||
for fmt in all_formats:
|
||||
for kernel in ["nearest", "linear",
|
||||
"cubic", "lanczos2", "lanczos3"]:
|
||||
# TODO: Add nearest kernel when https://github.com/libvips/libvips/issues/1518 is done.
|
||||
# (running the test suite with VIPS_NOVECTOR=1 should also work)
|
||||
for kernel in ["linear", "cubic", "lanczos2", "lanczos3"]:
|
||||
x = im.cast(fmt)
|
||||
r = x.reduce(fac, fac, kernel=kernel)
|
||||
d = abs(r.avg() - im.avg())
|
||||
|
|
|
|||
Loading…
Reference in New Issue