fix more spec tests

jcupitt · jcupitt · commit d4543abef437 · 2014-07-15T22:09:20.000+01:00
now all pass, except one which needs a vips fix
diff --git a/ext/image.c b/ext/image.c
@@ -345,7 +345,7 @@ img_data(VALUE obj)
         return( Qnil );
 
     return rb_tainted_str_new((const char *) im->data, 
-		    IM_IMAGE_SIZEOF_IMAGE(im) );
+		    IM_IMAGE_SIZEOF_LINE(im) * im->Ysize);
 }
 
 /*
diff --git a/spec/vips/arithmetic_spec.rb b/spec/vips/arithmetic_spec.rb
@@ -101,7 +101,7 @@ def image_mins(image)
 
   it "should return the average location of the image max" do
     pending "variable results in git master right now"
-    @image.maxpos_avg.should == [107.0, 116.5, 248.0]
+    @image.maxpos_avg.should == [12.0, 116.5, 248.0]
   end
 
   it "should return an array of n image max locations" do
diff --git a/spec/vips/colour_spec.rb b/spec/vips/colour_spec.rb
@@ -137,30 +137,30 @@
     im.band_fmt.should == :FLOAT
   end
 
-  pending "should calculate a CMC color difference image between two lab images" do
+  it "should calculate a CMC color difference image between two lab images" do
     im = @image.srgb_to_xyz.xyz_to_lab
     im2 = @image2.srgb_to_xyz.xyz_to_lab
     diff = im.decmc_from_lab(im2)
     if Spec::Helpers.match_vips_version("> 7.23")
-      diff.should match_sha1('30d9850f3414d9931d4d90a156a57f1202ba692b')
+      diff.should match_sha1('91396adda33cc10e71bc79b0cd3cbf449f756d0b')
     end
   end
 
-  pending "should calculate a CIE76 color difference image between two lab images" do
+  it "should calculate a CIE76 color difference image between two lab images" do
     im = @image.srgb_to_xyz.xyz_to_lab
     im2 = @image2.srgb_to_xyz.xyz_to_lab
     diff = im.de_from_lab(im2)
     if Spec::Helpers.match_vips_version("> 7.23")
-      diff.should match_sha1('f7c261b5d8532c2c34f77039af8754fffe23dcc6')
+      diff.should match_sha1('e5810662fa9866a39e778bdf73e910c2196e56e9')
     end
   end
 
-  pending "should calculate a CIEDE2000 color difference image between two lab images" do
+  it "should calculate a CIEDE2000 color difference image between two lab images" do
     im = @image.srgb_to_xyz.xyz_to_lab
     im2 = @image2.srgb_to_xyz.xyz_to_lab
     diff = im.de00_from_lab(im2)
     if Spec::Helpers.match_vips_version("> 7.23")
-      diff.should match_sha1('66d4869acf57df855ced1d38ed308612f6a198f4')
+      diff.should match_sha1('629b5fb844c1f2e61c5e652f23435297b0ec76f4')
     end
   end
 
diff --git a/spec/vips/convolution_spec.rb b/spec/vips/convolution_spec.rb
@@ -27,16 +27,16 @@
     # TODO: some kind of validation of the generated image
   end
 
-  pending "should perform a seperable convolution with an int mask" do
+  it "should perform a seperable convolution with an int mask" do
     m = VIPS::Mask.new [[1, -2, 3]], 3
     im = @image.convsep m
-    im.should match_sha1('1389e7d7fb3f1646e774ac69d6a8802c26652aa5')
+    im.should match_sha1('4c017e1d28bbc4833faad83142231a4a88663289')
   end
 
-  pending "should perform a seperable convolution with a float mask" do
+  it "should perform a seperable convolution with a float mask" do
     m = VIPS::Mask.new [[1.2, -2.1, 3.0]], 3.4
     im = @image.convsep m
-    im.should match_sha1('e6c79ddd45c93b31a77c830c925561c6d2139529')
+    im.should match_sha1('a3263e83248b79df792d22981ad2c863aa28e887')
   end
 
   it "should convolve 8 times, rotating 45 deg each time" do
@@ -72,10 +72,10 @@
     im.should match_sha1('78580ff728cca4722c73f610406ac8eba0604ba9')
   end
 
-  pending "should sharpen an image coded in LABS or LABQ format" do
+  it "should sharpen an image coded in LABS or LABQ format" do
     im = @image.srgb_to_xyz.xyz_to_lab.lab_to_labs.sharpen(7, 1.5, 20, 50, 1, 2)
     if Spec::Helpers.match_vips_version("> 7.23")
-      im.should match_sha1('f46d4ba8b0c16e19af95fcd3518caae0a7c2170d')
+      im.should match_sha1('f6fdf3136cc01b3f267b80450f4c4419ae22b77a')
     end
   end
 
diff --git a/spec/vips/csv_reader_spec.rb b/spec/vips/csv_reader_spec.rb
@@ -21,8 +21,7 @@
 
   it "should read a csv image" do
     im = @reader.read
-    pending "CSV Images don't currently match the original"
-    im.should match_image(@image)
+    im.clip2fmt(:UCHAR).should match_image(@image)
   end
 
   it "should read the dimensions from the header" do
diff --git a/spec/vips/csv_writer_spec.rb b/spec/vips/csv_writer_spec.rb
@@ -11,18 +11,15 @@
     @writer.write(@path)
 
     im = VIPS::Image.csv @path
-    pending "figure out why a csv image doesn't perfectly match its original"
-
-    im.should match_image(@image)
+    im.clip2fmt(:UCHAR).should match_image(@image)
   end
 
   it "should write a csv file with an alternate separator character" do
     @writer.separator = '|'
     @writer.write(@path)
 
     im = VIPS::Image.csv @path, :separator => '|'
-    pending "figure out why a csv image doesn't perfectly match its original"
-    im.should match_image(@image)
+    im.clip2fmt(:UCHAR).should match_image(@image)
   end
 
   it "should create a csv writer" do
diff --git a/spec/vips/morphology_spec.rb b/spec/vips/morphology_spec.rb
@@ -49,13 +49,13 @@
   end
 
   it "should detect the +ve edges of zero crossings of an image" do
-    im = @image.zerox_pos
-    pending "need validation of Image#zerox_pos"
+    im = @binary.zerox_pos
+    im.should match_sha1('b6cf701f906e28948acd8b9c1a6abdb29be111ac')
   end
 
   it "should detect the -ve edges of zero crossings of an image" do
-    im = @image.zerox_neg
-    pending "need validation of Image#zerox_neg"
+    im = @binary.zerox_neg
+    im.should match_sha1('b6cf701f906e28948acd8b9c1a6abdb29be111ac')
   end
 
   it "should find the position of the first non-zero pixel from the top and from the left" do

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ img_data(VALUE obj)`
`345`	`345`	`return( Qnil );`
`346`	`346`
`347`	`347`	`return rb_tainted_str_new((const char *) im->data,`
`348`		`- IM_IMAGE_SIZEOF_IMAGE(im) );`
	`348`	`+ IM_IMAGE_SIZEOF_LINE(im) * im->Ysize);`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`/*`