update to new vips_resize

jcupitt · jcupitt · commit 810732b3a0dd · 2016-05-08T12:44:25.000+01:00
resize now just calls vips_resize

add kernel type

update other defs

update example wses to latest version
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 started 8.3.0 on 28/3/16
 - move path search stuff into _convert from _magick
 - added autotrace menu item
+- resize now uses vips_resize() behind the scenes
+- added Kernel type for picking interpolators
 
 started 8.2.1 on 4/12/16
 - tiny improvement to idle handling
diff --git a/share/nip2/data/examples/1_point_mosaic/1pt_mosaic.ws b/share/nip2/data/examples/1_point_mosaic/1pt_mosaic.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1046" window_height="748" filename="$HOME/GIT/nip2/share/nip2/data/examples/1_point_mosaic/1pt_mosaic.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="pt_mosaic" caption="">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="9" name="A" caption="source images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/2_point_mosaic/2pts_mosaic.ws b/share/nip2/data/examples/2_point_mosaic/2pts_mosaic.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="793" window_height="671" filename="$HOME/GIT/nip2/share/nip2/data/examples/2_point_mosaic/2pts_mosaic.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="pts_mosaic" caption="">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="7" name="A" caption="untitled">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/businesscard/businesscard.ws b/share/nip2/data/examples/businesscard/businesscard.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="948" window_height="694" filename="$HOME/GIT/nip2/share/nip2/data/examples/businesscard/businesscard.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="businesscard" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="true" sform="false" next="3" name="A" caption="source images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/clone/clone.ws b/share/nip2/data/examples/clone/clone.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1019" window_height="625" filename="$HOME/GIT/nip2/share/nip2/data/examples/clone/clone.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="clone" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="4" name="A" caption="Images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/framing/framing.ws b/share/nip2/data/examples/framing/framing.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="970" window_height="633" filename="$HOME/GIT/nip2/share/nip2/data/examples/framing/framing.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="framing" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="5" name="A" caption="untitled">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/logo/logo2.ws b/share/nip2/data/examples/logo/logo2.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1020" window_height="735" filename="$HOME/GIT/nip2/share/nip2/data/examples/logo/logo2.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="logo5" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="12" name="A" caption="render text">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/manual_balance/manual_balance.ws b/share/nip2/data/examples/manual_balance/manual_balance.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1193" window_height="683" filename="$HOME/GIT/nip2/share/nip2/data/examples/manual_balance/manual_balance.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="manual_balance" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="true" sform="false" next="8" name="A" caption="Images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/overlays_and_blending/overlay_blend.ws b/share/nip2/data/examples/overlays_and_blending/overlay_blend.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1115" window_height="800" filename="$HOME/GIT/nip2/share/nip2/data/examples/overlays_and_blending/overlay_blend.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="overlay_blend" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="5" name="A" caption="Images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/data/examples/registering/registering.ws b/share/nip2/data/examples/registering/registering.ws
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/7.39.0">
+<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.3.0">
   <Workspace window_x="0" window_y="0" window_width="1280" window_height="722" filename="$HOME/GIT/nip2/share/nip2/data/examples/registering/registering.ws" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="registering" caption="Default empty workspace">
     <Column x="0" y="0" open="true" selected="false" sform="false" next="5" name="A" caption="Original Images">
       <Subcolumn vislevel="3">
diff --git a/share/nip2/start/Histogram.def b/share/nip2/start/Histogram.def
@@ -236,7 +236,7 @@ Hist_graph_item = class
 					displace.value vdisplace.value width.value arrow;
 
 				// squish vertically to get an average
-				area' = resize Interpolate_bilinear 1 (1 / width.value) area;
+				area' = resize Kernel_linear 1 (1 / width.value) area;
 			}
 		}
 	}
diff --git a/share/nip2/start/Image.def b/share/nip2/start/Image.def
@@ -631,13 +631,13 @@ Image_transform_item = class
 
 				xfactor = Expression "Horizontal scale factor" 1;
 				yfactor = Expression "Vertical scale factor" 1;
-				interp = Interpolate_picker Interpolate_type.BILINEAR;
+				kernel = Kernel_picker Kernel_type.LINEAR;
 
 				_result 
 					= map_unary process x
 				{
 					process image 
-						= resize interp xfactor yfactor image;
+						= resize kernel xfactor yfactor image;
 				}
 			}
 		}
@@ -656,14 +656,14 @@ Image_transform_item = class
 				] 0;
 				size = Expression "Resize to (pixels)" 128;
 				aspect = Toggle "Break aspect ratio" false;
-				interp = Interpolate_picker Interpolate_type.BILINEAR;
+				kernel = Kernel_picker Kernel_type.LINEAR;
 
 				_result
 					= map_unary process x
 				{
 					process image
-						= resize interp h v image, aspect
-						= resize interp fac fac image
+						= resize kernel h v image, aspect
+						= resize kernel fac fac image
 					{
 						xfac = to_real size / image.width;
 						yfac = to_real size / image.height;
@@ -708,7 +708,7 @@ Image_transform_item = class
 			    size = Option "Page size" [
 					"Full page", "Half page", "Quarter page" 
 				] 0;
-				interp = Interpolate_picker Interpolate_type.BILINEAR;
+				kernel = Kernel_picker Kernel_type.LINEAR;
 
 			 	_result
 				 	= map_unary process x
@@ -721,7 +721,7 @@ Image_transform_item = class
 					[width, height] = allrect?within;
 
 					process x
-						= resize interp fac fac x, fac < 1
+						= resize kernel fac fac x, fac < 1
 						= x
 					{
 						xfac = (width / xdiv) / x.width;
diff --git a/share/nip2/start/Tasks.def b/share/nip2/start/Tasks.def
@@ -802,8 +802,8 @@ Manual_balance_item = class
 			xfactor = im_in.width/scale_im.width;
 			yfactor = im_in.height/scale_im.height;
 			
-			_scale_im = resize Interpolate_bilinear xfactor yfactor scale_im;
-			_offset_im = resize Interpolate_bilinear xfactor yfactor offset_im;
+			_scale_im = resize Kernel_linear xfactor yfactor scale_im;
+			_offset_im = resize Kernel_linear xfactor yfactor offset_im;
 			
 			value = get_image ( clip2fmt im_in.format ( ( im_in * _scale_im ) +  _offset_im ) ); 	
 			}
diff --git a/share/nip2/start/_convert.def b/share/nip2/start/_convert.def
@@ -649,6 +649,7 @@ search_for_error name
 	= error (exe_name ++ " not found on your search path. " ++
 		"Check you have installed the program and it is on your PATH.")
 {
+	exe_name = name ++ expand "$EXEEXT";
 	path = search_for name;
 }
 
diff --git a/share/nip2/start/_joe_extra.def b/share/nip2/start/_joe_extra.def
@@ -50,7 +50,7 @@ Frame_item = class
 			//Scale frame image if required.
 			_a = a, _sf == 1;
 			   = a, _sf == 0;
-			   = Image (resize Interpolate_bilinear _sf _sf a.value);
+			   = Image (resize Kernel_linear _sf _sf a.value);
 
 			_im_w = b.width;
 			_im_h = b.height + mount_options._los, mount_options.apply
@@ -112,7 +112,7 @@ Frame_item = class
 			//Scale frame image if required.
 			_a = a, _sf == 1;
 			   = a, _sf == 0;
-			   = Image (resize Interpolate_bilinear _sf _sf a.value);
+			   = Image (resize Kernel_linear _sf _sf a.value);
 
 			_im_w = b.width;
 			_im_h = b.height + mount_options._los, mount_options.apply
@@ -173,7 +173,7 @@ Frame_item = class
 
 			_a = a, _sf == 1;
 			   = a, _sf == 0;
-			   = Image (resize Interpolate_bilinear _sf _sf a.value);
+			   = Image (resize Kernel_linear _sf _sf a.value);
 
 			_im_w = b.width;
 			_im_h = b.height + mount_options._los, mount_options.apply
@@ -420,9 +420,9 @@ Perspective_match_item = class
 			
 			process a b = transform 1 0 trans b2
 				{
-				b2 = resize Interpolate_bilinear f1 f2 b, (f1 >= 1 && f2 >= 1) || (f1 >= 1 && f2 >= 1)
-			    	= resize Interpolate_bilinear f1 1 b1
-					{b1 = resize Interpolate_bilinear 1 f2 b;}
+				b2 = resize Kernel_linear f1 f2 b, (f1 >= 1 && f2 >= 1) || (f1 >= 1 && f2 >= 1)
+			    	= resize Kernel_linear f1 1 b1
+					{b1 = resize Kernel_linear 1 f2 b;}
 				}
 			}
 		}
diff --git a/share/nip2/start/_stdenv.def b/share/nip2/start/_stdenv.def
@@ -1592,7 +1592,41 @@ zerox d x
 		(zerox d) Operator_type.COMPOUND_REWRAP false;
 }
 
-resize interp xfac yfac image
+reduce kernel xshr yshr image
+	= oo_unary_function reduce_op image, is_class image
+	= reduce_im image, is_image image
+	= error (_ "bad arguments to " ++ "reduce")
+{
+	reduce_op = Operator "reduce" 
+		reduce_im Operator_type.COMPOUND_REWRAP false;
+
+	reduce_im im 
+		= out
+	{
+		[out] = vips_call "reduce" [im, xshr, yshr] [$kernel => kernel.value];
+	}
+}
+
+similarity interpolate scale angle image
+	= oo_unary_function similarity_op image, is_class image
+	= similarity_im image, is_image image
+	= error (_ "bad arguments to " ++ "similarity")
+{
+	similarity_op = Operator "similarity" 
+		similarity_im Operator_type.COMPOUND_REWRAP false;
+
+	similarity_im im 
+		= out
+	{
+		[out] = vips_call "similarity" [im] [
+			$interpolate => interpolate.value,
+			$scale => scale,
+			$angle => angle
+		];
+	}
+}
+
+resize kernel xfac yfac image
 	= oo_unary_function resize_op image, is_class image
 	= resize_im image, is_image image
 	= error (_ "bad arguments to " ++ "resize")
@@ -1606,92 +1640,30 @@ resize interp xfac yfac image
 	rxfac' = 1 / xfac';
 	ryfac' = 1 / yfac';
 
-	// is this interpolation nearest-neighbour?
-	is_nn x = x.type == Interpolate_type.NEAREST_NEIGHBOUR;
+	is_nn = kernel.type == Kernel_type.NEAREST_NEIGHBOUR;
 
 	resize_im im
 		// upscale by integer factor, nearest neighbour
 		= im_zoom im xfac' yfac', 
 			is_int xfac' && is_int yfac' && 
 			xfac' >= 1 && yfac' >= 1 &&
-			is_nn interp
+			is_nn 
 
 		// downscale by integer factor, nearest neighbour
 		= im_subsample im rxfac' ryfac', 
 			is_int rxfac' && is_int ryfac' && 
 			rxfac' >= 1 && ryfac' >= 1 &&
-			is_nn interp
-
-		// upscale by any factor, nearest neighbour 
-		// upscale by integer part, then affine to exact size
-		= scale xg?1 yg?1 (im_zoom im xg?0 yg?0),
-			xfac' >= 1 && yfac' >= 1 &&
-			is_nn interp
+			is_nn 
 
-		// downscale by any factor, nearest neighbour 
-		// downscale by integer part, then affine to exact size
-		= scale xs?1 ys?1 (im_subsample im xs?0 ys?0),
-			rxfac' >= 1 && ryfac' >= 1 &&
-			is_nn interp
-
-		// upscale by any factor with affine
-		= scale xfac' yfac' im,
-			xfac' >= 1 && yfac' >= 1 
-
-		// downscale by any factor, bilinear
-		// block shrink by integer factor, then resample to 
-		// exact with affine
-		= scale xs?1 ys?1 (im_shrink im xs?0 ys?0),
-			rxfac' >= 1 && ryfac' >= 1 
-
-		= error ("resize: unimplemented argument combination:\n" ++ 
-			"  xfac = " ++ print xfac' ++ "\n" ++
-			"  yfac = " ++ print yfac' ++ "\n" ++
-			"  interp = " ++ print interp ++ " (" ++
-				Interpolate_type.descriptions?interp.type ++ ")")
+		// everything else ... we just pass on to vips_resize()
+		= vips_resize kernel xfac' yfac' im
 	{
-		// convert a float scale to integer plus fraction
-		// eg. scale by 2.5 becomes [2, 1.25] (x * 2.5 == x * 2 * 1.25)
-		break f = [floor f, f / floor f];
-
-		// same, but for downsizing ... turn a float scale which is less than
-		// 1 into an int shrink and a float scale
-
-		// complicated: the int shrink may round the size down (eg. imagine
-		// subsampling a 11 pixel wide image by 3, we'd get a 3 pixel wide
-		// image, not a 3.666 pixel wide image), so pass in the size of image
-		// we are operating on and adjust for any rounding
-		
-		// so ... x is (eg.) 467, f is (eg. 128/467, about 0.274)
-		rbreak x f 
-			= [int_shrink, float_resample]
+		vips_resize kernel hscale vscale im 
+			= out
 		{
-			// the size of image we are aiming for after the combined int and
-			// float resample
-			x' = x * f;
-
-			// int part
-			int_shrink = floor (1 / f);
-
-			// size after int shrink
-			x'' = floor (x / int_shrink);
-
-			// therefore what we need for the float part
-			float_resample = x' / x'';
+			[out] = vips_call "resize" [im, hscale] 
+				[$vscale => vscale, $kernel => kernel.value];
 		}
-
-		width = get_width im;
-		height = get_height im;
-
-		// grow and shrink factors
-		xg = break xfac';
-		yg = break yfac';
-		xs = rbreak width xfac';
-		ys = rbreak height yfac';
-
-		// resize
-		scale xfac yfac im
-			= im_affinei_all im interp.value xfac 0 0 yfac 0 0;
 	}
 }
 
diff --git a/share/nip2/start/_types.def b/share/nip2/start/_types.def
