Merge branch '8.6' into add-canny

ChangeLog

@@ -11,6 +11,8 @@
 - use pkg-config to find libjpeg, if we can
 - better clean of output image in vips_image_write() fixes a crash 
   writing twice to memory
+- better rounding behaviour in convolution means we hit the vector path more
+  often
 
 5/1/18 started 8.6.2
 - vips_sink_screen() keeps a ref to the input image ... stops a rare race

libvips/convolution/convi.c

@@ -904,8 +904,12 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
 
 	/* The mask max rounded up to the next power of two gives the exponent
 	 * all elements share. Values are eg. -3 for 1/8, 3 for 8.
+	 *
+	 * Add one so we round up stuff exactly on x.0. We multiply by 128
+	 * later, so 1.0 (for example) would become 128, which is outside
+	 * signed 8 bit. 
 	 */
-	shift = ceil( log2( mx ) );
+	shift = ceil( log2( mx + 1 ) );
 
 	/* We need to sum n_points, so we have to shift right before adding a
 	 * new value to make sure we have enough range.