From 064bd55a9872aac40e81fb4d5189e5ec04204b56 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sun, 21 Mar 2010 15:00:39 +0000
Subject: [PATCH] version bump, use wbuffer2 everywhere

---
 ChangeLog                     | 1 +
 configure.in                  | 2 +-
 libvips/iofuncs/im_generate.c | 8 ++------
 libvips/iofuncs/im_wbuffer.c  | 7 +++++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e8d1ec0..bcc6230f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 21/3/10 started 7.21.3
 - added progress feedback to threadpool
+- --vips-wbuffer2 switch does all wbuffer use now
 
 16/1/10 started 7.21.2
 - "invalidate" is careful to keep images alive, so invalidate callbacks can do
diff --git a/configure.in b/configure.in
index b6351ae1..949a0df5 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR(m4)
 # user-visible library versioning
 IM_MAJOR_VERSION=7
 IM_MINOR_VERSION=21
-IM_MICRO_VERSION=2
+IM_MICRO_VERSION=3
 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
 IM_VERSION_STRING=$IM_VERSION-`date`
 
diff --git a/libvips/iofuncs/im_generate.c b/libvips/iofuncs/im_generate.c
index bf146bac..17e3ca6c 100644
--- a/libvips/iofuncs/im_generate.c
+++ b/libvips/iofuncs/im_generate.c
@@ -605,12 +605,8 @@ im_generate( IMAGE *im,
 			im_region_free( or );
 			return( -1 );
 		}
-                if( im->dtype == IM_OPENOUT ) {
-			if( im__wbuffer2 ) 
-				res = im_wbuffer2( im, write_vips, NULL, NULL );
-			else
-				res = im_wbuffer( tg, write_vips, NULL, NULL );
-		}
+                if( im->dtype == IM_OPENOUT ) 
+			res = im_wbuffer( tg, write_vips, NULL, NULL );
                 else
                         res = eval_to_memory( tg, or );
 
diff --git a/libvips/iofuncs/im_wbuffer.c b/libvips/iofuncs/im_wbuffer.c
index d60c16f4..369e5b53 100644
--- a/libvips/iofuncs/im_wbuffer.c
+++ b/libvips/iofuncs/im_wbuffer.c
@@ -4,6 +4,8 @@
  * 	- cut from im_generate
  * 7/11/07
  * 	- trigger start/end eval callbacks
+ * 21/3/10
+ * 	- optionally use wbuffer2 
  */
 
 /*
@@ -424,6 +426,11 @@ im_wbuffer( im_threadgroup_t *tg, im_wbuffer_fn write_fn, void *a, void *b )
 	WriteBuffer *b1, *b2;
 	int result;
 
+	/* Optionally use the newer one.
+	 */
+	if( im__wbuffer2 ) 
+		return( im_wbuffer2( tg->im, write_fn, a, b ) );
+
 	if( im__start_eval( tg->im ) )
 		return( -1 );