From b1977730959a68668256d9e2bb7ea4a99a9fdcbe Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sun, 28 Feb 2016 11:24:35 +0000
Subject: [PATCH] oop, overflow in sharpen

plus another tweak of the defaults
---
 ChangeLog                     |  1 +
 TODO                          | 10 +++++-----
 libvips/convolution/sharpen.c | 29 ++++++++++++++++-------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e7518ec3..07267aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 - lower mem use for progressive jpg decode
 - sharpen has a new @sigma param, @radius is deprecated
 - sharpen allows a much greater range of parameters
+- sharpen defaults now suitable for screen output
 - better handling of deprecated args in python
 - much better handling of arrayimage command-line args
 
diff --git a/TODO b/TODO
index 33f4624d..91c0e2ee 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,8 @@
+
+- use the incremental webp decoding api to support seq for webp images
+  
+	https://developers.google.com/speed/webp/docs/api#decodingadvancedapi
+
 - try
 
 	$ vips sharpen babe.jpg x.v
@@ -222,11 +227,6 @@
   use it from nip2 for zooming? only if the partial flag is set though, we
   don't want to use it on jpg files
 
-- use the webp advanced encoding api to set a write function for webp save to
-  file
-
-- use g_log() instead of vips_info()?
-
 
 
 - quadratic doesn't work for order 3
diff --git a/libvips/convolution/sharpen.c b/libvips/convolution/sharpen.c
index 3e969bee..05e6abff 100644
--- a/libvips/convolution/sharpen.c
+++ b/libvips/convolution/sharpen.c
@@ -128,11 +128,11 @@ vips_sharpen_generate( VipsRegion *or,
 	VIPS_GATE_START( "vips_sharpen_generate: work" ); 
 
 	for( y = 0; y < r->height; y++ ) {
-		short *p1 = (short * restrict ) 
+		short *p1 = (short * restrict) 
 			VIPS_REGION_ADDR( in[0], r->left, r->top + y );
-		short *p2 = (short * restrict ) 
+		short *p2 = (short * restrict) 
 			VIPS_REGION_ADDR( in[1], r->left, r->top + y );
-		short *q = (short * restrict ) 
+		short *q = (short * restrict) 
 			VIPS_REGION_ADDR( or, r->left, r->top + y );
 
 		for( x = 0; x < r->width; x++ ) {
@@ -143,12 +143,15 @@ vips_sharpen_generate( VipsRegion *or,
 			 * difference to be in this range, both must be 0 -
 			 * 32767.
 			 */
-			int d = (v1 & 0x8fff) - (v2 & 0x8fff);
+			int diff = ((v1 & 0x7fff) - (v2 & 0x7fff));
 
 			int out;
 
-			out = v1 + lut[d + 32768];
+			g_assert( diff + 32768 >= 0 );
+			g_assert( diff + 32768 < 65536 );
 
+			out = v1 + lut[diff + 32768];
+			
 			if( out < 0 )
 				out = 0;
 			if( out > 32767 )
@@ -331,7 +334,7 @@ vips_sharpen_class_init( VipsSharpenClass *class )
 		_( "Flat/jaggy threshold" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsSharpen, x1 ),
-		0, 1000000, 1.5 );
+		0, 1000000, 2.0 );
 
 	VIPS_ARG_DOUBLE( class, "y2", 6, 
 		_( "y2" ), 
@@ -359,7 +362,7 @@ vips_sharpen_class_init( VipsSharpenClass *class )
 		_( "Slope for jaggy areas" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsSharpen, m2 ),
-		0, 1000000, 0.5 );
+		0, 1000000, 3.0 );
 
 	/* We used to have a radius control.
 	 */
@@ -376,11 +379,11 @@ static void
 vips_sharpen_init( VipsSharpen *sharpen )
 {
 	sharpen->sigma = 0.5;
-	sharpen->x1 = 1.5; 
+	sharpen->x1 = 2.0;
 	sharpen->y2 = 10.0; 
 	sharpen->y3 = 20.0; 
 	sharpen->m1 = 0.0; 
-	sharpen->m2 = 0.5; 
+	sharpen->m2 = 3.0;
 }
 
 /**
@@ -432,11 +435,11 @@ vips_sharpen_init( VipsSharpen *sharpen )
  *
  * |[
  *   sigma == 0.5
- *   x1 == 1.5
+ *   x1 == 2
  *   y2 == 10         (don't brighten by more than 10 L*)
- *   y3 == 20         (can darken by up to 52 L*)
+ *   y3 == 20         (can darken by up to 20 L*)
  *   m1 == 0          (no sharpening in flat areas)
- *   m2 == 0.5        (some sharpening in jaggy areas)
+ *   m2 == 3          (some sharpening in jaggy areas)
  * ]|
  *
  * If you want more or less sharpening, we suggest you just change the 
@@ -444,7 +447,7 @@ vips_sharpen_init( VipsSharpen *sharpen )
  *
  * The @sigma parameter changes the width of the fringe and can be 
  * adjusted according to the output printing resolution. As an approximate 
- * guideline, use 0.5 for 4 pixels/mm (CRT display resolution), 
+ * guideline, use 0.5 for 4 pixels/mm (display resolution), 
  * 1.0 for 12 pixels/mm and 1.5 for 16 pixels/mm (300 dpi == 12 
  * pixels/mm). These figures refer to the image raster, not the half-tone 
  * resolution.