From 0193e23c648cb89d453fe90e5c01f9c5fd0e34d4 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 18 Sep 2017 14:48:15 +0100
Subject: [PATCH] only flatten in find_trim if there is an alpha

oops, flatten always flattens, it doesn't check for alpha first

see https://github.com/jcupitt/libvips/issues/670
---
 libvips/arithmetic/find_trim.c | 21 ++++++++++++++-------
 libvips/iofuncs/cache.c        |  2 ++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/libvips/arithmetic/find_trim.c b/libvips/arithmetic/find_trim.c
index 0ca730b8..1eada0b0 100644
--- a/libvips/arithmetic/find_trim.c
+++ b/libvips/arithmetic/find_trim.c
@@ -4,6 +4,7 @@
  * 	- from a ruby example
  * 18/9/17 kleisauke 
  * 	- missing bandor
+ * 	- only flatten if there is an alpha
  */
 
 /*
@@ -71,6 +72,7 @@ vips_find_trim_build( VipsObject *object )
 	VipsFindTrim *find_trim = (VipsFindTrim *) object;
 	VipsImage **t = (VipsImage **) vips_object_local_array( object, 20 );
 
+	VipsImage *in;
 	double *background;
 	int n;
 	double *neg_bg;
@@ -95,12 +97,16 @@ vips_find_trim_build( VipsObject *object )
 				vips_array_double_newv( 1, 65535.0 );
 		}
 
-	/* Flatten out any alpha.
+	/* Flatten out alpha, if any. 
 	 */
-	if( vips_flatten( find_trim->in, &t[0], 
-		"background", find_trim->background,
-		NULL ) )
-		return( -1 ); 
+	in = find_trim->in;
+	if( vips_image_hasalpha( in ) ) {
+		if( vips_flatten( in, &t[0], 
+			"background", find_trim->background,
+			NULL ) )
+			return( -1 ); 
+		in = t[0];
+	}
 
 	/* We want to subtract the bg.
 	 */
@@ -115,16 +121,17 @@ vips_find_trim_build( VipsObject *object )
 
 	/* Smooth, find difference from bg, abs, threshold.
 	 */
-	if( vips_median( t[0], &t[1], 3, NULL ) ||
+	if( vips_median( in, &t[1], 3, NULL ) ||
 		vips_linear( t[1], &t[2], ones, neg_bg, n, NULL ) ||
 		vips_abs( t[2], &t[3], NULL ) ||
 		vips_more_const1( t[3], &t[4], find_trim->threshold, NULL ) ||
 		vips_bandor( t[4], &t[5], NULL ) )
 		return( -1 ); 
+	in = t[5];
 
 	/* t[6] == column sums, t[7] == row sums. 
 	 */
-	if( vips_project( t[5], &t[6], &t[7], NULL ) )
+	if( vips_project( in, &t[6], &t[7], NULL ) )
 		return( -1 );
 
 	/* t[8] == search column sums in from left.
diff --git a/libvips/iofuncs/cache.c b/libvips/iofuncs/cache.c
index 9129b152..a3d70477 100644
--- a/libvips/iofuncs/cache.c
+++ b/libvips/iofuncs/cache.c
@@ -453,6 +453,8 @@ vips__cache_once_init( void )
 	vips_cache_table = g_hash_table_new( 
 		(GHashFunc) vips_operation_hash, 
 		(GEqualFunc) vips_operation_equal );
+
+	return( NULL ); 
 }
 
 void