@@ -87,7 +87,7 @@ module Prawn # find where the image will be placed and how big it will be w,h = calc_image_dimensions(info, options) - + if options[:at] x,y = translate(options[:at]) else @@ -288,6 +288,8 @@ module Prawn w = bh * ip end end + info.scaled_width = w + info.scaled_height = h [w,h] end lib/prawn/images.rb @@ -14,7 +14,8 @@ module Prawn # of a PNG image that we need to embed them in a PDF class JPG attr_reader :width, :height, :bits, :channels - + attr_accessor :scaled_width, :scaled_height + JPEG_SOF_BLOCKS = %W(\xc0 \xc1 \xc2 \xc3 \xc5 \xc6 \xc7 \xc9 \xca \xcb \xcd \xce \xcf) JPEG_APP_BLOCKS = %W(\xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef) lib/prawn/images/jpg.rb @@ -19,7 +19,8 @@ module Prawn attr_reader :width, :height, :bits attr_reader :color_type, :compression_method, :filter_method attr_reader :interlace_method, :alpha_channel - + attr_accessor :scaled_width, :scaled_height + # Process a new PNG image # # <tt>:data</tt>:: A string containing a full PNG file lib/prawn/images/png.rb cd63dfb9424292cc3dcd97dcce0fb55349ce4dc8 Trym Skaar ts@skalar.no http://github.com/sandal/prawn/commit/e020ec959dde98a510d030eea099a40e9819ee0b e020ec959dde98a510d030eea099a40e9819ee0b 2008-10-29T12:01:04-07:00 2008-10-29T12:01:04-07:00 Added scaled_width and scaled_height to info returned by image() method ff54224c321e1d17ff3ee314ceb4376ca6600771 Trym Skaar ts@skalar.no