diff --git a/ChangeLog b/ChangeLog index a2e47dcd..7ed54f1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ range of annoying problems, such as strange half-pixels along edges - vips_max() / _min() track the top n maxima / minima - deprecate im_maxpos_avg(): too specialised to be worth maintaining +- deprecate im_linreg(): easily done by combining other operators +- deprecate im_point(): easily done by combining other operators 14/11/12 started 7.30.6 - capture tiff warnings earlier diff --git a/TODO b/TODO index deaf6098..592735d3 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -- im_cross_phase.c, im_linreg.c, im_point_bilinear.c need deprecating? +- im_cross_phase.c needs a rewrite? - add vips_band()/vips_bor() diff --git a/libvips/arithmetic/Makefile.am b/libvips/arithmetic/Makefile.am index b26a2ea6..84ac1c05 100644 --- a/libvips/arithmetic/Makefile.am +++ b/libvips/arithmetic/Makefile.am @@ -6,10 +6,8 @@ libarithmetic_la_SOURCES = \ im_cross_phase.c \ deviate.c \ divide.c \ - im_linreg.c \ measure.c \ multiply.c \ - im_point_bilinear.c \ remainder.c \ sign.c \ stats.c \ diff --git a/libvips/deprecated/Makefile.am b/libvips/deprecated/Makefile.am index 30539bad..aee29f81 100644 --- a/libvips/deprecated/Makefile.am +++ b/libvips/deprecated/Makefile.am @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libdeprecated.la libdeprecated_la_SOURCES = \ + im_linreg.c \ + im_point_bilinear.c \ im_openslide2vips.c \ im_lab_morph.c \ deprecated_dispatch.c \ diff --git a/libvips/arithmetic/im_linreg.c b/libvips/deprecated/im_linreg.c similarity index 100% rename from libvips/arithmetic/im_linreg.c rename to libvips/deprecated/im_linreg.c diff --git a/libvips/arithmetic/im_point_bilinear.c b/libvips/deprecated/im_point_bilinear.c similarity index 100% rename from libvips/arithmetic/im_point_bilinear.c rename to libvips/deprecated/im_point_bilinear.c diff --git a/libvips/include/vips/arithmetic.h b/libvips/include/vips/arithmetic.h index 7d3404d3..4ec79cb4 100644 --- a/libvips/include/vips/arithmetic.h +++ b/libvips/include/vips/arithmetic.h @@ -360,12 +360,6 @@ int vips_stats( VipsImage *in, VipsImage **out, ... ) int vips_measure( VipsImage *in, VipsImage **out, int h, int v, ... ) __attribute__((sentinel)); -int im_linreg( VipsImage **ins, VipsImage *out, double *xs ); -int im_point( VipsImage *im, VipsInterpolate *interpolate, - double x, double y, int band, double *out ); -int im_point_bilinear( VipsImage *im, - double x, double y, int band, double *out ); - int im_cross_phase( VipsImage *a, VipsImage *b, VipsImage *out ); #ifdef __cplusplus diff --git a/libvips/include/vips/vips7compat.h b/libvips/include/vips/vips7compat.h index 4009ec26..bd79b561 100644 --- a/libvips/include/vips/vips7compat.h +++ b/libvips/include/vips/vips7compat.h @@ -669,6 +669,13 @@ int im_minpos_vec( VipsImage *im, int *xpos, int *ypos, double *minima, int n ); int im_maxpos_avg( VipsImage *im, double *xpos, double *ypos, double *out ); +int im_linreg( VipsImage **ins, VipsImage *out, double *xs ); + +int im_point( VipsImage *im, VipsInterpolate *interpolate, + double x, double y, int band, double *out ); +int im_point_bilinear( VipsImage *im, + double x, double y, int band, double *out ); + int im_copy( VipsImage *in, VipsImage *out ); int im_copy_set( VipsImage *in, VipsImage *out, VipsInterpretation interpretation,