set int prec for conv, remove old vips7 code

8.6 will default to float for conv, so we need to force int

remove old vips7 progs

Author: jcupitt

benchmark.sh

@@ -95,9 +95,6 @@ benchmark vips-c "./vips-c $tmp/x.tif $tmp/x2.tif"
 echo -n strip-
 benchmark vips-c "./vips-c $tmp/x_strip.tif $tmp/x2.tif"
 
-g++ vips.cc `pkg-config vipsCC --cflags --libs` -o vips-cc
-benchmark vips-cc "./vips-cc $tmp/x.tif $tmp/x2.tif"
-
 gcc -Wall vips.c `pkg-config vips --cflags --libs` -o vips-c
 echo -n ppm-
 benchmark vips-c "./vips-c $tmp/x.ppm $tmp/x2.ppm"
@@ -106,8 +103,6 @@ benchmark vips.lua "./vips.lua $tmp/x.tif $tmp/x2.tif"
 
 benchmark vips.php "./vips.php $tmp/x.tif $tmp/x2.tif"
 
-benchmark vips.py "./vips.py $tmp/x.tif $tmp/x2.tif"
-
 benchmark vips8-gegl.py "./vips8-gegl.py $tmp/x.tif $tmp/x2.tif"
 
 g++ vips8.cc `pkg-config vips-cpp --cflags --libs` -o vips8-cc

ruby-vips.rb

@@ -5,12 +5,12 @@
 im = Vips::Image.new_from_file ARGV[0]
 
 im = im.crop 100, 100, im.width - 200, im.height - 200
-im = im.similarity :scale => 0.9
+im = im.similarity scale: 0.9
 mask = Vips::Image.new_from_array [
 	[-1, -1,  -1], 
 	[-1,  16, -1],
 	[-1, -1,  -1]], 8
-im = im.conv(mask)
+im = im.conv mask, precision: "integer"
 
 im.write_to_file ARGV[1]
 

vips.c

@@ -39,7 +39,9 @@ main( int argc, char **argv )
 			"scale", 0.9, 
 			"interpolate", interp, 
 			NULL ) ||
-                vips_conv( t[3], &t[4], t[1], NULL ) ||
+                vips_conv( t[3], &t[4], t[1], 
+			"precision", VIPS_PRECISION_INTEGER,
+			NULL ) ||
                 vips_image_write_to_file( t[4], argv[2], NULL ) )
                 vips_error_exit( NULL ); 
 

vips.cc

@@ -15,7 +15,7 @@
 		  [[-1,  -1, -1], 
 		   [-1,  16, -1], 
 		   [-1,  -1, -1]], 8);
-$im = $im->conv($mask);
+$im = $im->conv($mask, ["precision" => "integer"]);
 
 $im->writeToFile($argv[2]);
 

vips.php

@@ -17,6 +17,6 @@ cat > mask.con <<EOF
 -1 16 -1
 -1 -1 -1
 EOF
-vips conv t2.v $2 mask.con
+vips conv t2.v $2 mask.con --precision integer
 
 rm t1.v t2.v

vips.py

@@ -17,7 +17,7 @@
 mask = Vips.Image.new_from_array([[-1, -1,  -1], 
                                   [-1,  16, -1], 
                                   [-1, -1,  -1]], scale = 8)
-im = im.conv(mask)
+im = im.conv(mask, precision = "integer")
 
 im = im.colourspace("srgb")
 im = im.extract_band(0, n = 3)

vips.sh

@@ -41,7 +41,8 @@ main( int argc, char **argv )
                 similarity( VImage::option()->
 			set( "scale", 0.9 )->
 			set( "interpolate", inter ) ).
-                conv( mask ). 
+                conv( mask, VImage::option()->
+			set( "precision", VIPS_PRECISION_INTEGER )). 
                 write_to_file( argv[2] );
 
         return( 0 );

vips8-gegl.py

@@ -14,6 +14,6 @@
 mask = Vips.Image.new_from_array([[-1, -1,  -1], 
                                   [-1,  16, -1], 
                                   [-1, -1,  -1]], scale = 8)
-im = im.conv(mask)
+im = im.conv(mask, precision = "integer")
 
 im.write_to_file(sys.argv[2])