Merge branch 'master' of github.com:jcupitt/nip2

jcupitt · jcupitt · commit 77a66c7dd695 · 2017-03-21T10:33:50.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,10 @@ started 8.5 24/1/17
 - add max_slope to lhist
 - gaussnoise goes via vips8 now
 - add snake option to array join [Joe Padfield]
+- parse_float was broken for numbers starting "0."
+- add alpha section to Image / Band menu ... Flatten, Premultiply,
+  Unpremultiply, Blend
+- add Entropy to hist menu
 
 started 8.4.1 25/9/16
 - simplify nip2-icon.rc build, bgilbert
diff --git a/TODO b/TODO
@@ -1,5 +1,9 @@
 - seeing occasional "rewind image with active regions" message
 
+- should parse_float / _int etc. allow leading and trailing spaces?
+
+    (split is_space x)?0
+
 - how about adding
 
 	zip2 10 [1..5] == [[10, 1], [10, 2], [10, 3], ..
diff --git a/share/nip2/start/Filter.def b/share/nip2/start/Filter.def
@@ -1005,7 +1005,7 @@ Filter_blend_item = class
 	} 
 
 	Blend_alpha_item = class
-		Menuaction "_Alpha" "blend images with optional alpha channels" {
+		Menuaction "Blend _Alpha" "blend images with optional alpha channels" {
 		// usage: layerit foreground background
 		// input images must be either 1 or 3 bands, optionally + 1 band 
 		// which is used as the alpha channel
diff --git a/share/nip2/start/Histogram.def b/share/nip2/start/Histogram.def
@@ -162,6 +162,10 @@ Hist_zerox_item = class
 	}
 }
 
+Hist_entropy_item = class Menuaction "Entropy" "calculate histogram entropy" {
+	action x = hist_entropy x;
+}
+
 #separator
 
 Hist_profile_item = class 
diff --git a/share/nip2/start/Image.def b/share/nip2/start/Image.def
@@ -1062,6 +1062,30 @@ Image_band_item = class
 
     sep1 = Menuseparator;
 
+	Flatten_item = class Menuaction "_Flatten" "flatten alpha out of image" {
+		action x = class
+			_result {
+			_vislevel = 3;
+
+			bg = Expression "Background" 0;
+
+			_result = map_unary (flattenimage bg) x;
+		}
+	}
+
+	Premultiply_item = class Menuaction "_Premultiply" "premultiply alpha" {
+		action x = premultiply x;
+	}
+
+	Unpremultiply_item = class 
+		Menuaction "_Unpremultiply" "unpremultiply alpha" {
+		action x = unpremultiply x; 
+	}
+
+	Blend_alpha_item = Filter_blend_item.Blend_alpha_item;
+
+    sep1a = Menuseparator;
+
 	Bandand_item = class
 		Menuaction "Bitwise Band AND" "bitwise AND of image bands" {
 		action x = bandand x;
@@ -1321,8 +1345,8 @@ Image_draw_item = class
 			_result {
 			_vislevel = 3;
 
-			sx = Expression "Start x" 100;
-			sy = Expression "Start y" 100;
+			sx = Expression "Start x" 0;
+			sy = Expression "Start y" 0;
 
 			e = Option "Flood while" [
 				"Not equal to ink",
diff --git a/share/nip2/start/_convert.def b/share/nip2/start/_convert.def
@@ -21,6 +21,36 @@ to_matrix x
 		= error (_ "not image");
 }
 
+/* Try to make a Vector ... works for Vector/Image/Real, plus image/real
+ */
+to_vector x
+	= to_vector x.expr, is_Expression x
+	= x, is_Vector x
+	= oo_unary_function to_vector_op x, is_class x
+	= tov x
+{
+	to_vector_op = Operator "to_vector" tov Operator_type.COMPOUND false;
+
+	tov x
+		= Vector (itov x), is_image x
+		= Vector [x], is_real x
+		= Vector x, is_real_list x
+		= Vector x?0, is_matrix x && len x == 1
+		= Vector (transpose x)?0, is_matrix x && len x?0 == 1
+		= error (_ "bad arguments to " ++ "to_vector");
+
+	itov i
+		= v, is_image i 
+		= error (_ "not image")
+	{
+		m = im_vips2mask ((double) i);
+		v 
+			= m.value?0, m.height == 1
+			= (transpose m.value)?0, m.width == 1
+			= error (_ "image is not 1xN or Nx1");
+	}
+}
+
 /* Try to make an Image ... works for Vector/Matrix/Real, plus image/real
  * Special case for Colour ... pull out the colour_space and set Type in the
  * image.
@@ -189,7 +219,7 @@ parse_float l
 
 	ipart = parse_int parts?0;
 	sign 
-		= 1, ipart > 0
+		= 1, ipart >= 0
 		= -1;
 	fpart
 		= 0, parts?1 == [];
diff --git a/share/nip2/start/_stdenv.def b/share/nip2/start/_stdenv.def
@@ -2528,3 +2528,70 @@ gaussnoise width height mean sigma
 		$sigma => to_real sigma
 	];
 }
+
+flattenimage bg x 
+	= oo_unary_function flatten_op x, is_class x
+	= flt (to_vector bg) x, is_image x 
+	= error (_ "bad arguments to " ++ "flattenimage")
+{
+	flatten_op = Operator "flatten" 
+		(flattenimage bg) Operator_type.COMPOUND_REWRAP false;
+
+	flt bg x
+		= out
+	{
+		[out] = vips_call "flatten" [x] [
+			$background => bg.value 
+		];
+	}
+}
+
+premultiply x 
+	= oo_unary_function premultiply_op x, is_class x
+	= prem x, is_image x 
+	= error (_ "bad arguments to " ++ "premultiply")
+{
+	premultiply_op = Operator "premultiply" 
+		premultiply Operator_type.COMPOUND_REWRAP false;
+
+	prem x
+		= out
+	{
+		[out] = vips_call "premultiply" [x] [
+		];
+	}
+}
+
+unpremultiply x 
+	= oo_unary_function unpremultiply_op x, is_class x
+	= unprem x, is_image x 
+	= error (_ "bad arguments to " ++ "unpremultiply")
+{
+	unpremultiply_op = Operator "unpremultiply" 
+		unpremultiply Operator_type.COMPOUND_REWRAP false;
+
+	unprem x
+		= out
+	{
+		[out] = vips_call "unpremultiply" [x] [
+		];
+	}
+}
+
+hist_entropy x 
+	= oo_unary_function hist_entropy_op x, is_class x
+	= entropy x, is_image x 
+	= error (_ "bad arguments to " ++ "hist_entropy")
+{
+	hist_entropy_op = Operator "hist_entropy" 
+		hist_entropy Operator_type.COMPOUND_REWRAP false;
+
+	entropy x
+		= out
+	{
+		[out] = vips_call "hist_entropy" [x] [
+		];
+	}
+}
+
+
diff --git a/src/heap.c b/src/heap.c
@@ -1891,7 +1891,7 @@ heap_ip_to_gvalue( PElement *in, GValue *out )
 			im_ref_string_set( out, name );
 		}
 #if VIPS_MAJOR_VERSION > 7 || VIPS_MINOR_VERSION > 39
-		/* vips_value_set_array_image() is a 7.40 feature.
+		/* vips_value_set_array_*() is a 7.40 feature.
 		 */
 		else if( heap_is_imagevec( in, &result ) &&
 			result ) { 
@@ -1914,6 +1914,16 @@ heap_ip_to_gvalue( PElement *in, GValue *out )
 				g_object_ref( ivec[i] ); 
 			}
 		}
+		else if( heap_is_realvec( in, &result ) &&
+			result ) { 
+			double realvec[100];
+			int n;
+
+			if( (n = heap_get_realvec( in, realvec, 100 )) < 0 ) 
+				return( FALSE );
+			g_value_init( out, VIPS_TYPE_ARRAY_DOUBLE );
+			vips_value_set_array_double( out, realvec, n );
+		}
 #endif
 		else {
 			error_top( _( "Unimplemented list type." ) );

Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ Filter_blend_item = class`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`	`1007`	`Blend_alpha_item = class`
`1008`		`- Menuaction "_Alpha" "blend images with optional alpha channels" {`
	`1008`	`+ Menuaction "Blend _Alpha" "blend images with optional alpha channels" {`
`1009`	`1009`	`// usage: layerit foreground background`
`1010`	`1010`	`// input images must be either 1 or 3 bands, optionally + 1 band`
`1011`	`1011`	`// which is used as the alpha channel`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,10 @@ Hist_zerox_item = class`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
	`165`	`+Hist_entropy_item = class Menuaction "Entropy" "calculate histogram entropy" {`
	`166`	`+ action x = hist_entropy x;`
	`167`	`+}`
	`168`	`+`
`165`	`169`	`#separator`
`166`	`170`
`167`	`171`	`Hist_profile_item = class`