@@ -13,7 +13,7 @@ module PDF # <tt>:proportional</tt>:: Boolean. Maintain image proportions when scaling. Defaults to false. # <tt>:padding</tt>:: Add some padding between the image and the specified box. # <tt>:center</tt>:: If the image is scaled, it will be centered horizontally and vertically - # <tt>:rotate</tt>:: The desired rotation.One of :counterclockwise, :upsidedown, :clockwise. + # <tt>:rotate</tt>:: The desired rotation. One of :counterclockwise, :upsidedown, :clockwise. # Doesn't work with PNG, PDF or SVG files. # # left and top default to the current cursor location @@ -36,7 +36,7 @@ module PDF when :png then draw_png filename, opts when :svg then draw_svg filename, opts else - draw_pixbuf filename, opts.merge( :rotate => ( opts[:rotate] || :none ) ) + draw_pixbuf filename, opts end end @@ -134,7 +134,9 @@ module PDF load_libpixbuf x, y = current_point pixbuf = Gdk::Pixbuf.new(filename) - pixbuf = pixbuf.rotate( rotation_constant( opts[:rotate] ) ) + if opts[:rotate] + pixbuf = pixbuf.rotate( rotation_constant( opts[:rotate] ) ) + end width, height = calc_image_dimensions(opts[:width], opts[:height], pixbuf.width, pixbuf.height, opts[:proportional]) x, y = calc_image_coords(opts[:left] || x, opts[:top] || y, opts[:width] || pixbuf.width, opts[:height] || pixbuf.height, width, height, opts[:center]) @context.save do lib/pdf/wrapper/images.rb @@ -29,5 +29,13 @@ context "The PDF::Wrapper class" do pdf.calc_image_dimensions(300, 250, 200, 200, true).should eql([250.0,250.0]) end + specify "should be able to draw rotated images correctly" do + pdf = PDF::Wrapper.new + pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :clockwise) + pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :counterclockwise) + pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :upsidedown) + pdf.image(File.dirname(__FILE__) + "/data/shipsail.jpg", :rotate => :none) + end + specify "should be able to draw an image with padding correctly" end specs/image_spec.rb 72c9be536fd52fceb7169f9369f27cf220eed10f James Healy jimmy@deefa.com http://github.com/yob/pdf-wrapper/commit/4f4256b246b5a3028286a48f1dd14bd04c02000a 4f4256b246b5a3028286a48f1dd14bd04c02000a 2008-07-28T00:54:46-07:00 2008-07-28T00:54:11-07:00 tighten image rotation code a little 5ee1718db9f38bd90ebf08e875fbe92b9dfcda5c James Healy jimmy@deefa.com