From bf2acf26213f56d42b34f0e863697b99efdc6278 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 13 Feb 2014 08:42:59 +0000
Subject: [PATCH] fix --sharpen=none

thanks ferryfax
---
 ChangeLog             | 3 +++
 tools/vipsthumbnail.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c217da3..85751c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+13/2/14 started 7.38.4
+- --sharpen=none option to vipsthumbnail was broken, thanks ferryfax
+
 22/1/14 started 7.38.3
 - undeprecate VIPS_MASK_IDEAL_HIGHPASS and friends, ruby-vips was using them,
   thanks ahacking
diff --git a/tools/vipsthumbnail.c b/tools/vipsthumbnail.c
index cbf212af..f7150551 100644
--- a/tools/vipsthumbnail.c
+++ b/tools/vipsthumbnail.c
@@ -608,15 +608,15 @@ thumbnail_write( VipsImage *im, const char *filename )
 static int
 thumbnail_process( VipsObject *process, const char *filename )
 {
+	VipsImage *sharpen = thumbnail_sharpen( process );
+
 	VipsImage *in;
 	VipsInterpolate *interp;
-	VipsImage *sharpen;
 	VipsImage *thumbnail;
 	VipsImage *crop;
 
 	if( !(in = thumbnail_open( process, filename )) ||
 		!(interp = thumbnail_interpolator( process, in )) ||
-		!(sharpen = thumbnail_sharpen( process )) ||
 		!(thumbnail = 
 			thumbnail_shrink( process, in, interp, sharpen )) ||
 		!(crop = thumbnail_crop( process, thumbnail )) ||