From 71d55c4554245fb29fb0a1ffd607b9eded98cce4 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 10 Feb 2012 14:50:46 +0000 Subject: [PATCH] compat wrapper for bool was broken oops it was calling relational instead --- TODO | 1 + libvips/arithmetic/boolean.c | 1 - libvips/deprecated/vips7compat.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 2165eab6..8660b3ce 100644 --- a/TODO +++ b/TODO @@ -17,6 +17,7 @@ + - vips_image_new_from_file() etc. don't allow options in file names ... should they have varargs instead for options? or a version which goes view new_from_string and does allow options? diff --git a/libvips/arithmetic/boolean.c b/libvips/arithmetic/boolean.c index 1e6c1995..d2c1344a 100644 --- a/libvips/arithmetic/boolean.c +++ b/libvips/arithmetic/boolean.c @@ -174,7 +174,6 @@ vips_boolean_buffer( VipsArithmetic *arithmetic, } } - /* Save a bit of typing. */ #define UC VIPS_FORMAT_UCHAR diff --git a/libvips/deprecated/vips7compat.c b/libvips/deprecated/vips7compat.c index 419f4979..b2fd04c4 100644 --- a/libvips/deprecated/vips7compat.c +++ b/libvips/deprecated/vips7compat.c @@ -1823,7 +1823,7 @@ vips__boolean( IMAGE *in1, IMAGE *in2, IMAGE *out, { VipsImage *t; - if( vips_relational( in1, in2, &t, boolean, + if( vips_boolean( in1, in2, &t, boolean, NULL ) ) return( -1 ); if( vips_image_write( t, out ) ) {