chunky_png 0.5.0 → 0.5.1

data/chunky_png.gemspec

@@ -3,7 +3,7 @@ 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.5.0"
+  s.version = "0.5.1"
   s.date    = "2010-01-16"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"

data/lib/chunky_png.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'zlib'
+require 'stringio'
 
 require 'chunky_png/datastream'
 require 'chunky_png/chunk'
@@ -21,7 +22,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated automatically
   # by them gem:release rake task.
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 
   ###################################################
   # PNG international standard defined constants

data/lib/chunky_png/canvas.rb

@@ -54,7 +54,7 @@ module ChunkyPNG
       if initial.kind_of?(Fixnum)
         @pixels = Array.new(width * height, initial)
       elsif initial.kind_of?(Array) && initial.size == width * height
-        @pixels = initial.map(&:to_i)
+        @pixels = initial
       else
         raise "Cannot use this value as initial canvas: #{initial.inspect}!"
       end

data/lib/chunky_png/canvas/operations.rb

@@ -4,8 +4,8 @@ module ChunkyPNG
       def compose(new_foreground, dx = 0, dy = 0)
         check_size_constraints!(new_foreground, dx, dy)
 
-        new_foreground.height.times do |y|
-          new_foreground.width.times do |x|
+        for y in 0...new_foreground.height do
+          for x in 0...new_foreground.width do
             self[x+dx, y+dy] = ChunkyPNG::Color.compose(new_foreground[x, y], self[x+dx, y+dy])
           end
         end
@@ -15,7 +15,7 @@ module ChunkyPNG
       def replace(other, offset_x = 0, offset_y = 0)
         check_size_constraints!(other, offset_x, offset_y)
 
-        other.height.times do |y|
+        for y in 0...other.height do
           pixels[(y + offset_y) * width + offset_x, other.width] = other.pixels[y * other.width, other.width]
         end
         self
@@ -23,7 +23,7 @@ module ChunkyPNG
 
       def crop(x, y, crop_width, crop_height)
         new_pixels = []
-        crop_height.times do |cy|
+        for cy in 0...crop_height do
           new_pixels += pixels.slice((cy + y) * width + x, crop_width)
         end
         ChunkyPNG::Canvas.new(crop_width, crop_height, new_pixels)

data/lib/chunky_png/canvas/png_decoding.rb

@@ -58,7 +58,7 @@ module ChunkyPNG
 
         if width > 0
           decoded_bytes = Array.new(width * pixel_size, 0)
-          height.times do |line_no|
+          for line_no in 0...height do
 
             # get bytes of scanline
             position       = start_pos + line_no * (width * pixel_size + 1)

data/lib/chunky_png/canvas/png_encoding.rb

@@ -5,6 +5,11 @@ module ChunkyPNG
     #
     module PNGEncoding
 
+      TRUECOLOR_ENCODER       = lambda { |color| Color.to_truecolor_bytes(color) }
+      TRUECOLOR_ALPHA_ENCODER = lambda { |color| Color.to_truecolor_alpha_bytes(color) }
+      GRAYSCALE_ENCODER       = lambda { |color| Color.to_grayscale_bytes(color) }
+      GRAYSCALE_ALPHA_ENCODER = lambda { |color| Color.to_grayscale_alpha_bytes(color) }
+      
       def write(io, constraints = {})
         to_datastream(constraints).write(io)
       end
@@ -50,9 +55,22 @@ module ChunkyPNG
       end
 
       def determine_png_encoding(constraints = {})
-        encoding = constraints
-        encoding[:palette]    ||= palette
-        encoding[:color_mode] ||= encoding[:palette].best_colormode
+        
+        if constraints == :fast_rgb
+          encoding = { :color_mode => ChunkyPNG::COLOR_TRUECOLOR }
+        elsif constraints == :fast_rgba
+          encoding = { :color_mode => ChunkyPNG::COLOR_TRUECOLOR_ALPHA }
+        else
+          encoding = constraints
+        end
+        
+        # Do not create a pallete when the encoding is given and does not require a palette.
+        if encoding[:color_mode]
+          encoding[:palette]    ||= palette if encoding[:color_mode] == ChunkyPNG::COLOR_INDEXED
+        else
+          encoding[:palette]    ||= palette
+          encoding[:color_mode] ||= encoding[:palette].best_colormode
+        end
         
         encoding[:interlace] = case encoding[:interlace]
           when nil, false, ChunkyPNG::INTERLACING_NONE then ChunkyPNG::INTERLACING_NONE
@@ -71,11 +89,11 @@ module ChunkyPNG
 
         pixel_size = Color.bytesize(color_mode)
         pixel_encoder = case color_mode
-          when ChunkyPNG::COLOR_TRUECOLOR       then lambda { |color| Color.to_truecolor_bytes(color) }
-          when ChunkyPNG::COLOR_TRUECOLOR_ALPHA then lambda { |color| Color.to_truecolor_alpha_bytes(color) }
+          when ChunkyPNG::COLOR_TRUECOLOR       then TRUECOLOR_ENCODER
+          when ChunkyPNG::COLOR_TRUECOLOR_ALPHA then TRUECOLOR_ALPHA_ENCODER
+          when ChunkyPNG::COLOR_GRAYSCALE       then GRAYSCALE_ENCODER
+          when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then GRAYSCALE_ALPHA_ENCODER
           when ChunkyPNG::COLOR_INDEXED         then lambda { |color| [palette.index(color)] }
-          when ChunkyPNG::COLOR_GRAYSCALE       then lambda { |color| Color.to_grayscale_bytes(color) }
-          when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then lambda { |color| Color.to_grayscale_alpha_bytes(color) }
           else raise "Cannot encode pixels for this mode: #{color_mode}!"
         end
 
@@ -102,19 +120,27 @@ module ChunkyPNG
       end
       
       def encode_png_image_pass_to_stream(stream, pixel_size, pixel_encoder)
-        previous_bytes = Array.new(pixel_size * width, 0)
-        each_scanline do |line|
-          unencoded_bytes = line.map(&pixel_encoder).flatten
-          stream << encode_png_scanline_up(unencoded_bytes, previous_bytes, pixel_size).pack('C*')
-          previous_bytes = unencoded_bytes
-        end
+        case pixel_encoder
+          when TRUECOLOR_ALPHA_ENCODER
+            stream << pixels.pack("xN#{width}" * height)
+          when TRUECOLOR_ENCODER 
+            line_packer = 'x' + ('NX' * width)
+            stream << pixels.pack(line_packer * height)
+          else
+            previous_bytes = Array.new(pixel_size * width, 0)
+            each_scanline do |line|
+              unencoded_bytes = line.map(&pixel_encoder).flatten
+              stream << encode_png_scanline_up(unencoded_bytes, previous_bytes, pixel_size).pack('C*')
+              previous_bytes = unencoded_bytes
+            end
+          end
       end
 
       # Passes to this canvas of pixel values line by line.
       # @yield [Array<Fixnum>] An line of fixnums reprsenting pixels
       def each_scanline(&block)
-        height.times do |i|
-          scanline = pixels[width * i, width]
+        for line_no in 0...height do
+          scanline = pixels[width * line_no, width]
           yield(scanline)
         end
       end
@@ -136,7 +162,7 @@ module ChunkyPNG
 
       def encode_png_scanline_sub(original_bytes, previous_bytes = nil, pixelsize = 3)
         encoded_bytes = []
-        original_bytes.length.times do |index|
+        for index in 0...original_bytes.length do
           a = (index >= pixelsize) ? original_bytes[index - pixelsize] : 0
           encoded_bytes[index] = (original_bytes[index] - a) % 256
         end
@@ -145,7 +171,7 @@ module ChunkyPNG
 
       def encode_png_scanline_up(original_bytes, previous_bytes, pixelsize = 3)
         encoded_bytes = []
-        original_bytes.length.times do |index|
+        for index in 0...original_bytes.length do
           b = previous_bytes[index]
           encoded_bytes[index] = (original_bytes[index] - b) % 256
         end
@@ -154,7 +180,7 @@ module ChunkyPNG
       
       def encode_png_scanline_average(original_bytes, previous_bytes, pixelsize = 3)
         encoded_bytes = []
-        original_bytes.length.times do |index|
+        for index in 0...original_bytes.length do
           a = (index >= pixelsize) ? original_bytes[index - pixelsize] : 0
           b = previous_bytes[index]
           encoded_bytes[index] = (original_bytes[index] - (a + b / 2).floor) % 256
@@ -164,7 +190,7 @@ module ChunkyPNG
       
       def encode_png_scanline_paeth(original_bytes, previous_bytes, pixelsize = 3)
         encoded_bytes = []
-        original_bytes.length.times do |i|
+        for i in 0...original_bytes.length do
           a = (i >= pixelsize) ? original_bytes[i - pixelsize] : 0
           b = previous_bytes[i]
           c = (i >= pixelsize) ? previous_bytes[i - pixelsize] : 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chunky_png
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Willem van Bergen