X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=spec%2Fspec_helper.rb;h=44c1424b10ca5362930b91adf5cf7158f9a5b479;hp=99f59870f8310470a04fee4a3edcc20aaa6d0c90;hb=1156b837ecba6c70557454017ab8eb70d3974bef;hpb=4381b67bbe0fe31047ddebc32c34638a146fdbd8

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 99f5987..44c1424 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -67,7 +67,7 @@ end
 
 def rgb_to_int(rgb)
   # ImageMagick rgb triples are 16 bit
-  (rgb.reverse+"\0").unpack("i")[0]
+  (rgb.reverse+[0]).map {|c| c>>8}.pack("CCCC").unpack("i")[0]
 end
 
 class Pixel
@@ -80,13 +80,13 @@ class Pixel
     color1 == color2 or raise WrongColor.new(self)
   end
   def should_be_brighter_than(pixel)
-    gray1 = @rgb.inject(0) {|sum,e| sum+e[0]}
-    gray2 = pixel.rgb.inject(0) {|sum,e| sum+e[0]}
+    gray1 = @rgb.inject(0) {|sum,e| sum+e}
+    gray2 = pixel.rgb.inject(0) {|sum,e| sum+e}
     gray1 > gray2 or raise PixelError.new(self,"is not brighter than",pixel)
   end
   def should_be_darker_than(pixel)
-    gray1 = @rgb.inject(0) {|sum,e| sum+e[0]}
-    gray2 = pixel.rgb.inject(0) {|sum,e| sum+e[0]}
+    gray1 = @rgb.inject(0) {|sum,e| sum+e}
+    gray2 = pixel.rgb.inject(0) {|sum,e| sum+e}
     gray1 < gray2 or raise PixelError.new(self,"is not less bright than",pixel)
   end
   def should_be_the_same_as(pixel)
@@ -125,7 +125,7 @@ class DocFile
     convert()
     @pngname = @filename.gsub(/.pdf$/i,"")+".png"
     begin
-      output = `swfrender --legacy #{@swfname} -o #{@pngname} 2>&1`
+      output = `swfrender #{@swfname} -o #{@pngname} 2>&1`
       raise ConversionFailed.new(output,@pngname) unless File.exists?(@pngname)
       @img = Magick::Image.read(@pngname).first
     ensure
@@ -162,7 +162,7 @@ class DocFile
   end
   def pixel_at(x,y)
     self.render()
-    data = @img.export_pixels_to_str(x, y, 1, 1, "RGB")
+    data = @img.export_pixels(x, y, 1, 1, "RGB")
     return Pixel.new(x,y,data)
   end
 end