From 9d11c02e35891536f99bcbbf7b5a20ca975a15ab Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 6 Feb 2015 13:39:39 +0000
Subject: [PATCH] version bump

---
 ChangeLog                    |  4 ++++
 configure.ac                 | 10 +++++-----
 libvips/include/vips/image.h |  1 +
 libvips/iofuncs/image.c      | 18 +++++++++++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b6aebee..7de26fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6/2/15 started 7.42.3
+- bump version for back-compat ABI change
+- added vips_image_memory(), an alias for vips_image_new_memory()
+
 30/12/14 started 7.42.2
 - C++ required output params were broken, thanks Lovell
 - remove VImage::scale() to get scale from header, it clashed with the
diff --git a/configure.ac b/configure.ac
index 028086c9..92919a70 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.42.2], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [7.42.3], [vipsip@jiscmail.ac.uk])
 # required for gobject-introspection
 AC_PREREQ(2.62)
 
@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # user-visible library versioning
 m4_define([vips_major_version], [7])
 m4_define([vips_minor_version], [42])
-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,9 +37,9 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
 #   binary interface changes backwards compatible?: increment age
 #   binary interface changes not backwards compatible?: reset age to 0
 
-LIBRARY_CURRENT=40
-LIBRARY_REVISION=1
-LIBRARY_AGE=0
+LIBRARY_CURRENT=41
+LIBRARY_REVISION=0
+LIBRARY_AGE=1
 
 # patched into include/vips/version.h
 AC_SUBST(VIPS_VERSION)
diff --git a/libvips/include/vips/image.h b/libvips/include/vips/image.h
index b3a7b2dc..61362aaa 100644
--- a/libvips/include/vips/image.h
+++ b/libvips/include/vips/image.h
@@ -419,6 +419,7 @@ char *vips_filename_get_options( const char *vips_filename );
 
 VipsImage *vips_image_new( void );
 VipsImage *vips_image_new_memory( void );
+VipsImage *vips_image_memory( void );
 VipsImage *vips_image_new_from_file( const char *name, ... )
 	__attribute__((sentinel));
 VipsImage *vips_image_new_from_file_RW( const char *filename );
diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c
index afc5afc5..d72966ce 100644
--- a/libvips/iofuncs/image.c
+++ b/libvips/iofuncs/image.c
@@ -1728,7 +1728,7 @@ vips_image_new_mode( const char *filename, const char *mode )
  *
  * See also: vips_image_new().
  *
- * Returns: the new #VipsImage, or %NULL on error.
+ * Returns: (transfer full): the new #VipsImage, or %NULL on error.
  */
 VipsImage *
 vips_image_new_memory( void )
@@ -1736,6 +1736,22 @@ vips_image_new_memory( void )
 	return( vips_image_new_mode( vips_image_temp_name(), "t" ) );
 }
 
+/**
+ * vips_image_memory:
+ *
+ * A renamed vips_image_new_memory() ... Some gobject binding systems do not 
+ * like more than one _new() method.
+ *
+ * See also: vips_image_new_memory().
+ *
+ * Returns: (transfer full): the new #VipsImage, or %NULL on error.
+ */
+VipsImage *
+vips_image_memory( void )
+{
+	return( vips_image_new_memory() ); 
+}
+
 /**
  * vips_filename_get_filename:
  * @vips_filename: a filename including a set of options