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

added explicit interpolate_class->window_offset values to every resampler

This commit is contained in:
Nicolas Robidoux 2010-05-16 14:42:58 +00:00
parent 7de848e644
commit bc1d19b7ed
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libvips/resample/bicubic.cpp
View File

@ -434,6 +434,7 @@ vips_interpolate_bicubic_class_init( VipsInterpolateBicubicClass *iclass )
interpolate_class->interpolate = vips_interpolate_bicubic_interpolate;
interpolate_class->window_size = 4;
interpolate_class->window_offset = 1;
/* Build the tables of pre-computed coefficients.
*/

1
libvips/resample/lbb.cpp
View File

@ -796,6 +796,7 @@ vips_interpolate_lbb_class_init( VipsInterpolateLbbClass *klass )
interpolate_class->interpolate = vips_interpolate_lbb_interpolate;
interpolate_class->window_size = 4;
interpolate_class->window_offset = 1;
}
static void

21
libvips/resample/nohalo1.cpp
View File

@ -291,8 +291,8 @@ nohalo1( const double uno_two,
* = qua_two = qua_thr
*
* Here, ix is the floor of the requested left-to-right location, iy
* is the floor of the requested up-to-down location.
*
* is the floor of the requested up-to-down location.
*
* Pointer arithmetic is used to implicitly reflect the input
* stencil so that the requested pixel location is closer to
* dos_two, The above consequently corresponds to the case in which
@ -591,7 +591,7 @@ vips_interpolate_nohalo1_interpolate( VipsInterpolate* restrict interpolate,
/*
* Double bands for complex images:
*/
const int bands = vips_bandfmt_iscomplex( in->im->BandFmt ) ?
const int bands = vips_bandfmt_iscomplex( in->im->BandFmt ) ?
2 * actual_bands : actual_bands;
#define CALL( T, inter ) \
@ -610,35 +610,35 @@ vips_interpolate_nohalo1_interpolate( VipsInterpolate* restrict interpolate,
case IM_BANDFMT_CHAR:
CALL( signed char, withsign );
break;
case IM_BANDFMT_USHORT:
CALL( unsigned short, nosign );
break;
case IM_BANDFMT_SHORT:
CALL( signed short, withsign );
break;
case IM_BANDFMT_UINT:
CALL( unsigned int, nosign );
break;
case IM_BANDFMT_INT:
CALL( signed int, withsign );
break;
/* Complex images handled by doubling of bands, see above.
*/
case IM_BANDFMT_FLOAT:
case IM_BANDFMT_COMPLEX:
CALL( float, fptypes );
break;
case IM_BANDFMT_DOUBLE:
case IM_BANDFMT_DPCOMPLEX:
CALL( double, fptypes );
break;
default:
g_assert( 0 );
break;
@ -657,6 +657,7 @@ vips_interpolate_nohalo1_class_init( VipsInterpolateNohalo1Class *klass )
interpolate_class->interpolate = vips_interpolate_nohalo1_interpolate;
interpolate_class->window_size = 4;
interpolate_class->window_offset = 1;
}
static void

1
libvips/resample/nohalo2.cpp
View File

@ -1083,6 +1083,7 @@ vips_interpolate_nohalo2_class_init( VipsInterpolateNohalo2Class *klass )
interpolate_class->interpolate = vips_interpolate_nohalo2_interpolate;
interpolate_class->window_size = 6;
interpolate_class->window_offset = 2;
}
static void

1
libvips/resample/snohalo1.cpp
View File

@ -1096,6 +1096,7 @@ vips_interpolate_snohalo1_class_init( VipsInterpolateSnohalo1Class *klass )
interpolate_class->interpolate =
vips_interpolate_snohalo1_interpolate;
interpolate_class->window_size = 7;
interpolate_class->window_size = 3;
/*
* Create properties: