add max_slope to lhist

and make gaussnoise go via vips8

Author: jcupitt

ChangeLog

@@ -1,4 +1,6 @@
 started 8.5 24/1/17
+- add max_slope to lhist
+- gaussnoise goes via vips8 now
 
 started 8.4.1 25/9/16
 - simplify nip2-icon.rc build, bgilbert

configure.ac

@@ -379,6 +379,7 @@ AC_OUTPUT([
 	share/nip2/compat/7.40/Makefile
 	share/nip2/compat/8.2/Makefile
 	share/nip2/compat/8.3/Makefile
+	share/nip2/compat/8.4/Makefile
 	src/BITMAPS/Makefile 
 	src/Makefile
 	test/Makefile

share/nip2/start/Filter.def

@@ -625,13 +625,16 @@ Filter_enhance_item = class
 
 				window_width = Expression "Window width" 20;
 				window_height = Expression "Window height" 20;
+				max_slope = Scale "Maxium slope" 0 10 0;
 
 				_result 
 					= map_unary process x
 				{
 					process in 
 						= hist_equalize_local 
-							window_width.expr window_height.expr in;
+							window_width 
+							window_height 
+							max_slope in;
 				}
 			}
 		}

share/nip2/start/Image.def

@@ -1657,8 +1657,7 @@ Pattern_images_item = class
 				mean = Scale "Mean" 0 255 128;
 				deviation = Scale "Deviation" 0 128 50;
 
-				_result = Image (im_gaussnoise 
-					(to_real nwidth) (to_real nheight) 
+				_result = Image (gaussnoise nwidth nheight 
 					mean.value deviation.value);
 			}
 		}

share/nip2/start/_joe_utilities.def

@@ -36,7 +36,7 @@ so_balance ref_meanmax im1 im2 mask gauss
          im2_cor = im2_cor_a, gauss == false
            = clip2fmt im2_cor_a.format gauss_im
        {gauss_im =
-           im_gaussnoise im2_cor_a.width im2_cor_a.height ref_meanmax?0
+           gaussnoise im2_cor_a.width im2_cor_a.height ref_meanmax?0
 (deviation im2_cor_a);}
                            result = im_blend (get_image mask) (get_image
 im2_cor) (get_image im1);

share/nip2/start/_stdenv.def

@@ -1537,18 +1537,16 @@ hist_match in ref
 
 hist_equalize x = hist_map ((hist_norm @ hist_cum @ hist_find) x) x;
 
-hist_equalize_local w h image
+hist_equalize_local w h l image
 	= oo_unary_function hist_equalize_local_op image, is_class image
-	= lhisteq image, is_image image
+	= out, is_image image
 	= error (_ "bad arguments to " ++ "hist_equalize_local")
 {
 	hist_equalize_local_op = Operator "hist_equalize_local" 
-		(hist_equalize_local w h) Operator_type.COMPOUND_REWRAP false;
+		(hist_equalize_local w h l) Operator_type.COMPOUND_REWRAP false;
 
-	// loop over bands, if necessary
-	lhisteq im
-		= im_lhisteq im (to_real w) (to_real h), get_bands im == 1
-		= (foldl1 join @ map lhisteq @ bandsplit) im;
+	[out] = vips_call "hist_local" 
+		[image, to_real w, to_real h] [$max_slope => to_real l];
 }
 
 // find the threshold below which are percent of the image (percent in [0,1])
@@ -2521,3 +2519,12 @@ worley cell width height
 		$cell_size => to_real cell 
 	];
 }
+
+gaussnoise width height mean sigma
+	= im
+{
+	[im] = vips_call "gaussnoise" [to_real width, to_real height] [
+		$mean => to_real mean,
+		$sigma => to_real sigma
+	];
+}