diff --git a/TODO b/TODO index cdc0075b..21bfa881 100644 --- a/TODO +++ b/TODO @@ -1,13 +1,4 @@ -- try - - $ vips im_point kylie110.jpg bilinear 0 0 0 - (vips:8895): GLib-GObject-WARNING **: invalid unclassed pointer in cast to - `VipsInterpolate' - Segmentation fault - - how odd - -- im_maxpos_vec needs gtkdoc +- im_lintra(), im_maxpos_vec(), im_minpos_vec(), im_linreg() need gtkdoc diff --git a/libvips/arithmetic/im_point_bilinear.c b/libvips/arithmetic/im_point_bilinear.c index 2ce2274a..4bf818ea 100644 --- a/libvips/arithmetic/im_point_bilinear.c +++ b/libvips/arithmetic/im_point_bilinear.c @@ -59,7 +59,7 @@ * @out: return interpolated value * * Find the value at (@x, @y) in given band of image. - * Use bilinear interpolation if @x or @y are non-integral. + * Non-integral values are calculated using the supplied @interpolate. * * See also: im_avg(), #VipsInterpolate * diff --git a/libvips/arithmetic/im_powtra.c b/libvips/arithmetic/im_powtra.c index 010f4092..b993502e 100644 --- a/libvips/arithmetic/im_powtra.c +++ b/libvips/arithmetic/im_powtra.c @@ -239,7 +239,7 @@ im_powtra_vec( IMAGE *in, IMAGE *out, int n, double *e ) } /** - * im_powntra: + * im_powtra: * @in: input #IMAGE * @out: output #IMAGE * @e: exponent diff --git a/libvips/include/vips/arithmetic.h b/libvips/include/vips/arithmetic.h index 97311682..0119a73f 100644 --- a/libvips/include/vips/arithmetic.h +++ b/libvips/include/vips/arithmetic.h @@ -84,10 +84,6 @@ int im_tantra( IMAGE *in, IMAGE *out ); int im_asintra( IMAGE *in, IMAGE *out ); int im_acostra( IMAGE *in, IMAGE *out ); int im_atantra( IMAGE *in, IMAGE *out ); -int im_cmulnorm( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_fav4( IMAGE **, IMAGE * ); -int im_gadd( double, IMAGE *, double, IMAGE *, double, IMAGE *); -int im_litecor( IMAGE *, IMAGE *, IMAGE *, int, double ); int im_bandmean( IMAGE *in, IMAGE *out ); int im_cross_phase( IMAGE *a, IMAGE *b, IMAGE *out ); diff --git a/libvips/include/vips/deprecated.h b/libvips/include/vips/deprecated.h index 71e1f53e..b95348d6 100644 --- a/libvips/include/vips/deprecated.h +++ b/libvips/include/vips/deprecated.h @@ -307,6 +307,13 @@ typedef struct { */ typedef VipsDemandType im_demand_type; +/* Deprecated operations. + */ +int im_cmulnorm( IMAGE *in1, IMAGE *in2, IMAGE *out ); +int im_fav4( IMAGE **, IMAGE * ); +int im_gadd( double, IMAGE *, double, IMAGE *, double, IMAGE *); +int im_litecor( IMAGE *, IMAGE *, IMAGE *, int, double ); + #ifdef __cplusplus } #endif /*__cplusplus*/