From 54144a8bc5a90f6f7885680ff9414d89f5cd667c Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 21 Sep 2020 09:45:08 +0100
Subject: [PATCH] allow gaussblur sigma 0

meaning no blur (obviosuly)
---
 ChangeLog                       |  1 +
 libvips/convolution/gaussblur.c | 39 ++++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1eb7cf4c..34a9525b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 - bump minimum libheif version to 1.3 [lovell]
 - dzsave in iiif mode could set info.json dimensions off by one [Linden6]
 - pdfload allows dpi and scale to both be set [le0daniel]
+- allow gaussblur sigma zero, meaning no blur
 
 9/8/20 started 8.10.1
 - fix markdown -> xml conversion in doc generation
diff --git a/libvips/convolution/gaussblur.c b/libvips/convolution/gaussblur.c
index 215eefd9..e5228542 100644
--- a/libvips/convolution/gaussblur.c
+++ b/libvips/convolution/gaussblur.c
@@ -4,6 +4,9 @@
  * 	- from vips_sharpen()
  * 19/11/14
  * 	- change parameters to be more imagemagick-like
+ * 21/9/20
+ * 	- allow sigma zero, meaning no blur
+ * 	- sigma < 0.2 is just copy
  */
 
 /*
@@ -73,23 +76,33 @@ vips_gaussblur_build( VipsObject *object )
 	if( VIPS_OBJECT_CLASS( vips_gaussblur_parent_class )->build( object ) )
 		return( -1 );
 
-	if( vips_gaussmat( &t[0], gaussblur->sigma, gaussblur->min_ampl, 
-		"separable", TRUE,
-		"precision", gaussblur->precision,
-		NULL ) )
-		return( -1 ); 
+	/* vips_gaussmat() will make a 1x1 pixel mask for anything smaller than
+	 * this.
+	 */
+	if( sigma < 0.2 ) {
+		if( vips_copy( gaussblur->in, &t[1], NULL ) )
+			return( -1 ); 
+	}
+	else {
+		if( vips_gaussmat( &t[0], 
+			gaussblur->sigma, gaussblur->min_ampl, 
+			"separable", TRUE,
+			"precision", gaussblur->precision,
+			NULL ) )
+			return( -1 ); 
 
 #ifdef DEBUG
-	printf( "gaussblur: blurring with:\n" ); 
-	vips_matrixprint( t[0], NULL ); 
+		printf( "gaussblur: blurring with:\n" ); 
+		vips_matrixprint( t[0], NULL ); 
 #endif /*DEBUG*/
 
-	g_info( "gaussblur mask width %d", t[0]->Xsize );
+		g_info( "gaussblur mask width %d", t[0]->Xsize );
 
-	if( vips_convsep( gaussblur->in, &t[1], t[0], 
-		"precision", gaussblur->precision,
-		NULL ) )
-		return( -1 );
+		if( vips_convsep( gaussblur->in, &t[1], t[0], 
+			"precision", gaussblur->precision,
+			NULL ) )
+			return( -1 );
+	}
 
 	g_object_set( object, "out", vips_image_new(), NULL ); 
 
@@ -132,7 +145,7 @@ vips_gaussblur_class_init( VipsGaussblurClass *class )
 		_( "Sigma of Gaussian" ),
 		VIPS_ARGUMENT_REQUIRED_INPUT,
 		G_STRUCT_OFFSET( VipsGaussblur, sigma ),
-		0.01, 1000, 1.5 );
+		0.0, 1000, 1.5 );
 
 	VIPS_ARG_DOUBLE( class, "min_ampl", 3, 
 		_( "Minimum amplitude" ),