Merge remote-tracking branch 'origin/7.38'

Conflicts:
	ChangeLog
	configure.ac

ChangeLog

@@ -4,6 +4,10 @@
 - colourspace has a source_space option
 - operations can be tagged as "deprecated"
 
+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

configure.ac

@@ -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

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, ... );