oily_png 0.2.0 → 0.3.0

data/.gitignore

@@ -2,6 +2,7 @@ Makefile
 /conftest.dSYM
 *.bundle
 *.o
+*.rbc
 /.bundle/
 /pkg
 oily_png-*.gem

data/.infinity_test

@@ -0,0 +1,9 @@
+infinity_test do
+  
+  use :rubies => %w(1.8.7 1.9.2 ree rbx), :test_framework => :rspec
+  
+  before(:each_ruby) do |environment|
+    environment.system('bundle install')
+    environment.system('rake compile')
+  end
+end

data/Gemfile

@@ -1,10 +1,11 @@
 source :rubyforge
-gemspec
 
-# # Use the following gem specification instead of the 'gemspec' statement
-# # to develop with a local chunky_png copy
-
-# gem 'chunky_png', :path => File.expand_path('../chunky_png', File.dirname(__FILE__))
-# gem 'oily_png', :path => File.dirname(__FILE__)
-# gem 'rake'
-# gem 'rspec'
+if ENV['CHUNKY_PNG']
+  gem 'chunky_png', :path => ENV['CHUNKY_PNG']
+  gem 'oily_png',   :path => File.dirname(__FILE__)
+  gem 'rake'
+  gem 'rake-compiler'
+  gem 'rspec'
+else
+  gemspec
+end

data/Gemfile.lock

@@ -1,31 +1,32 @@
 PATH
   remote: .
   specs:
-    oily_png (0.2.0)
-      chunky_png (~> 0.11)
+    oily_png (0.3.0)
+      chunky_png (~> 0.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    chunky_png (0.11.0)
+    chunky_png (0.12.0)
     diff-lcs (1.1.2)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rake-compiler (0.7.5)
+      rake
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  chunky_png (~> 0.11)
+  chunky_png (~> 0.12)
   oily_png!
   rake
-  rspec (~> 2.0)
+  rake-compiler
+  rspec (~> 2)

data/Rakefile

@@ -5,5 +5,20 @@ Bundler.setup
 
 Dir['tasks/*.rake'].each { |file| load(file) }
 
+require 'rake/extensiontask'
+
+def gemspec
+  @clean_gemspec ||= eval(File.read(File.expand_path('../oily_png.gemspec', __FILE__)))
+end
+
 GithubGem::RakeTasks.new(:gem)
+
+Rake::ExtensionTask.new('oily_png', gemspec) do |ext|
+  ext.lib_dir = File.join('lib', 'oily_png')
+end
+
+Rake::Task['spec:basic'].prerequisites << :compile
+Rake::Task['spec:rcov'].prerequisites << :compile
+Rake::Task['spec:specdoc'].prerequisites << :compile
+
 task :default => [:spec]

data/ext/oily_png/extconf.rb

@@ -1,3 +1,3 @@
 require 'mkmf'
 $CFLAGS << ' -Wall'
-create_makefile('oily_png/oily_png_ext')
+create_makefile('oily_png/oily_png')

data/ext/oily_png/oily_png_ext.c

@@ -1,6 +1,6 @@
 #include "oily_png_ext.h"
 
-void Init_oily_png_ext() {
+void Init_oily_png() {
   VALUE OilyPNG = rb_define_module("OilyPNG");
 
   // Setup decoding
@@ -9,7 +9,7 @@ void Init_oily_png_ext() {
   
   // Setup encoding
   VALUE OilyPNG_PNGEncoding = rb_define_module_under(OilyPNG, "PNGEncoding");
-  rb_define_method(OilyPNG_PNGEncoding, "encode_png_image_pass_to_stream", oily_png_encode_png_image_pass_to_stream, 3);
+  rb_define_method(OilyPNG_PNGEncoding, "encode_png_image_pass_to_stream", oily_png_encode_png_image_pass_to_stream, 4);
 }
 
 char oily_png_samples_per_pixel(char color_mode) {

data/ext/oily_png/oily_png_ext.h

@@ -21,8 +21,10 @@
 #define PIXEL unsigned int  // Pixels use 32 bits unsigned integers
 #define BYTE  unsigned char // Bytes use 8 bits unsigned integers
 
-#include "png_decoding.h"
-#include "png_encoding.h"
+#define UNUSED_PARAMETER(param) (void) param
+
+#include <png_decoding.h>
+#include <png_encoding.h>
 
 
 /*
@@ -34,7 +36,7 @@
   speed up decoding, and include OilyPNG::PNGEncoding into the same class to speed
   up encoding. This is done in lib/oily_png.rb
 */
-void Init_oily_png_ext();
+void Init_oily_png();
 
 /*
   Returns the number of samples per pixel for a given color mode

data/ext/oily_png/png_decoding.c

@@ -1,4 +1,4 @@
-#include "oily_png_ext.h"
+#include <oily_png_ext.h>
 
 
 // Decodes a SUB filtered scanline at the given position in the byte array
@@ -11,9 +11,9 @@ void oily_png_decode_filter_sub(BYTE* bytes, long pos, long line_length, char pi
 
 // Decodes an UP filtered scanline at the given position in the byte array
 void oily_png_decode_filter_up(BYTE* bytes, long pos, long line_size, char pixel_size) {
+  UNUSED_PARAMETER(pixel_size);
   long i;
-  // The first line is not filtered because there is no privous line
-  if (pos >= line_size) {
+  if (pos >= line_size) { // The first line is not filtered because there is no privous line
     for (i = 1; i < line_size; i++) {
       UNFILTER_BYTE(bytes[pos + i], bytes[pos + i - line_size]);
     }
@@ -119,6 +119,7 @@ PIXEL oily_png_decode_pixel_indexed_1bit(BYTE* bytes, long start, long x, VALUE
 
 
 PIXEL oily_png_decode_pixel_grayscale_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + x], 
                       bytes[start + 1 + x], 
                       bytes[start + 1 + x], 
@@ -126,6 +127,7 @@ PIXEL oily_png_decode_pixel_grayscale_8bit(BYTE* bytes, long start, long x, VALU
 }
 
 PIXEL oily_png_decode_pixel_grayscale_1bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( oily_png_resample_1bit_element(bytes, start, x), 
                       oily_png_resample_1bit_element(bytes, start, x), 
                       oily_png_resample_1bit_element(bytes, start, x), 
@@ -133,6 +135,7 @@ PIXEL oily_png_decode_pixel_grayscale_1bit(BYTE* bytes, long start, long x, VALU
 }
 
 PIXEL oily_png_decode_pixel_grayscale_2bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( oily_png_resample_2bit_element(bytes, start, x), 
                       oily_png_resample_2bit_element(bytes, start, x), 
                       oily_png_resample_2bit_element(bytes, start, x), 
@@ -140,6 +143,7 @@ PIXEL oily_png_decode_pixel_grayscale_2bit(BYTE* bytes, long start, long x, VALU
 }
 
 PIXEL oily_png_decode_pixel_grayscale_4bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( oily_png_resample_4bit_element(bytes, start, x), 
                       oily_png_resample_4bit_element(bytes, start, x), 
                       oily_png_resample_4bit_element(bytes, start, x), 
@@ -147,6 +151,7 @@ PIXEL oily_png_decode_pixel_grayscale_4bit(BYTE* bytes, long start, long x, VALU
 }
 
 PIXEL oily_png_decode_pixel_truecolor_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 3) + 0], 
                       bytes[start + 1 + (x * 3) + 1], 
                       bytes[start + 1 + (x * 3) + 2], 
@@ -154,6 +159,7 @@ PIXEL oily_png_decode_pixel_truecolor_8bit(BYTE* bytes, long start, long x, VALU
 }
 
 PIXEL oily_png_decode_pixel_grayscale_alpha_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 2) + 0], 
                       bytes[start + 1 + (x * 2) + 0], 
                       bytes[start + 1 + (x * 2) + 0], 
@@ -161,6 +167,7 @@ PIXEL oily_png_decode_pixel_grayscale_alpha_8bit(BYTE* bytes, long start, long x
 }
 
 PIXEL oily_png_decode_pixel_truecolor_alpha_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 4) + 0], 
                       bytes[start + 1 + (x * 4) + 1], 
                       bytes[start + 1 + (x * 4) + 2], 
@@ -168,6 +175,7 @@ PIXEL oily_png_decode_pixel_truecolor_alpha_8bit(BYTE* bytes, long start, long x
 }
 
 PIXEL oily_png_decode_pixel_grayscale_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 2)], 
                       bytes[start + 1 + (x * 2)], 
                       bytes[start + 1 + (x * 2)], 
@@ -175,6 +183,7 @@ PIXEL oily_png_decode_pixel_grayscale_16bit(BYTE* bytes, long start, long x, VAL
 }
 
 PIXEL oily_png_decode_pixel_truecolor_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 6) + 0], 
                       bytes[start + 1 + (x * 6) + 2], 
                       bytes[start + 1 + (x * 6) + 4], 
@@ -182,6 +191,7 @@ PIXEL oily_png_decode_pixel_truecolor_16bit(BYTE* bytes, long start, long x, VAL
 }
 
 PIXEL oily_png_decode_pixel_grayscale_alpha_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 4) + 0], 
                       bytes[start + 1 + (x * 4) + 0], 
                       bytes[start + 1 + (x * 4) + 0], 
@@ -189,6 +199,7 @@ PIXEL oily_png_decode_pixel_grayscale_alpha_16bit(BYTE* bytes, long start, long
 }
 
 PIXEL oily_png_decode_pixel_truecolor_alpha_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
   return BUILD_PIXEL( bytes[start + 1 + (x * 8) + 0], 
                       bytes[start + 1 + (x * 8) + 2], 
                       bytes[start + 1 + (x * 8) + 4], 

data/ext/oily_png/png_encoding.c

@@ -1,36 +1,4 @@
-#include "oily_png_ext.h"
-
-///// Pixel encoding functions //////////////////////////////////////////
-
-void oily_png_encode_pixel_grayscale(PIXEL pixel, BYTE* bytes, long pos, VALUE palette) {
-  // Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
-  // We'll uses the same to reomain compatible with ChunkyPNG.
-  bytes[pos] = B_BYTE(pixel);
-}
-
-void oily_png_encode_pixel_grayscale_alpha(PIXEL pixel, BYTE* bytes, long pos, VALUE palette) {
-  // Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
-  // We'll uses the same to reomain compatible with ChunkyPNG.
-  bytes[pos + 0] = B_BYTE(pixel);
-  bytes[pos + 1] = A_BYTE(pixel);
-}
-
-void oily_png_encode_pixel_truecolor(PIXEL pixel, BYTE* bytes, long pos, VALUE palette) {
-  bytes[pos + 0] = R_BYTE(pixel);
-  bytes[pos + 1] = G_BYTE(pixel);
-  bytes[pos + 2] = B_BYTE(pixel);
-}
-
-void oily_png_encode_pixel_truecolor_alpha(PIXEL pixel, BYTE* bytes, long pos, VALUE palette) {
-  bytes[pos + 0] = R_BYTE(pixel);
-  bytes[pos + 1] = G_BYTE(pixel);
-  bytes[pos + 2] = B_BYTE(pixel);
-  bytes[pos + 3] = A_BYTE(pixel);
-}
-
-void oily_png_encode_pixel_indexed(PIXEL pixel, BYTE* bytes, long pos, VALUE palette) {
-  bytes[pos] = (BYTE) NUM2UINT(rb_funcall(palette, rb_intern("index"), 1, UINT2NUM(pixel)));
-}
+#include <oily_png_ext.h>
 
 ///// Scanline filtering functions //////////////////////////////////////////
 
@@ -42,6 +10,8 @@ void oily_png_encode_filter_sub(BYTE* bytes, long pos, long line_size, char pixe
 }
 
 void oily_png_encode_filter_up(BYTE* bytes, long pos, long line_size, char pixel_size) {
+  UNUSED_PARAMETER(pixel_size);
+  
   long x;
   if (pos >= line_size) {
     for (x = line_size - 1; x > 0; x--) {
@@ -74,22 +44,155 @@ void oily_png_encode_filter_paeth(BYTE* bytes, long pos, long line_size, char pi
   }
 }
 
-VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE color_mode, VALUE filtering) {
+///// Scanline encoding functions //////////////////////////////////////////
+
+// Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
+// We'll uses the same to reomain compatible with ChunkyPNG.
+void oily_png_encode_scanline_grayscale_8bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; PIXEL pixel;
+  for (x = 0; x < width; x++) {
+    pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
+    bytes[x] = B_BYTE(pixel);
+  }
+}
+
+// Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
+// We'll uses the same to reomain compatible with ChunkyPNG.
+void oily_png_encode_scanline_grayscale_alpha_8bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; PIXEL pixel;
+  for (x = 0; x < width; x++) {
+    pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
+    bytes[x * 2 + 0] = B_BYTE(pixel);
+    bytes[x * 2 + 1] = A_BYTE(pixel);
+  }
+}
+
+void oily_png_encode_scanline_indexed_8bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  long x;
+  for (x = 0; x < width; x++) {
+    bytes[x] = (BYTE) NUM2UINT(rb_funcall(encoding_palette, rb_intern("index"), 1, rb_ary_entry(pixels, y * width + x)));
+  }
+}
+
+void oily_png_encode_scanline_indexed_4bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  long x; BYTE p1, p2;
+  for (x = 0; x < width; x += 2) {
+    p1 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 0);
+    p2 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 1);
+    bytes[x >> 1] = (BYTE) ((p1 << 4) | (p2));
+  }
+}
+
+void oily_png_encode_scanline_indexed_2bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  long x; BYTE p1, p2, p3, p4;
+  for (x = 0; x < width; x += 4) {
+    p1 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 0);
+    p2 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 1);
+    p3 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 2);
+    p4 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 3);
+    bytes[x >> 2] = (BYTE) ((p1 << 6) | (p2 << 4) | (p3 << 2) | (p4));
+  }
+}
+
+void oily_png_encode_scanline_indexed_1bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  long x; BYTE p1, p2, p3, p4, p5, p6, p7, p8;
+  for (x = 0; x < width; x += 8) {
+    p1 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 0);
+    p2 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 1);
+    p3 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 2);
+    p4 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 3);
+    p5 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 4);
+    p6 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 5);
+    p7 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 6);
+    p8 = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x + 7);
+    bytes[x >> 3] = (BYTE) ((p1 << 7) | (p2 << 6) | (p3 << 5) | (p4 << 4) | (p5 << 3) | (p6 << 2) | (p7 << 1) | (p8));
+  }
+}
+ 
+void oily_png_encode_scanline_truecolor_8bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; PIXEL pixel;
+  for (x = 0; x < width; x++) {
+    pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
+    bytes[x * 3 + 0] = R_BYTE(pixel);
+    bytes[x * 3 + 1] = G_BYTE(pixel);
+    bytes[x * 3 + 2] = B_BYTE(pixel);
+  }
+}
+
+void oily_png_encode_scanline_truecolor_alpha_8bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; PIXEL pixel;
+  for (x = 0; x < width; x++) {
+    pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
+    bytes[x * 4 + 0] = R_BYTE(pixel);
+    bytes[x * 4 + 1] = G_BYTE(pixel);
+    bytes[x * 4 + 2] = B_BYTE(pixel);
+    bytes[x * 4 + 3] = A_BYTE(pixel);
+  }
+}
+
+
+scanline_encoder_func oily_png_encode_scanline_func(char color_mode, char bit_depth) {
+  switch (color_mode) {
+
+    case OILY_PNG_COLOR_GRAYSCALE:
+      switch (bit_depth) {
+        case 8:  return &oily_png_encode_scanline_grayscale_8bit;
+        default: return NULL;
+      }
+      
+    case OILY_PNG_COLOR_GRAYSCALE_ALPHA:
+      switch (bit_depth) {
+        case 8:  return &oily_png_encode_scanline_grayscale_alpha_8bit;
+        default: return NULL;
+      }
+    
+    case OILY_PNG_COLOR_INDEXED:
+      switch (bit_depth) {
+        case 8:  return &oily_png_encode_scanline_indexed_8bit;
+        case 4:  return &oily_png_encode_scanline_indexed_4bit;
+        case 2:  return &oily_png_encode_scanline_indexed_2bit;
+        case 1:  return &oily_png_encode_scanline_indexed_1bit;
+        default: return NULL;
+      }
+      
+    case OILY_PNG_COLOR_TRUECOLOR:
+      switch (bit_depth) {
+        case 8:  return &oily_png_encode_scanline_truecolor_8bit;
+        default: return NULL;
+      }
+      
+    case OILY_PNG_COLOR_TRUECOLOR_ALPHA:
+      switch (bit_depth) {
+        case 8:  return &oily_png_encode_scanline_truecolor_alpha_8bit;
+        default: return NULL;
+      }
+
+    default: return NULL;
+  }
+}
+
+VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE color_mode, VALUE bit_depth, VALUE filtering) {
+  
+  UNUSED_PARAMETER(bit_depth);
   
   // Get the data
-  char depth      = 8;
+  char depth      = (char) FIX2INT(bit_depth);
   long width      = FIX2LONG(rb_funcall(self, rb_intern("width"), 0));
   long height     = FIX2LONG(rb_funcall(self, rb_intern("height"), 0));
-  VALUE pixels   = rb_funcall(self, rb_intern("pixels"), 0);
+  VALUE pixels    = rb_funcall(self, rb_intern("pixels"), 0);
   
   if (RARRAY_LEN(pixels) != width * height) {
     rb_raise(rb_eRuntimeError, "The number of pixels does not match the canvas dimensions.");
   }
 
   // Get the encoding palette if we're encoding to an indexed bytestream.
-  VALUE palette = Qnil;
+  VALUE encoding_palette = Qnil;
   if (FIX2INT(color_mode) == OILY_PNG_COLOR_INDEXED) {
-    palette = rb_funcall(self, rb_intern("encoding_palette"), 0);
+    encoding_palette = rb_funcall(self, rb_intern("encoding_palette"), 0);
   }
   
   char pixel_size = oily_png_pixel_bytesize(FIX2INT(color_mode), depth);
@@ -98,35 +201,24 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
 
   // Allocate memory for the byte array.
   BYTE* bytes = ALLOCA_N(BYTE, pass_size);
+  
+  // Get the scanline encoder function.
+  void (*scanline_encoder)(BYTE*, VALUE, long, long, VALUE) = NULL;
+  scanline_encoder = oily_png_encode_scanline_func(FIX2INT(color_mode), depth);
+  if (scanline_encoder == NULL) {
+    rb_raise(rb_eRuntimeError, "No encoder for color mode %d and bit depth %d", FIX2INT(color_mode), depth);
+  }
 
-  // Select out pixel encoder function based on the color mode.
-  void (*pixel_encoder)(PIXEL, BYTE*, long, VALUE) = NULL;
-  switch (FIX2INT(color_mode)) {
-    case OILY_PNG_COLOR_GRAYSCALE:       pixel_encoder = &oily_png_encode_pixel_grayscale; break;
-    case OILY_PNG_COLOR_TRUECOLOR:       pixel_encoder = &oily_png_encode_pixel_truecolor; break;
-    case OILY_PNG_COLOR_INDEXED:         pixel_encoder = &oily_png_encode_pixel_indexed; break;
-    case OILY_PNG_COLOR_GRAYSCALE_ALPHA: pixel_encoder = &oily_png_encode_pixel_grayscale_alpha; break;
-    case OILY_PNG_COLOR_TRUECOLOR_ALPHA: pixel_encoder = &oily_png_encode_pixel_truecolor_alpha; break;
-    default: rb_raise(rb_eRuntimeError, "Unsupported color mode: %d", FIX2INT(color_mode));
-  }
-
-  // Loop over all the pixels to encode them into the byte array.
-  PIXEL pixel;
-  long x, y, pos;
-  for (y = 0; y < height; y++) {
-    bytes[line_size * y] = (BYTE) FIX2INT(filtering);
-    
-    for (x = 0; x < width; x++) {
-      pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
-      pos   = (line_size * y) + (pixel_size * x) + 1;
-      pixel_encoder(pixel, bytes, pos, palette);
-    }
+  long y, pos;
+  for (y = height - 1; y >= 0; y--) {
+    pos = line_size * y;
+    bytes[pos] = (BYTE) FIX2INT(filtering);
+    scanline_encoder(bytes + pos + 1, pixels, y, width, encoding_palette);
   }
   
-  // Check if we are going to apply any filtering
   if (FIX2INT(filtering) != OILY_PNG_FILTER_NONE) {
-    
-    // Assign the chosen filter function to the scanline_filter variable.
+
+    // Get the scanline filter function
     void (*scanline_filter)(BYTE*, long, long, char) = NULL;
     switch (FIX2INT(filtering)) {
       case OILY_PNG_FILTER_SUB:     scanline_filter = &oily_png_encode_filter_sub; break;
@@ -135,8 +227,7 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
       case OILY_PNG_FILTER_PAETH:   scanline_filter = &oily_png_encode_filter_paeth; break;
       default: rb_raise(rb_eRuntimeError, "Unsupported filter type: %d", FIX2INT(filtering));
     }
-    
-    // Now, apply the scanline_filter function to every line, backwards.
+
     for (y = height - 1; y >= 0; y--) {
       scanline_filter(bytes, line_size * y, line_size, pixel_size);
     }

data/ext/oily_png/png_encoding.h

@@ -7,6 +7,9 @@
 #define A_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x000000ff)))
 
 #define FILTER_BYTE(byte, adjustment)  byte = (BYTE) (((byte) - (adjustment)) & 0x000000ff)
+#define ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x) ((x < width) ? ((BYTE) NUM2UINT(rb_funcall(encoding_palette, rb_intern("index"), 1, rb_ary_entry(pixels, y * width + x)))) : 0)
+
+typedef void(*scanline_encoder_func)(BYTE*, VALUE, long, long, VALUE);
 
 /*
   Encodes an image and append it to the stream.
@@ -16,6 +19,6 @@
   
   This function should replace ChunkyPNG::Canvas::PNGEncoding.encode_png_image_pass_to_stream
 */
-VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE color_mode, VALUE filtering);
+VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE color_mode, VALUE bit_depth, VALUE filtering);
 
 #endif

data/lib/oily_png.rb

@@ -2,7 +2,7 @@ require 'chunky_png'
 
 module OilyPNG
   
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
   def self.included(base)
     base::Canvas.send(:extend, OilyPNG::PNGDecoding)
@@ -11,7 +11,7 @@ module OilyPNG
 
 end
 
-require 'oily_png/oily_png_ext'
+require 'oily_png/oily_png'
 
 # Include mixin into ChunkyPNG
 ChunkyPNG.send(:include, OilyPNG)

data/oily_png.gemspec

@@ -4,8 +4,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.2.0"
-  s.date    = "2010-11-01"
+  s.version = "0.3.0"
+  s.date    = "2010-12-12"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT
@@ -19,16 +19,17 @@ Gem::Specification.new do |s|
   s.extensions    = ["ext/oily_png/extconf.rb"]
   s.require_paths = ["lib", "ext"]
 
-  s.add_runtime_dependency('chunky_png', '~> 0.11')
+  s.add_runtime_dependency('chunky_png', '~> 0.12')
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.0')
+  s.add_development_dependency('rake-compiler')
+  s.add_development_dependency('rspec', '~> 2')
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
   # 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 Gemfile Gemfile.lock LICENSE README.rdoc Rakefile ext/oily_png/extconf.rb ext/oily_png/oily_png_ext.c ext/oily_png/oily_png_ext.h ext/oily_png/png_decoding.c ext/oily_png/png_decoding.h ext/oily_png/png_encoding.c ext/oily_png/png_encoding.h lib/oily_png.rb oily_png.gemspec spec/decoding_spec.rb spec/encoding_spec.rb spec/resources/basi0g01.png spec/resources/basi0g02.png spec/resources/basi0g04.png spec/resources/basi0g08.png spec/resources/basi0g16.png spec/resources/basi2c08.png spec/resources/basi2c16.png spec/resources/basi3p01.png spec/resources/basi3p02.png spec/resources/basi3p04.png spec/resources/basi3p08.png spec/resources/basi4a08.png spec/resources/basi4a16.png spec/resources/basi6a08.png spec/resources/basi6a16.png spec/resources/basn0g01.png spec/resources/basn0g02.png spec/resources/basn0g04.png spec/resources/basn0g08.png spec/resources/basn0g16.png spec/resources/basn2c08.png spec/resources/basn2c16.png spec/resources/basn3p01.png spec/resources/basn3p02.png spec/resources/basn3p04.png spec/resources/basn3p08.png spec/resources/basn4a08.png spec/resources/basn4a16.png spec/resources/basn6a08.png spec/resources/basn6a16.png spec/resources/gray.png spec/resources/interlaced.png spec/resources/nonsquare.png spec/resources/s01i3p01.png spec/resources/s01n3p01.png spec/resources/s02i3p01.png spec/resources/s02n3p01.png spec/resources/s03i3p01.png spec/resources/s03n3p01.png spec/resources/s04i3p01.png spec/resources/s04n3p01.png spec/resources/s05i3p02.png spec/resources/s05n3p02.png spec/resources/s06i3p02.png spec/resources/s06n3p02.png spec/resources/s07i3p02.png spec/resources/s07n3p02.png spec/resources/s08i3p02.png spec/resources/s08n3p02.png spec/resources/s09i3p02.png spec/resources/s09n3p02.png spec/resources/s32i3p04.png spec/resources/s32n3p04.png spec/resources/s33i3p04.png spec/resources/s33n3p04.png spec/resources/s34i3p04.png spec/resources/s34n3p04.png spec/resources/s35i3p04.png spec/resources/s35n3p04.png spec/resources/s36i3p04.png spec/resources/s36n3p04.png spec/resources/s37i3p04.png spec/resources/s37n3p04.png spec/resources/s38i3p04.png spec/resources/s38n3p04.png spec/resources/s39i3p04.png spec/resources/s39n3p04.png spec/resources/s40i3p04.png spec/resources/s40n3p04.png spec/resources/square.png spec/spec_helper.rb tasks/github-gem.rake tasks/testing.rake)
+  s.files      = %w(.gitignore .infinity_test Gemfile Gemfile.lock LICENSE README.rdoc Rakefile ext/oily_png/extconf.rb ext/oily_png/oily_png_ext.c ext/oily_png/oily_png_ext.h ext/oily_png/png_decoding.c ext/oily_png/png_decoding.h ext/oily_png/png_encoding.c ext/oily_png/png_encoding.h lib/oily_png.rb oily_png.gemspec spec/decoding_spec.rb spec/encoding_spec.rb spec/resources/basi0g01.png spec/resources/basi0g02.png spec/resources/basi0g04.png spec/resources/basi0g08.png spec/resources/basi0g16.png spec/resources/basi2c08.png spec/resources/basi2c16.png spec/resources/basi3p01.png spec/resources/basi3p02.png spec/resources/basi3p04.png spec/resources/basi3p08.png spec/resources/basi4a08.png spec/resources/basi4a16.png spec/resources/basi6a08.png spec/resources/basi6a16.png spec/resources/basn0g01.png spec/resources/basn0g02.png spec/resources/basn0g04.png spec/resources/basn0g08.png spec/resources/basn0g16.png spec/resources/basn2c08.png spec/resources/basn2c16.png spec/resources/basn3p01.png spec/resources/basn3p02.png spec/resources/basn3p04.png spec/resources/basn3p08.png spec/resources/basn4a08.png spec/resources/basn4a16.png spec/resources/basn6a08.png spec/resources/basn6a16.png spec/resources/gray.png spec/resources/interlaced.png spec/resources/nonsquare.png spec/resources/s01i3p01.png spec/resources/s01n3p01.png spec/resources/s02i3p01.png spec/resources/s02n3p01.png spec/resources/s03i3p01.png spec/resources/s03n3p01.png spec/resources/s04i3p01.png spec/resources/s04n3p01.png spec/resources/s05i3p02.png spec/resources/s05n3p02.png spec/resources/s06i3p02.png spec/resources/s06n3p02.png spec/resources/s07i3p02.png spec/resources/s07n3p02.png spec/resources/s08i3p02.png spec/resources/s08n3p02.png spec/resources/s09i3p02.png spec/resources/s09n3p02.png spec/resources/s32i3p04.png spec/resources/s32n3p04.png spec/resources/s33i3p04.png spec/resources/s33n3p04.png spec/resources/s34i3p04.png spec/resources/s34n3p04.png spec/resources/s35i3p04.png spec/resources/s35n3p04.png spec/resources/s36i3p04.png spec/resources/s36n3p04.png spec/resources/s37i3p04.png spec/resources/s37n3p04.png spec/resources/s38i3p04.png spec/resources/s38n3p04.png spec/resources/s39i3p04.png spec/resources/s39n3p04.png spec/resources/s40i3p04.png spec/resources/s40n3p04.png spec/resources/square.png spec/spec_helper.rb tasks/github-gem.rake tasks/testing.rake)
   s.test_files = %w(spec/decoding_spec.rb spec/encoding_spec.rb)
 end

data/spec/encoding_spec.rb

@@ -9,37 +9,65 @@ describe OilyPNG::PNGEncoding do
     end
     
     it "should encode an image using grayscale correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 8, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 8, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode an image using grayscale alpha correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, 8, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, 8, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
-    
+
     it "should encode an image using truecolor correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode an image using truecolor alpha correctly" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, 8, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR_ALPHA, 8, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
-    
-    it "should encode an image using indexed colors correctly" do
-      # Setup an encoding palette first
-      mock_palette = mock('palette', :index => 0xab)
-      @canvas.stub(:encoding_palette).and_return(mock_palette)
-      @oily_canvas.stub(:encoding_palette).and_return(mock_palette)
+
+  end
+  
+  context 'encoding with palette images' do
+    before do
+      @canvas      = ChunkyPNG::Canvas.from_file(resource_file('gray.png'))
+      @oily_canvas = OilyPNG::Canvas.from_canvas(@canvas)
       
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::FILTER_NONE)
+      @palette_mock = mock('Palette')
+      @palette_mock.stub(:index).with(an_instance_of(Fixnum)).and_return(0x01)
+      @palette_mock.stub(:index).with(nil).and_return(0)
+
+      @canvas.stub(:encoding_palette).and_return(@palette_mock)
+      @oily_canvas.stub(:encoding_palette).and_return(@palette_mock)
+    end
+    
+    it "should encode an image using 8-bit indexed colors correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 8, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 8, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+
+    it "should encode an image using 4-bit indexed colors correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 4, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 4, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+
+    it "should encode an image using 2-bit indexed colors correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 2, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 2, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+
+    it "should encode an image using 1-bit indexed colors correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 1, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_INDEXED, 1, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
   end
@@ -51,32 +79,32 @@ describe OilyPNG::PNGEncoding do
     end
     
     it "should encode correctly with no filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_NONE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
     it "should encode correctly with sub filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_SUB)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_SUB)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_SUB)
       stream1.should == stream2
     end
     
     it "should encode correctly with up filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_UP)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_UP)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_UP)
       stream1.should == stream2
     end
-
+    
     it "should encode correctly with average filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_AVERAGE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_AVERAGE)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_AVERAGE)
       stream1.should == stream2
     end
     
     it "should encode correctly with paeth filtering" do
-      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
-      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::FILTER_PAETH)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_PAETH)
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_TRUECOLOR, 8, ChunkyPNG::FILTER_PAETH)
       stream1.should == stream2
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ Bundler.setup
 
 require 'rspec'
 require 'chunky_png'
-require 'oily_png/oily_png_ext'
+require 'oily_png/oily_png'
 
 
 module OilyPNG

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +01:00
+date: 2010-12-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +26,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 11
-        version: "0.11"
+        - 12
+        version: "0.12"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -45,19 +45,31 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake-compiler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: "    This Ruby C extenstion defines a module that can be included into ChunkyPNG to improve its speed.\n"
 email: 
 - willem@railsdoctors.com
@@ -69,6 +81,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .infinity_test
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -178,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -58392216600872723
+      hash: -4404807782310531361
       segments: 
       - 0
       version: "0"
@@ -187,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -58392216600872723
+      hash: -4404807782310531361
       segments: 
       - 0
       version: "0"