X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=spec%2Fspec_helper.rb;h=d1c145817379d44c9fb65311e2d533bd5e7898cb;hb=f42e0edd3094808c319a89594ae6f55843a0a3bf;hp=78a25b306893f48dce1ce9f64f6ca770462587c4;hpb=649ac0b90eedb21df0232ca5d0705e006dec511c;p=swftools.git

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 78a25b3..d1c1458 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -75,7 +75,7 @@ class Pixel
 	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_less_bright_than(pixel)
+    def should_be_darker_than(pixel)
 	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)
@@ -96,7 +96,10 @@ class DocFile
 	@swfname = @filename.gsub(/.pdf$/i,"")+".swf"
 	@pngname = @filename.gsub(/.pdf$/i,"")+".png"
 	begin
-	    output = `pdf2swf --flatten -p #{@page} #{@filename} -o #{@swfname} 2>&1`
+	    `pdfinfo #{@filename}` =~ /Page size:\s*([0-9]+) x ([0-9]+) pts/
+	    width,height = $1,$2
+	    dpi = (72.0 * 612 / width.to_i).to_i
+	    output = `pdf2swf -s zoom=#{dpi} --flatten -p #{@page} #{@filename} -o #{@swfname} 2>&1`
 	    raise ConversionFailed.new(output,@swfname) unless File.exists?(@swfname)
 	    output = `swfrender --legacy #{@swfname} -o #{@pngname} 2>&1`
 	    raise ConversionFailed.new(output,@pngname) unless File.exists?(@pngname)