Merge pull request libvips#29 from jechols/fix-tiff-writer

jcupitt · jcupitt · commit b1a3a2c447d5 · 2012-11-07T11:47:17.000-08:00
Fix tiff writer
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,9 @@ ruby-vips-*.gem
 .yardoc
 .*.swp
 tags
+
+# Ignore compiler-generated files
+*.so
+*.o
+/Makefile
+/mkmf.log
diff --git a/lib/vips/writer.rb b/lib/vips/writer.rb
@@ -171,7 +171,7 @@ def compression_str
     end
 
     def layout_str
-      s = @layout
+      s = @layout.to_s
       s << ":#{@tile_size.join 'x'}" if @layout == :tile
       s
     end
diff --git a/spec/vips/writer_spec.rb b/spec/vips/writer_spec.rb
@@ -31,4 +31,10 @@
     @writer.class.should == VIPS::Writer
     @writer.image.should == @image
   end
+
+  it "should write a tiled TIFF" do
+    @tiff_out = tmp('temp.tiff').to_s
+    File.unlink(@tiff_out) if File.exists?(@tiff_out)
+    @image.tiff(@tiff_out, :layout => :tile)
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ def compression_str`
`171`	`171`	`end`
`172`	`172`
`173`	`173`	`def layout_str`
`174`		`- s = @layout`
	`174`	`+ s = @layout.to_s`
`175`	`175`	`s << ":#{@tile_size.join 'x'}" if @layout == :tile`
`176`	`176`	`s`
`177`	`177`	`end`