From de0448b53d02137de7d90eb82b429c97ea61089d Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Tue, 4 Feb 2014 09:11:43 +0000 Subject: [PATCH] undeprecate VIPS_MASK_* ruby-vips was using them, thanks ahacking --- ChangeLog | 4 ++++ configure.ac | 6 +++--- libvips/include/vips/vips7compat.h | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9386b99..2c217da3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +22/1/14 started 7.38.3 +- undeprecate VIPS_MASK_IDEAL_HIGHPASS and friends, ruby-vips was using them, + thanks ahacking + 22/1/14 started 7.38.2 - auto RAD decode for affine - falsecolour was not working for some image types diff --git a/configure.ac b/configure.ac index 0850b6bc..b6464593 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT([vips], [7.38.2], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [7.38.3], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ(2.62) @@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [7]) m4_define([vips_minor_version], [38]) -m4_define([vips_micro_version], [2]) +m4_define([vips_micro_version], [3]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -37,7 +37,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date` # binary interface changes not backwards compatible?: reset age to 0 LIBRARY_CURRENT=37 -LIBRARY_REVISION=1 +LIBRARY_REVISION=2 LIBRARY_AGE=0 # patched into include/vips/version.h diff --git a/libvips/include/vips/vips7compat.h b/libvips/include/vips/vips7compat.h index 9cfbf64b..58903ded 100644 --- a/libvips/include/vips/vips7compat.h +++ b/libvips/include/vips/vips7compat.h @@ -962,6 +962,28 @@ typedef enum { IM_MASK_FRACTAL_FLT = 18 } ImMaskType; +/* We had them in the VIPS namespace for a while before deprecating them. + */ +#define VIPS_MASK_IDEAL_HIGHPASS IM_MASK_IDEAL_HIGHPASS +#define VIPS_MASK_IDEAL_LOWPASS IM_MASK_IDEAL_LOWPASS +#define VIPS_MASK_BUTTERWORTH_HIGHPASS IM_MASK_BUTTERWORTH_HIGHPASS +#define VIPS_MASK_BUTTERWORTH_LOWPASS IM_MASK_BUTTERWORTH_LOWPASS +#define VIPS_MASK_GAUSS_HIGHPASS IM_MASK_GAUSS_HIGHPASS +#define VIPS_MASK_GAUSS_LOWPASS IM_MASK_GAUSS_LOWPASS +#define VIPS_MASK_IDEAL_RINGPASS IM_MASK_IDEAL_RINGPASS +#define VIPS_MASK_IDEAL_RINGREJECT IM_MASK_IDEAL_RINGREJECT +#define VIPS_MASK_BUTTERWORTH_RINGPASS IM_MASK_BUTTERWORTH_RINGPASS +#define VIPS_MASK_BUTTERWORTH_RINGREJECT IM_MASK_BUTTERWORTH_RINGREJECT +#define VIPS_MASK_GAUSS_RINGPASS IM_MASK_GAUSS_RINGPASS +#define VIPS_MASK_GAUSS_RINGREJECT IM_MASK_GAUSS_RINGREJECT +#define VIPS_MASK_IDEAL_BANDPASS IM_MASK_IDEAL_BANDPASS +#define VIPS_MASK_IDEAL_BANDREJECT IM_MASK_IDEAL_BANDREJECT +#define VIPS_MASK_BUTTERWORTH_BANDPASS IM_MASK_BUTTERWORTH_BANDPASS +#define VIPS_MASK_BUTTERWORTH_BANDREJECT IM_MASK_BUTTERWORTH_BANDREJECT +#define VIPS_MASK_GAUSS_BANDPASS IM_MASK_GAUSS_BANDPASS +#define VIPS_MASK_GAUSS_BANDREJECT IM_MASK_GAUSS_BANDREJECT +#define VIPS_MASK_FRACTAL_FLT IM_MASK_FRACTAL_FLT + int im_flt_image_freq( VipsImage *in, VipsImage *out, ImMaskType flag, ... ); int im_create_fmask( VipsImage *out, int xsize, int ysize, ImMaskType flag, ... );