Fix some bugs and make the example much more awesomer

examples/image.rb

@@ -3,7 +3,12 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require "prawn"
 
-Prawn::Document.generate("image.pdf") do 
-  filename = File.join("#{Prawn::BASEDIR}/data/images/stef.jpg")
-  image filename, :at => [200, 400]
+Prawn::Document.generate("image.pdf", :page_layout => :landscape) do 
+  pigs = "#{Prawn::BASEDIR}/data/images/pigs.jpg" 
+  image pigs, :at => [50,550]                                        
+
+  stef = "#{Prawn::BASEDIR}/data/images/stef.jpg"
+  image stef, :at => [75, 75]
+
+  text "Please enjoy the pigs", :size => 36, :at => [200,15]   
 end

lib/prawn/images.rb

@@ -45,11 +45,12 @@ def image(filename, options={})
       # add a reference to the image object to the current page
       # resource list and give it a label
       label = "I#{next_image_id}"
-      page_xobjects.merge!( label => image_obj )
+      page_xobjects.merge!( label => image_obj )   
 
       # add the image to the current page
       instruct = "\nq\n%.3f 0 0 %.3f %.3f %.3f cm\n/%s Do\nQ"
-      add_content instruct % [ image_info.width, image_info.height, x, y, label ]
+      add_content instruct % [ image_info.width, image_info.height, x, 
+                               y - image_info.height, label ]
     end
 
     private
@@ -59,7 +60,7 @@ def build_jpg_object(info, size)
                 :Subtype    => :Image,
                 :ColorSpace => :DeviceRGB,
                 :Filter     => :DCTDecode,
-                :BitsPerComponent => 8,
+                :BitsPerComponent => info.bits,
                 :Width   => info.width,
                 :Height  => info.height,
                 :Length  => size
@@ -76,13 +77,9 @@ def build_jpg_object(info, size)
       obj
     end
 
-    def image_counter
-      @image_counter ||= 0
-    end
-
     def next_image_id
-      counter = image_counter
-      counter += 1
+      @image_counter ||= 0
+      @image_counter += 1
     end
   end
 end