chunky_png 0.10.5 → 0.11.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chunky_png (0.10.5)
+    chunky_png (0.11.0)
 
 GEM
   remote: http://rubygems.org/

data/benchmarks/filesize_benchmark.rb

@@ -6,7 +6,7 @@ Bundler.setup
 require 'benchmark'
 require 'chunky_png'
 
-files = ['pixelstream_reference.png', 'operations.png', 'gray_10x10.png', 'clock_stubbed.png']
+files = ['pixelstream_reference.png', 'operations.png', 'clock_stubbed.png']
 
 def encode_png(image, constraints = {})
   filesize = nil

data/chunky_png.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "0.10.5"
-  s.date    = "2010-10-22"
+  s.version = "0.11.0"
+  s.date    = "2010-11-01"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT
@@ -38,6 +38,6 @@ Gem::Specification.new do |s|
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(.gitignore BENCHMARKS.rdoc Gemfile Gemfile.lock LICENSE README.rdoc Rakefile benchmarks/decoding_benchmark.rb benchmarks/encoding_benchmark.rb benchmarks/filesize_benchmark.rb chunky_png.gemspec lib/chunky_png.rb lib/chunky_png/canvas.rb lib/chunky_png/canvas/adam7_interlacing.rb lib/chunky_png/canvas/drawing.rb lib/chunky_png/canvas/operations.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/stream_exporting.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/chunk.rb lib/chunky_png/color.rb lib/chunky_png/datastream.rb lib/chunky_png/image.rb lib/chunky_png/palette.rb lib/chunky_png/rmagick.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/resources/16x16_interlaced.png spec/resources/16x16_non_interlaced.png spec/resources/adam7.png spec/resources/clock.png spec/resources/clock_base.png spec/resources/clock_flip_horizontally.png spec/resources/clock_flip_vertically.png spec/resources/clock_mask.png spec/resources/clock_mask_updated.png spec/resources/clock_rotate_180.png spec/resources/clock_rotate_left.png spec/resources/clock_rotate_right.png spec/resources/clock_stubbed.png spec/resources/clock_updated.png spec/resources/composited.png spec/resources/cropped.png spec/resources/damaged_chunk.png spec/resources/damaged_signature.png spec/resources/gray_10x10.png spec/resources/gray_10x10_grayscale.png spec/resources/gray_10x10_grayscale_alpha.png spec/resources/gray_10x10_indexed.png spec/resources/gray_10x10_truecolor.png spec/resources/gray_10x10_truecolor_alpha.png spec/resources/indexed_4bit.png spec/resources/lines.png spec/resources/operations.png spec/resources/pixelstream.rgb spec/resources/pixelstream.rgba spec/resources/pixelstream_best_compression.png spec/resources/pixelstream_fast_rgba.png spec/resources/pixelstream_reference.png spec/resources/rect.png spec/resources/replaced.png spec/resources/text_chunk.png spec/resources/transparent_gray_10x10.png spec/resources/ztxt_chunk.png spec/spec_helper.rb tasks/benchmarks.rake tasks/github-gem.rake)
-  s.test_files = %w(spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb)
+  s.files      = %w(.gitignore BENCHMARKS.rdoc Gemfile Gemfile.lock LICENSE README.rdoc Rakefile benchmarks/decoding_benchmark.rb benchmarks/encoding_benchmark.rb benchmarks/filesize_benchmark.rb chunky_png.gemspec lib/chunky_png.rb lib/chunky_png/canvas.rb lib/chunky_png/canvas/adam7_interlacing.rb lib/chunky_png/canvas/drawing.rb lib/chunky_png/canvas/operations.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/stream_exporting.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/chunk.rb lib/chunky_png/color.rb lib/chunky_png/compatibility.rb lib/chunky_png/datastream.rb lib/chunky_png/image.rb lib/chunky_png/palette.rb lib/chunky_png/rmagick.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/png_suite/background_chunks/bgai4a08.png spec/png_suite/background_chunks/bgai4a16.png spec/png_suite/background_chunks/bgan6a08.png spec/png_suite/background_chunks/bgan6a16.png spec/png_suite/background_chunks/bgbn4a08.png spec/png_suite/background_chunks/bggn4a16.png spec/png_suite/background_chunks/bgwn6a08.png spec/png_suite/background_chunks/bgyn6a16.png spec/png_suite/basic/basi0g01.png spec/png_suite/basic/basi0g01.rgba spec/png_suite/basic/basi0g02.png spec/png_suite/basic/basi0g02.rgba spec/png_suite/basic/basi0g04.png spec/png_suite/basic/basi0g04.rgba spec/png_suite/basic/basi0g08.png spec/png_suite/basic/basi0g08.rgba spec/png_suite/basic/basi0g16.png spec/png_suite/basic/basi0g16.rgba spec/png_suite/basic/basi2c08.png spec/png_suite/basic/basi2c08.rgba spec/png_suite/basic/basi2c16.png spec/png_suite/basic/basi2c16.rgba spec/png_suite/basic/basi3p01.png spec/png_suite/basic/basi3p01.rgba spec/png_suite/basic/basi3p02.png spec/png_suite/basic/basi3p02.rgba spec/png_suite/basic/basi3p04.png spec/png_suite/basic/basi3p04.rgba spec/png_suite/basic/basi3p08.png spec/png_suite/basic/basi3p08.rgba spec/png_suite/basic/basi4a08.png spec/png_suite/basic/basi4a08.rgba spec/png_suite/basic/basi4a16.png spec/png_suite/basic/basi4a16.rgba spec/png_suite/basic/basi6a08.png spec/png_suite/basic/basi6a08.rgba spec/png_suite/basic/basi6a16.png spec/png_suite/basic/basi6a16.rgba spec/png_suite/basic/basn0g01.png spec/png_suite/basic/basn0g01.rgba spec/png_suite/basic/basn0g02.png spec/png_suite/basic/basn0g02.rgba spec/png_suite/basic/basn0g04.png spec/png_suite/basic/basn0g04.rgba spec/png_suite/basic/basn0g08.png spec/png_suite/basic/basn0g08.rgba spec/png_suite/basic/basn0g16.png spec/png_suite/basic/basn0g16.rgba spec/png_suite/basic/basn2c08.png spec/png_suite/basic/basn2c08.rgba spec/png_suite/basic/basn2c16.png spec/png_suite/basic/basn2c16.rgba spec/png_suite/basic/basn3p01.png spec/png_suite/basic/basn3p01.rgba spec/png_suite/basic/basn3p02.png spec/png_suite/basic/basn3p02.rgba spec/png_suite/basic/basn3p04.png spec/png_suite/basic/basn3p04.rgba spec/png_suite/basic/basn3p08.png spec/png_suite/basic/basn3p08.rgba spec/png_suite/basic/basn4a08.png spec/png_suite/basic/basn4a08.rgba spec/png_suite/basic/basn4a16.png spec/png_suite/basic/basn4a16.rgba spec/png_suite/basic/basn6a08.png spec/png_suite/basic/basn6a08.rgba spec/png_suite/basic/basn6a16.png spec/png_suite/basic/basn6a16.rgba spec/png_suite/broken/x00n0g01.png spec/png_suite/broken/xcrn0g04.png spec/png_suite/broken/xlfn0g04.png spec/png_suite/chunk_ordering/oi1n0g16.png spec/png_suite/chunk_ordering/oi1n2c16.png spec/png_suite/chunk_ordering/oi2n0g16.png spec/png_suite/chunk_ordering/oi2n2c16.png spec/png_suite/chunk_ordering/oi4n0g16.png spec/png_suite/chunk_ordering/oi4n2c16.png spec/png_suite/chunk_ordering/oi9n0g16.png spec/png_suite/chunk_ordering/oi9n2c16.png spec/png_suite/compression_levels/z00n2c08.png spec/png_suite/compression_levels/z03n2c08.png spec/png_suite/compression_levels/z06n2c08.png spec/png_suite/compression_levels/z09n2c08.png spec/png_suite/filtering/f00n0g08.png spec/png_suite/filtering/f00n0g08.rgba spec/png_suite/filtering/f00n0g08_reference.png spec/png_suite/filtering/f00n0g08_reference.rgba spec/png_suite/filtering/f00n2c08.png spec/png_suite/filtering/f00n2c08.rgba spec/png_suite/filtering/f00n2c08_reference.png spec/png_suite/filtering/f00n2c08_reference.rgba spec/png_suite/filtering/f01n0g08.png spec/png_suite/filtering/f01n0g08.rgba spec/png_suite/filtering/f01n0g08_reference.png spec/png_suite/filtering/f01n0g08_reference.rgba spec/png_suite/filtering/f01n2c08.png spec/png_suite/filtering/f01n2c08.rgba spec/png_suite/filtering/f01n2c08_reference.png spec/png_suite/filtering/f01n2c08_reference.rgba spec/png_suite/filtering/f02n0g08.png spec/png_suite/filtering/f02n0g08.rgba spec/png_suite/filtering/f02n0g08_reference.png spec/png_suite/filtering/f02n0g08_reference.rgba spec/png_suite/filtering/f02n2c08.png spec/png_suite/filtering/f02n2c08.rgba spec/png_suite/filtering/f02n2c08_reference.png spec/png_suite/filtering/f02n2c08_reference.rgba spec/png_suite/filtering/f03n0g08.png spec/png_suite/filtering/f03n0g08.rgba spec/png_suite/filtering/f03n0g08_reference.png spec/png_suite/filtering/f03n0g08_reference.rgba spec/png_suite/filtering/f03n2c08.png spec/png_suite/filtering/f03n2c08.rgba spec/png_suite/filtering/f03n2c08_reference.png spec/png_suite/filtering/f03n2c08_reference.rgba spec/png_suite/filtering/f04n0g08.png spec/png_suite/filtering/f04n0g08.rgba spec/png_suite/filtering/f04n0g08_reference.png spec/png_suite/filtering/f04n0g08_reference.rgba spec/png_suite/filtering/f04n2c08.png spec/png_suite/filtering/f04n2c08.rgba spec/png_suite/filtering/f04n2c08_reference.png spec/png_suite/filtering/f04n2c08_reference.rgba spec/png_suite/gamma/g03n0g16.png spec/png_suite/gamma/g03n2c08.png spec/png_suite/gamma/g03n3p04.png spec/png_suite/gamma/g04n0g16.png spec/png_suite/gamma/g04n2c08.png spec/png_suite/gamma/g04n3p04.png spec/png_suite/gamma/g05n0g16.png spec/png_suite/gamma/g05n2c08.png spec/png_suite/gamma/g05n3p04.png spec/png_suite/gamma/g07n0g16.png spec/png_suite/gamma/g07n2c08.png spec/png_suite/gamma/g07n3p04.png spec/png_suite/gamma/g10n0g16.png spec/png_suite/gamma/g10n2c08.png spec/png_suite/gamma/g10n3p04.png spec/png_suite/gamma/g25n0g16.png spec/png_suite/gamma/g25n2c08.png spec/png_suite/gamma/g25n3p04.png spec/png_suite/metadata/cm0n0g04.png spec/png_suite/metadata/cm7n0g04.png spec/png_suite/metadata/cm9n0g04.png spec/png_suite/other/ccwn2c08.png spec/png_suite/other/ccwn3p08.png spec/png_suite/other/cdfn2c08.png spec/png_suite/other/cdhn2c08.png spec/png_suite/other/cdsn2c08.png spec/png_suite/other/cdun2c08.png spec/png_suite/other/ch1n3p04.png spec/png_suite/other/ch2n3p08.png spec/png_suite/other/cs3n2c16.png spec/png_suite/other/cs3n3p08.png spec/png_suite/other/cs5n2c08.png spec/png_suite/other/cs5n3p08.png spec/png_suite/other/cs8n2c08.png spec/png_suite/other/cs8n3p08.png spec/png_suite/other/ct0n0g04.png spec/png_suite/other/ct1n0g04.png spec/png_suite/other/ctzn0g04.png spec/png_suite/other/pp0n2c16.png spec/png_suite/other/pp0n6a08.png spec/png_suite/other/ps1n0g08.png spec/png_suite/other/ps1n2c16.png spec/png_suite/other/ps2n0g08.png spec/png_suite/other/ps2n2c16.png spec/png_suite/sizes/s01i3p01.png spec/png_suite/sizes/s01n3p01.png spec/png_suite/sizes/s02i3p01.png spec/png_suite/sizes/s02n3p01.png spec/png_suite/sizes/s03i3p01.png spec/png_suite/sizes/s03n3p01.png spec/png_suite/sizes/s04i3p01.png spec/png_suite/sizes/s04n3p01.png spec/png_suite/sizes/s05i3p02.png spec/png_suite/sizes/s05n3p02.png spec/png_suite/sizes/s06i3p02.png spec/png_suite/sizes/s06n3p02.png spec/png_suite/sizes/s07i3p02.png spec/png_suite/sizes/s07n3p02.png spec/png_suite/sizes/s08i3p02.png spec/png_suite/sizes/s08n3p02.png spec/png_suite/sizes/s09i3p02.png spec/png_suite/sizes/s09n3p02.png spec/png_suite/sizes/s32i3p04.png spec/png_suite/sizes/s32n3p04.png spec/png_suite/sizes/s33i3p04.png spec/png_suite/sizes/s33n3p04.png spec/png_suite/sizes/s34i3p04.png spec/png_suite/sizes/s34n3p04.png spec/png_suite/sizes/s35i3p04.png spec/png_suite/sizes/s35n3p04.png spec/png_suite/sizes/s36i3p04.png spec/png_suite/sizes/s36n3p04.png spec/png_suite/sizes/s37i3p04.png spec/png_suite/sizes/s37n3p04.png spec/png_suite/sizes/s38i3p04.png spec/png_suite/sizes/s38n3p04.png spec/png_suite/sizes/s39i3p04.png spec/png_suite/sizes/s39n3p04.png spec/png_suite/sizes/s40i3p04.png spec/png_suite/sizes/s40n3p04.png spec/png_suite/transparency/tbbn1g04.png spec/png_suite/transparency/tbbn2c16.png spec/png_suite/transparency/tbbn3p08.png spec/png_suite/transparency/tbgn2c16.png spec/png_suite/transparency/tbgn3p08.png spec/png_suite/transparency/tbrn2c08.png spec/png_suite/transparency/tbwn1g16.png spec/png_suite/transparency/tbwn3p08.png spec/png_suite/transparency/tbyn3p08.png spec/png_suite/transparency/tp0n1g08.png spec/png_suite/transparency/tp0n2c08.png spec/png_suite/transparency/tp0n3p08.png spec/png_suite/transparency/tp1n3p08.png spec/png_suite_spec.rb spec/resources/adam7.png spec/resources/clock.png spec/resources/clock_base.png spec/resources/clock_flip_horizontally.png spec/resources/clock_flip_vertically.png spec/resources/clock_mask.png spec/resources/clock_mask_updated.png spec/resources/clock_rotate_180.png spec/resources/clock_rotate_left.png spec/resources/clock_rotate_right.png spec/resources/clock_stubbed.png spec/resources/clock_updated.png spec/resources/composited.png spec/resources/cropped.png spec/resources/damaged_chunk.png spec/resources/damaged_signature.png spec/resources/lines.png spec/resources/operations.png spec/resources/pixelstream.rgb spec/resources/pixelstream.rgba spec/resources/pixelstream_best_compression.png spec/resources/pixelstream_fast_rgba.png spec/resources/pixelstream_reference.png spec/resources/rect.png spec/resources/replaced.png spec/resources/text_chunk.png spec/resources/ztxt_chunk.png spec/spec_helper.rb tasks/benchmarks.rake tasks/github-gem.rake)
+  s.test_files = %w(spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/png_suite_spec.rb)
 end

data/lib/chunky_png.rb

@@ -3,6 +3,7 @@ require 'zlib'
 require 'stringio'
 require 'enumerator'
 
+require 'chunky_png/compatibility'
 require 'chunky_png/datastream'
 require 'chunky_png/chunk'
 require 'chunky_png/palette'
@@ -27,7 +28,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated automatically
   # by them gem:release rake task.
-  VERSION = "0.10.5"
+  VERSION = "0.11.0"
 
   ###################################################
   # PNG international standard defined constants
@@ -81,14 +82,6 @@ module ChunkyPNG
   class OutOfBounds < ChunkyPNG::ExpectationFailed
   end
   
-  EMPTY_BYTEARRAY = (RUBY_VERSION.to_f < 1.9) ? "".freeze : "".force_encoding('ASCII-8BIT').freeze
-  EXTRA_BYTE      = (RUBY_VERSION.to_f < 1.9) ? "\0" : "\0".force_encoding('ASCII-8BIT')
-end
-
-if RUBY_VERSION.to_f < 1.9
-  class String
-    alias_method :getbyte, :[]
-    alias_method :setbyte, :[]=
-    alias_method :bytesize, :size
-  end
+  EMPTY_BYTEARRAY = String.method_defined?(:force_encoding) ? "".force_encoding('ASCII-8BIT').freeze : "".freeze
+  EXTRA_BYTE      = String.method_defined?(:force_encoding) ? "\0".force_encoding('ASCII-8BIT') : "\0"
 end

data/lib/chunky_png/canvas.rb

@@ -215,15 +215,14 @@ module ChunkyPNG
       ChunkyPNG::Image.from_canvas(self)
     end
     
-    #################################################################
-    # RUBY 1.8.6 compatibility
-    #################################################################
-    
-    unless respond_to?(:tap)
-      def tap(&block)
-        yield(self)
-        self
+    # Alternative implementation of the inspect method.
+    # @return [String] A nicely formatted string representation of this canvas.
+    def inspect
+      inspected = "<#{self.class.name} #{width}x#{height} ["
+      for y in 0...height
+        inspected << "\n\t[" << row(y).map { |p| ChunkyPNG::Color.to_hex(p) }.join(' ') << ']'
       end
+      inspected << "\n]>"
     end
     
     protected

data/lib/chunky_png/canvas/adam7_interlacing.rb

@@ -1,47 +1,65 @@
 module ChunkyPNG
   class Canvas
     
-    # Methods for decoding and encoding adam7 interlacing
+    # Methods for decoding and encoding Adam7 interlacing.
     #
+    # Adam7 interlacing extractg 7 pass images out of a single image, that can be encoded to a 
+    # stream separately so the image can be built up progressively. The module is included into
+    # ChunkyPNG canvas and is used to extract the pass images from the original image, or to
+    # reconstruct an original image from separate pass images.
     module Adam7Interlacing
       
+      # Returns an array with the x-shift, x-offset, y-shift and y-offset for the requested pass.
+      # @param [Integer] pass The pass number, should be in 0..6.
       def adam7_multiplier_offset(pass)
-        {
-          :x_shift      => 3 - (pass >> 1), 
-          :x_offset     => (pass & 1 == 0) ? 0 : 8 >> ((pass + 1) >> 1),
-          :y_shift      => pass == 0 ? 3 : 3 - ((pass - 1) >> 1),
-          :y_offset     => (pass == 0 || pass & 1 == 1) ? 0 : 8 >> (pass >> 1)
-        }
+        [3 - (pass >> 1), (pass & 1 == 0) ? 0 : 8 >> ((pass + 1) >> 1),
+         pass == 0 ? 3 : 3 - ((pass - 1) >> 1), (pass == 0 || pass & 1 == 1) ? 0 : 8 >> (pass >> 1)]
       end
 
+      # Returns the pixel dimensions of the requested pass.
+      # @param [Integer] pass The pass number, should be in 0..6.
+      # @param [Integer] original_width The width of the original image.
+      # @param [Integer] original_height The height of the original image.
       def adam7_pass_size(pass, original_width, original_height)
-        m_o = adam7_multiplier_offset(pass)
-        [ (original_width  - m_o[:x_offset] + (1 << m_o[:x_shift]) - 1) >> m_o[:x_shift],
-          (original_height - m_o[:y_offset] + (1 << m_o[:y_shift]) - 1) >> m_o[:y_shift]]
+        x_shift, x_offset, y_shift, y_offset = adam7_multiplier_offset(pass)
+        [ (original_width  - x_offset + (1 << x_shift) - 1) >> x_shift,
+          (original_height - y_offset + (1 << y_shift) - 1) >> y_shift]
       end
-
+      
+      # Returns an array of the dimension of all the pass images.
+      # @param [Integer] original_width The width of the original image.
+      # @param [Integer] original_height The height of the original image.
+      # @return [Array<Array<Integer>>] Returns an array with 7 pairs of dimensions.
+      # @see #adam7_pass_size
       def adam7_pass_sizes(original_width, original_height)
         (0...7).map { |pass| adam7_pass_size(pass, original_width, original_height) }
       end
 
+      # Merges a pass image into a total image that is being constructed.
+      # @param [Integer] pass The pass number, should be in 0..6.
+      # @param [ChunkyPNG::Canvas] canvas The image that is being constructed.
+      # @param [ChunkyPNG::Canvas] subcanvas The pass image that should be merged
       def adam7_merge_pass(pass, canvas, subcanvas)
-        m_o = adam7_multiplier_offset(pass)
+        x_shift, x_offset, y_shift, y_offset = adam7_multiplier_offset(pass)
         for y in 0...subcanvas.height do
           for x in 0...subcanvas.width do
-            new_x = (x << m_o[:x_shift]) | m_o[:x_offset]
-            new_y = (y << m_o[:y_shift]) | m_o[:y_offset]
+            new_x = (x << x_shift) | x_offset
+            new_y = (y << y_shift) | y_offset
             canvas[new_x, new_y] = subcanvas[x, y]
           end
         end
-        canvas
       end
       
+      # Extracts a pass from a complete image
+      # @param [Integer] pass The pass number, should be in 0..6.
+      # @param [ChunkyPNG::Canvas] canvas The image that is being deconstructed.
+      # @return [ChunkyPNG::Canvas] The extracted pass image.
       def adam7_extract_pass(pass, canvas)
-        m_o = adam7_multiplier_offset(pass)
+        x_shift, x_offset, y_shift, y_offset = adam7_multiplier_offset(pass)
         sm_pixels = []
         
-        m_o[:y_offset].step(canvas.height - 1, 1 << m_o[:y_shift]) do |y|
-          m_o[:x_offset].step(canvas.width - 1, 1 << m_o[:x_shift]) do |x|
+        y_offset.step(canvas.height - 1, 1 << y_shift) do |y|
+          x_offset.step(canvas.width - 1, 1 << x_shift) do |x|
             sm_pixels << canvas[x, y]
           end
         end

data/lib/chunky_png/canvas/png_decoding.rb

@@ -63,17 +63,16 @@ module ChunkyPNG
       # @param [ChunkyPNG::Datastream] ds The datastream to decode.
       # @return [ChunkyPNG::Canvas] The canvas decoded from the PNG datastream.
       def from_datastream(ds)
-        raise ChunkyPNG::NotSupported, "Only 8-bit color depth is currently supported by ChunkyPNG!" unless ds.header_chunk.depth == 8
+        # raise ChunkyPNG::NotSupported, "Only 8-bit color depth is currently supported by ChunkyPNG!" unless ds.header_chunk.depth == 8
 
         width      = ds.header_chunk.width
         height     = ds.header_chunk.height
         color_mode = ds.header_chunk.color
         interlace  = ds.header_chunk.interlace
+        depth      = ds.header_chunk.depth
 
         self.decoding_palette = ChunkyPNG::Palette.from_chunks(ds.palette_chunk, ds.transparency_chunk)
-        pixelstream           = ChunkyPNG::Chunk::ImageData.combine_chunks(ds.data_chunks)
-
-        decode_png_pixelstream(pixelstream, width, height, color_mode, interlace)
+        decode_png_pixelstream(ds.imagedata, width, height, color_mode, depth, interlace)
       end
 
       # Decodes a canvas from a PNG encoded pixelstream, using a given width, height, 
@@ -82,14 +81,14 @@ module ChunkyPNG
       # @param [Integer] width The width of the image.
       # @param [Integer] width The height of the image.
       # @param [Integer] color_mode The color mode of the encoded pixelstream.
+      # @param [Integer] depth The bit depth of the pixel samples.
       # @param [Integer] interlace The interlace method of the encoded pixelstream.
       # @return [ChunkyPNG::Canvas] The decoded Canvas instance.
-      def decode_png_pixelstream(stream, width, height, color_mode = ChunkyPNG::COLOR_TRUECOLOR, interlace = ChunkyPNG::INTERLACING_NONE)
+      def decode_png_pixelstream(stream, width, height, color_mode, depth, interlace)
         raise ChunkyPNG::ExpectationFailed, "This palette is not suitable for decoding!" if decoding_palette && !decoding_palette.can_decode?
-
-        return case interlace
-          when ChunkyPNG::INTERLACING_NONE;  decode_png_without_interlacing(stream, width, height, color_mode)
-          when ChunkyPNG::INTERLACING_ADAM7; decode_png_with_adam7_interlacing(stream, width, height, color_mode)
+        case interlace
+          when ChunkyPNG::INTERLACING_NONE;  decode_png_without_interlacing(stream, width, height, color_mode, depth)
+          when ChunkyPNG::INTERLACING_ADAM7; decode_png_with_adam7_interlacing(stream, width, height, color_mode, depth)
           else raise ChunkyPNG::NotSupported, "Don't know how the handle interlacing method #{interlace}!"
         end
       end
@@ -102,9 +101,10 @@ module ChunkyPNG
       # @param width (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @param height (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @param color_mode (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
+      # @param depth (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @return (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
-      def decode_png_without_interlacing(stream, width, height, color_mode)
-        decode_png_image_pass(stream, width, height, color_mode, 0)
+      def decode_png_without_interlacing(stream, width, height, color_mode, depth)
+        decode_png_image_pass(stream, width, height, color_mode, depth, 0)
       end
 
       # Decodes a canvas from a Adam 7 interlaced PNG encoded pixelstream, using a 
@@ -113,19 +113,249 @@ module ChunkyPNG
       # @param width (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @param height (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @param color_mode (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
+      # @param depth (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @return (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
-      def decode_png_with_adam7_interlacing(stream, width, height, color_mode)
-        canvas     = new(width, height)
-        pixel_size = Color.bytesize(color_mode)
-        start_pos  = 0
-        for pass in 0...7 do
+      def decode_png_with_adam7_interlacing(stream, width, height, color_mode, depth)
+        canvas = new(width, height)
+        start_pos = 0
+        for pass in 0...7
           sm_width, sm_height = adam7_pass_size(pass, width, height)
-          sm = decode_png_image_pass(stream, sm_width, sm_height, color_mode, start_pos)
+          sm = decode_png_image_pass(stream, sm_width, sm_height, color_mode, depth, start_pos)
           adam7_merge_pass(pass, canvas, sm)
-          start_pos += (sm_width * sm_height * pixel_size) + sm_height
+          start_pos += ChunkyPNG::Color.pass_bytesize(color_mode, depth, sm_width, sm_height)
         end
         canvas
       end
+      
+      # Extract 4 consecutive bits from a byte.
+      # @param [Integer] byte The byte (0..255) value to extract a 4 bit value from.
+      # @param [Integer] index The index within the byte. This should be either 0 or 2; 
+      #        the value will be modded by 2 to enforce this.
+      # @return [Integer] The extracted 4bit value (0..15)
+      def decode_png_extract_4bit_value(byte, index)
+        (index & 0x01 == 0) ? ((byte & 0xf0) >> 4) : (byte & 0x0f)
+      end
+      
+      # Extract 2 consecutive bits from a byte.
+      # @param [Integer] byte The byte (0..255) value to extract a 2 bit value from.
+      # @param [Integer] index The index within the byte. This should be either 0, 1, 2, or 3; 
+      #        the value will be modded by 4 to enforce this.
+      # @return [Integer] The extracted 2 bit value (0..3)
+      def decode_png_extract_2bit_value(byte, index)
+        bitshift = 6 - ((index & 0x03) << 1)
+        (byte & (0x03 << bitshift)) >> bitshift
+      end
+
+      # Extract a bit from a byte on a given index.
+      # @param [Integer] byte The byte (0..255) value to extract a a bit from.
+      # @param [Integer] index The index within the byte. This should be 0..7; 
+      #        the value will be modded by 8 to enforce this.
+      # @return [Integer] Either 1 or 0.
+      def decode_png_extract_1bit_value(byte, index)
+        bitshift = 7 - (index & 0x07)
+        (byte & (0x01 << bitshift)) >> bitshift
+      end
+      
+      # Resamples a 16 bit value to an 8 bit value. This will discard some color information.
+      # @param [Integer] value The 16 bit value to resample.
+      # @return [Integer] The 8 bit resampled value
+      def decode_png_resample_16bit_value(value)
+        value >> 8
+      end
+      
+      # Resamples a 4 bit value to an 8 bit value.
+      # @param [Integer] value The 4 bit value to resample.
+      # @return [Integer] The 8 bit resampled value.
+      def decode_png_resample_4bit_value(value)
+        case value
+        when 0x00; 0
+        when 0x01; 17
+        when 0x02; 34
+        when 0x03; 51
+        when 0x04; 68
+        when 0x05; 85
+        when 0x06; 102
+        when 0x07; 119
+        when 0x08; 137
+        when 0x09; 154
+        when 0x0a; 171
+        when 0x0b; 188
+        when 0x0c; 205
+        when 0x0d; 222
+        when 0x0e; 239
+        when 0x0f; 255
+        end
+      end
+      
+      # Resamples a 2 bit value to an 8 bit value.
+      # @param [Integer] value The 2 bit value to resample.
+      # @return [Integer] The 8 bit resampled value.
+      def decode_png_resample_2bit_value(value)
+        case value
+        when 0x00; 0x00
+        when 0x01; 0x55
+        when 0x02; 0xaa
+        when 0x03; 0xff
+        end
+      end
+
+      # Decodes a scanline of a 1-bit, indexed image into a row of pixels.
+      # @param [String] stream The stream to decode from.
+      # @param [Integer] pos The position in the stream on qhich the scanline starts (including the filter byte).
+      # @param [Integer] width The width in pixels of the scanline.
+      # @return [Array<Integer>] An array of decoded pixels.
+      def decode_png_pixels_from_scanline_indexed_1bit(stream, pos, width)
+        (0...width).map do |index|
+          palette_pos = decode_png_extract_1bit_value(stream.getbyte(pos + 1 + (index >> 3)), index) 
+          decoding_palette[palette_pos]
+        end
+      end
+
+      # Decodes a scanline of a 2-bit, indexed image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_indexed_2bit(stream, pos, width)
+        (0...width).map do |index|
+          palette_pos = decode_png_extract_2bit_value(stream.getbyte(pos + 1 + (index >> 2)), index)
+          decoding_palette[palette_pos]
+        end
+      end
+
+      # Decodes a scanline of a 4-bit, indexed image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_indexed_4bit(stream, pos, width)
+        (0...width).map do |index|
+          palette_pos = decode_png_extract_4bit_value(stream.getbyte(pos + 1 + (index >> 1)), index)
+          decoding_palette[palette_pos]
+        end
+      end
+
+      # Decodes a scanline of a 8-bit, indexed image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_indexed_8bit(stream, pos, width)
+        (1..width).map { |i| decoding_palette[stream.getbyte(pos + i)] }
+      end
+
+      # Decodes a scanline of an 8-bit, true color image with transparency into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_truecolor_alpha_8bit(stream, pos, width)
+        stream.unpack("@#{pos + 1}N#{width}")
+      end
+
+      # Decodes a scanline of a 16-bit, true color image with transparency into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_truecolor_alpha_16bit(stream, pos, width)
+        [].tap do |pixels|
+          stream.unpack("@#{pos + 1}n#{width * 4}").each_slice(4) do |r, g, b, a|
+            pixels << ChunkyPNG::Color.rgba(decode_png_resample_16bit_value(r), decode_png_resample_16bit_value(g),
+                                            decode_png_resample_16bit_value(b), decode_png_resample_16bit_value(a))
+          end
+        end
+      end
+      
+      # Decodes a scanline of an 8-bit, true color image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_truecolor_8bit(stream, pos, width)
+        stream.unpack("@#{pos + 1}" << ('NX' * width)).map { |c| c | 0x000000ff }
+      end
+      
+      # Decodes a scanline of a 16-bit, true color image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_truecolor_16bit(stream, pos, width)
+        [].tap do |pixels|
+          stream.unpack("@#{pos + 1}n#{width * 3}").each_slice(3) do |r, g, b|
+            pixels << ChunkyPNG::Color.rgb(decode_png_resample_16bit_value(r), decode_png_resample_16bit_value(g), decode_png_resample_16bit_value(b))
+          end
+        end
+      end
+
+      # Decodes a scanline of an 8-bit, grayscale image with transparency into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_alpha_8bit(stream, pos, width)
+        (0...width).map { |i| ChunkyPNG::Color.grayscale_alpha(stream.getbyte(pos + (i * 2) + 1), stream.getbyte(pos + (i * 2) + 2)) }
+      end
+      
+      # Decodes a scanline of a 16-bit, grayscale image with transparency into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_alpha_16bit(stream, pos, width)
+        [].tap do |pixels|
+          stream.unpack("@#{pos + 1}n#{width * 2}").each_slice(2) do |g, a|
+            pixels << ChunkyPNG::Color.grayscale_alpha(decode_png_resample_16bit_value(g), decode_png_resample_16bit_value(a))
+          end
+        end
+      end
+
+      # Decodes a scanline of a 1-bit, grayscale image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_1bit(stream, pos, width)
+        (0...width).map do |index|
+          value = decode_png_extract_1bit_value(stream.getbyte(pos + 1 + (index >> 3)), index)
+          value == 1 ? ChunkyPNG::Color::WHITE : ChunkyPNG::Color::BLACK
+        end
+      end
+
+      # Decodes a scanline of a 2-bit, grayscale image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_2bit(stream, pos, width)
+        (0...width).map do |index|
+          value = decode_png_extract_2bit_value(stream.getbyte(pos + 1 + (index >> 2)), index)
+          ChunkyPNG::Color.grayscale(decode_png_resample_2bit_value(value))
+        end
+      end
+
+      # Decodes a scanline of a 4-bit, grayscale image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_4bit(stream, pos, width)
+        (0...width).map do |index|
+          value = decode_png_extract_4bit_value(stream.getbyte(pos + 1 + (index >> 1)), index)
+          ChunkyPNG::Color.grayscale(decode_png_resample_4bit_value(value))
+        end
+      end
+      
+      # Decodes a scanline of an 8-bit, grayscale image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_8bit(stream, pos, width)
+        (1..width).map { |i| ChunkyPNG::Color.grayscale(stream.getbyte(pos + i)) }
+      end
+      
+      # Decodes a scanline of a 16-bit, grayscale image into a row of pixels.
+      # @params (see #decode_png_pixels_from_scanline_indexed_1bit)
+      # @return (see #decode_png_pixels_from_scanline_indexed_1bit)
+      def decode_png_pixels_from_scanline_grayscale_16bit(stream, pos, width)
+        values = stream.unpack("@#{pos + 1}n#{width}")
+        values.map { |value| ChunkyPNG::Color.grayscale(decode_png_resample_16bit_value(value)) }
+      end
+      
+      # Returns the method name to use to decode scanlines into pixels.
+      # @param [Integer] color_mode The color mode of the image.
+      # @param [Integer] depth The bit depth of the image.
+      # @return [Symbol] The method name to use for decoding, to be called on the canvas class.
+      # @raise [ChunkyPNG::NotSupported] when the color_mode and/or bit depth is not supported.
+      def decode_png_pixels_from_scanline_method(color_mode, depth)
+        decoder_method = case color_mode
+          when ChunkyPNG::COLOR_TRUECOLOR;       :"decode_png_pixels_from_scanline_truecolor_#{depth}bit"
+          when ChunkyPNG::COLOR_TRUECOLOR_ALPHA; :"decode_png_pixels_from_scanline_truecolor_alpha_#{depth}bit"
+          when ChunkyPNG::COLOR_INDEXED;         :"decode_png_pixels_from_scanline_indexed_#{depth}bit"
+          when ChunkyPNG::COLOR_GRAYSCALE;       :"decode_png_pixels_from_scanline_grayscale_#{depth}bit"
+          when ChunkyPNG::COLOR_GRAYSCALE_ALPHA; :"decode_png_pixels_from_scanline_grayscale_alpha_#{depth}bit"
+          else nil
+        end
+        
+        raise ChunkyPNG::NotSupported, "No decoder found for color mode #{color_mode} and #{depth}-bit depth!" unless respond_to?(decoder_method)
+        decoder_method
+      end
 
       # Decodes a single PNG image pass width a given width, height and color 
       # mode, to a Canvas, starting at the given position in the stream.
@@ -139,36 +369,28 @@ module ChunkyPNG
       # @param color_mode (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
       # @param [Integer] start_pos The position in the pixel stream to start reading.
       # @return (see ChunkyPNG::Canvas::PNGDecoding#decode_png_pixelstream)
-      def decode_png_image_pass(stream, width, height, color_mode, start_pos)
-        stream << ChunkyPNG::EXTRA_BYTE if color_mode == ChunkyPNG::COLOR_TRUECOLOR
-        pixel_size    = Color.bytesize(color_mode)
-        pixel_decoder = case color_mode
-          when ChunkyPNG::COLOR_TRUECOLOR;       lambda { |s, pos| s.unpack("@#{pos + 1}" << ('NX' * width)).map { |c| c | 0x000000ff } }
-          when ChunkyPNG::COLOR_TRUECOLOR_ALPHA; lambda { |s, pos| s.unpack("@#{pos + 1}N#{width}") }
-          when ChunkyPNG::COLOR_INDEXED;         lambda { |s, pos| (1..width).map { |i| decoding_palette[s.getbyte(pos + i)] } }
-          when ChunkyPNG::COLOR_GRAYSCALE;       lambda { |s, pos| (1..width).map { |i| ChunkyPNG::Color.grayscale(s.getbyte(pos + i)) } }
-          when ChunkyPNG::COLOR_GRAYSCALE_ALPHA; lambda { |s, pos| (0...width).map { |i| ChunkyPNG::Color.grayscale_alpha(s.getbyte(pos + (i * 2) + 1), s.getbyte(pos + (i * 2) + 2)) } }
-          else raise ChunkyPNG::NotSupported, "No suitable pixel decoder found for color mode #{color_mode}!"
-        end
+      def decode_png_image_pass(stream, width, height, color_mode, depth, start_pos)
         
         pixels = []
-        if width > 0
+        if width > 0 && height > 0
           
-          raise ChunkyPNG::ExpectationFailed, "Invalid stream length!" unless stream.length - start_pos >= width * height * pixel_size + height
+          stream << ChunkyPNG::EXTRA_BYTE if color_mode == ChunkyPNG::COLOR_TRUECOLOR
+          pixel_decoder = decode_png_pixels_from_scanline_method(color_mode, depth)
+          line_length   = ChunkyPNG::Color.scanline_bytesize(color_mode, depth, width)
+          pixel_size    = ChunkyPNG::Color.pixel_bytesize(color_mode, depth)
           
-          decoded_bytes = Array.new(width * pixel_size, 0)
-          line_length    = width * pixel_size
-          pos, prev_pos  = start_pos, nil
+          raise ChunkyPNG::ExpectationFailed, "Invalid stream length!" unless stream.bytesize - start_pos >= ChunkyPNG::Color.pass_bytesize(color_mode, depth, width, height)
 
+          pos, prev_pos = start_pos, nil
           for line_no in 0...height do
             decode_png_str_scanline(stream, pos, prev_pos, line_length, pixel_size)
-            pixels += pixel_decoder.call(stream, pos)
+            pixels += send(pixel_decoder, stream, pos, width)
 
             prev_pos = pos
             pos += line_length + 1
           end
         end
-        
+
         new(width, height, pixels)
       end