Merge remote-tracking branch 'origin/7.36'

Conflicts:
	ChangeLog
	configure.ac

ChangeLog

@@ -22,6 +22,9 @@
 - support XYZ as a PCS for vips_icc_import() and vips_icc_export()
 - add --strip option to jpegsave
 
+15/11/13	started 7.36.4
+- improve compat with im_init_world()
+
 18/10/13	started 7.36.3
 - fix compiler warnings in ubuntu 13.10
 - reverse similarity rotation direction to match the convention used 

libvips/deprecated/vips7compat.c

@@ -238,6 +238,17 @@ im_init( const char *filename )
 	return( image );
 }
 
+/* We can't do this with a rename macro since the C++ interface needs
+ * this entrypoint, see VImage.h.
+ *
+ * As a result our fancy ABI check will not work with the vips7 interface.
+ */
+int
+im_init_world( const char *argv0 )
+{
+	return( vips_init( argv0 ) );
+}
+
 /* Prettyprint various header fields. Just for vips7 compat, use
  * vips_enum_value() instead.
  */

libvips/include/vips/vips7compat.h

@@ -32,7 +32,7 @@
  */
 
 #ifndef VIPS_VIPS7COMPAT_H
-#define VIPS_VIP7COMPATS_H
+#define VIPS_VIPS7COMPAT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -258,6 +258,8 @@ int im_demand_hint (IMAGE * im, VipsDemandStyle hint, ...);
 /* Compat functions.
  */
 
+int im_init_world( const char *argv0 ); 
+
 VipsImage *im_open( const char *filename, const char *mode );
 
 VipsImage *im_open_local( VipsImage *parent,