more vips7 compat fixes

thanks steve

ChangeLog

@@ -3,6 +3,7 @@
 - fix im_point()
 - vips_scale() now does round to nearest to avoid rounding errors
 - improve im_openout() compat macro
+- more vips7 compatibility fixes, thanks steve
 
 30/6/14 started 7.40.3
 - fix interlaced thumbnails in vipsthumbnail, thanks lovell

libvips/create/pmask.h

@@ -35,6 +35,12 @@
 extern "C" {
 #endif /*__cplusplus*/
 
+/* vips7compat.h defines VIPS_MASK(), an old compat macro.
+ */
+#ifdef VIPS_MASK
+#undef VIPS_MASK
+#endif /*VIPS_MASK*/
+
 #define VIPS_TYPE_MASK (vips_mask_get_type())
 #define VIPS_MASK( obj ) \
 	(G_TYPE_CHECK_INSTANCE_CAST( (obj), \

libvips/include/vips/internal.h

@@ -323,11 +323,6 @@ IMAGE *vips__deprecated_open_write( const char *filename );
 
 int vips__input_interpolate_init( im_object *obj, char *str );
 
-int vips_foreign_load( const char *filename, VipsImage **out, ... )
-	__attribute__((sentinel));
-int vips_foreign_save( VipsImage *in, const char *filename, ... )
-	__attribute__((sentinel));
-
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/

libvips/include/vips/vips7compat.h

@@ -987,6 +987,8 @@ typedef enum {
 #define VIPS_MASK_GAUSS_BANDREJECT IM_MASK_GAUSS_BANDREJECT 
 #define VIPS_MASK_FRACTAL_FLT IM_MASK_FRACTAL_FLT 
 
+#define VIPS_MASK IM_MASK
+
 int im_flt_image_freq( VipsImage *in, VipsImage *out, ImMaskType flag, ... );
 int im_create_fmask( VipsImage *out, 
 	int xsize, int ysize, ImMaskType flag, ... );
@@ -1097,6 +1099,13 @@ int im_tbmosaic1( VipsImage *ref, VipsImage *sec, VipsImage *out,
 	int balancetype,
 	int mwidth );
 
+/* These were public for a while, keep for compat.
+ */
+int vips_foreign_load( const char *filename, VipsImage **out, ... )
+	__attribute__((sentinel));
+int vips_foreign_save( VipsImage *in, const char *filename, ... )
+	__attribute__((sentinel));
+
 #ifdef __cplusplus
 }
 #endif /*__cplusplus*/