From 8667dd0d189d50204fba0ad3ebc83b744f6bb74b Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 10 Jun 2016 17:34:41 +0100
Subject: [PATCH] VImage::ifthenelse() fix

the prototype was missing =0 on options for scalar constant forms
---
 ChangeLog                        | 1 +
 cplusplus/include/vips/VImage8.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6cee415f..4b367bdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
   combine many images in bounded memory
 - VImage::write() implementation was missing
 - VImage::write() return value changed from void to VImage to help chaining
+- VImage::ifthenelse() with double args was missing =0 on options
 
 18/5/16 started 8.3.2
 - more robust vips image reading
diff --git a/cplusplus/include/vips/VImage8.h b/cplusplus/include/vips/VImage8.h
index c7f2ea3c..3411cc09 100644
--- a/cplusplus/include/vips/VImage8.h
+++ b/cplusplus/include/vips/VImage8.h
@@ -751,19 +751,19 @@ public:
 	}
 
 	VImage 
-	ifthenelse( double th, VImage el, VOption *options )
+	ifthenelse( double th, VImage el, VOption *options = 0 )
 	{
 		return( ifthenelse( to_vector( th ), el, options ) ); 
 	}
 
 	VImage 
-	ifthenelse( VImage th, double el, VOption *options )
+	ifthenelse( VImage th, double el, VOption *options = 0 )
 	{
 		return( ifthenelse( th, to_vector( el ), options ) ); 
 	}
 
 	VImage 
-	ifthenelse( double th, double el, VOption *options )
+	ifthenelse( double th, double el, VOption *options = 0 )
 	{
 		return( ifthenelse( to_vector( th ), to_vector( el ), 
 			options ) );