prawn-fast-png 0.1.2 → 0.2.1

data/lib/prawn/images/png_patch.rb

@@ -12,19 +12,30 @@ module Prawn
       def initialize(data) #:nodoc:
         @prawn_fast_png_data = data
         prawn_fast_png_old_initialize(data)
-        @prawn_fast_png_data = nil
       end
 
       private
 
       def unfilter_image_data
         img = Magick::Image.from_blob(@prawn_fast_png_data).first
+        # image blob not needed anymore, let GC take care of it
+        @prawn_fast_png_data = nil
 
         # get only one color value per pixel (Intensity) for grayscale+alpha images
         format = color_type == 4 ? 'I' : 'RGB'
 
-        img_data      = img.export_pixels_to_str(0, 0, width, height, format)
-        alpha_channel = img.export_pixels_to_str(0, 0, width, height, 'A')
+        case bits
+        when 8
+          img_data      = img.export_pixels_to_str(0, 0, width, height, format)
+          alpha_channel = img.export_pixels_to_str(0, 0, width, height, 'A')
+        when 16
+          # export_pixels_to_str returns little-endian data, but we need big-endian
+          # so it's usually more efficient to use export_pixels and pack
+          img_data      = img.export_pixels(0, 0, width, height, format).pack('n*')
+          alpha_channel = img.export_pixels(0, 0, width, height, 'A').pack('n*')
+        else
+          raise Errors::UnsupportedImageType, "Can't handle #{bits}-bit PNG images"
+        end
 
         @img_data      = Zlib::Deflate.deflate(img_data)
         @alpha_channel = Zlib::Deflate.deflate(alpha_channel)
@@ -32,3 +43,4 @@ module Prawn
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-fast-png
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - Wojciech Piekutowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-18 00:00:00 +02:00
+date: 2009-08-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: An extension of Prawn that improves the performance when embedding PNG images containing an alpha channel
+description: "    An extension of Prawn that improves the performance when embedding PNG\n    images containing an alpha channel\n"
 email: wojciech@piekutowski.net
 executables: []
 
@@ -50,6 +50,8 @@ files:
 - COPYING
 has_rdoc: true
 homepage: http://github.com/amberbit/prawn-fast-png
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -74,9 +76,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prawn-fast-png
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An extension of Prawn that improves the performance when embedding PNG images containing an alpha channel
 test_files: []