oily_png 0.3.0 → 1.0.0.beta1

data/.gitignore

@@ -4,6 +4,7 @@ Makefile
 *.o
 *.rbc
 /.bundle/
+Gemfile.lock
 /pkg
 oily_png-*.gem
 .DS_Store

data/.infinity_test

@@ -6,4 +6,18 @@ infinity_test do
     environment.system('bundle install')
     environment.system('rake compile')
   end
+  
+  after(:each_ruby) do |environment|
+    environment.system("rake clean_and_clobber_without_verbose")
+  end
+  
+  heuristics do
+    add("^ext/*/(.*)\.c") do |file|
+      run :all => :tests
+    end
+    
+    add("^ext/*/(.*)\.h") do |file|
+      run :all => :tests
+    end
+  end
 end

data/Rakefile

@@ -1,19 +1,9 @@
-require 'rubygems'
-require 'bundler'
-
-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|
+gem_management_tasks = GithubGem::RakeTasks.new(:gem)
+Rake::ExtensionTask.new('oily_png', gem_management_tasks.gemspec) do |ext|
   ext.lib_dir = File.join('lib', 'oily_png')
 end
 

data/ext/oily_png/oily_png_ext.h

@@ -17,14 +17,15 @@
 #define OILY_PNG_FILTER_AVERAGE 3
 #define OILY_PNG_FILTER_PAETH   4
 
-// Type definitions
-#define PIXEL unsigned int  // Pixels use 32 bits unsigned integers
-#define BYTE  unsigned char // Bytes use 8 bits unsigned integers
-
+// Macro to surpress warnings about unused parameters.
 #define UNUSED_PARAMETER(param) (void) param
 
-#include <png_decoding.h>
-#include <png_encoding.h>
+// Type definitions
+typedef unsigned int PIXEL; // Pixels use 32 bits unsigned integers
+typedef unsigned char BYTE; // Bytes use 8 bits unsigned integers
+
+#include "png_decoding.h"
+#include "png_encoding.h"
 
 
 /*

data/ext/oily_png/png_decoding.c

@@ -1,4 +1,9 @@
-#include <oily_png_ext.h>
+#include "oily_png_ext.h"
+
+
+/////////////////////////////////////////////////////////////////////
+// UNFILTERING SCANLINES
+/////////////////////////////////////////////////////////////////////
 
 
 // Decodes a SUB filtered scanline at the given position in the byte array
@@ -48,6 +53,11 @@ void oily_png_decode_filter_paeth(BYTE* bytes, long pos, long line_size, char pi
   }
 }
 
+/////////////////////////////////////////////////////////////////////
+// BIT HANDLING
+/////////////////////////////////////////////////////////////////////
+
+
 BYTE oily_png_extract_1bit_element(BYTE* bytes, long start, long x) {
   BYTE byte = bytes[start + 1 + (x >> 3)];
   char bitshift = 7 - (x & (BYTE) 0x07);
@@ -100,152 +110,210 @@ BYTE oily_png_resample_4bit_element(BYTE* bytes, long start, long x) {
   }
 }
 
+/////////////////////////////////////////////////////////////////////
+// PIXEL DECODING SCANLINES
+/////////////////////////////////////////////////////////////////////
 
-PIXEL oily_png_decode_pixel_indexed_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
-  return (PIXEL) NUM2UINT(rb_funcall(decoding_palette, rb_intern("[]"), 1, INT2FIX(bytes[start + 1 + x])));
-}
 
-PIXEL oily_png_decode_pixel_indexed_4bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
-  return (PIXEL) NUM2UINT(rb_funcall(decoding_palette, rb_intern("[]"), 1, INT2FIX(oily_png_extract_4bit_element(bytes, start, x))));
+void oily_png_decode_scanline_grayscale_1bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    oily_png_resample_1bit_element(bytes, start, x), 
+                    oily_png_resample_1bit_element(bytes, start, x), 
+                    oily_png_resample_1bit_element(bytes, start, x), 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_indexed_2bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
-  return (PIXEL) NUM2UINT(rb_funcall(decoding_palette, rb_intern("[]"), 1, INT2FIX(oily_png_extract_2bit_element(bytes, start, x))));
+void oily_png_decode_scanline_grayscale_2bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    oily_png_resample_2bit_element(bytes, start, x), 
+                    oily_png_resample_2bit_element(bytes, start, x), 
+                    oily_png_resample_2bit_element(bytes, start, x), 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_indexed_1bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
-  return (PIXEL) NUM2UINT(rb_funcall(decoding_palette, rb_intern("[]"), 1, INT2FIX(oily_png_extract_1bit_element(bytes, start, x))));
+void oily_png_decode_scanline_grayscale_4bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    oily_png_resample_4bit_element(bytes, start, x), 
+                    oily_png_resample_4bit_element(bytes, start, x), 
+                    oily_png_resample_4bit_element(bytes, start, x), 
+                    0xff);
+  }
 }
 
-
-PIXEL oily_png_decode_pixel_grayscale_8bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_grayscale_8bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
   UNUSED_PARAMETER(decoding_palette);
-  return BUILD_PIXEL( bytes[start + 1 + x], 
-                      bytes[start + 1 + x], 
-                      bytes[start + 1 + x], 
-                      0xff);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + x], 
+                    bytes[start + 1 + x], 
+                    bytes[start + 1 + x], 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_grayscale_1bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_grayscale_16bit(VALUE pixels, BYTE* bytes, long start, long width, 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), 
-                      0xff);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 2)], 
+                    bytes[start + 1 + (x * 2)], 
+                    bytes[start + 1 + (x * 2)], 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_grayscale_2bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_grayscale_alpha_8bit(VALUE pixels, BYTE* bytes, long start, long width, 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), 
-                      0xff);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 2) + 0], 
+                    bytes[start + 1 + (x * 2) + 0], 
+                    bytes[start + 1 + (x * 2) + 0], 
+                    bytes[start + 1 + (x * 2) + 1]);
+  }
 }
 
-PIXEL oily_png_decode_pixel_grayscale_4bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_grayscale_alpha_16bit(VALUE pixels, BYTE* bytes, long start, long width, 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), 
-                      0xff);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 4) + 0], 
+                    bytes[start + 1 + (x * 4) + 0], 
+                    bytes[start + 1 + (x * 4) + 0], 
+                    bytes[start + 1 + (x * 4) + 2]);
+  }
 }
 
-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], 
-                      0xff);
+void oily_png_decode_scanline_indexed_1bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, oily_png_extract_1bit_element(bytes, start, x));
+  }
 }
 
-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], 
-                      bytes[start + 1 + (x * 2) + 1]);
+void oily_png_decode_scanline_indexed_2bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, oily_png_extract_2bit_element(bytes, start, 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], 
-                      bytes[start + 1 + (x * 4) + 3]);
+void oily_png_decode_scanline_indexed_4bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, oily_png_extract_4bit_element(bytes, start, 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)], 
-                      0xff);
+void oily_png_decode_scanline_indexed_8bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, bytes[start + 1 + x]);
+  }
 }
 
-PIXEL oily_png_decode_pixel_truecolor_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_truecolor_8bit(VALUE pixels, BYTE* bytes, long start, long width, 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], 
-                      0xff);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 3) + 0], 
+                    bytes[start + 1 + (x * 3) + 1], 
+                    bytes[start + 1 + (x * 3) + 2], 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_grayscale_alpha_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_truecolor_16bit(VALUE pixels, BYTE* bytes, long start, long width, 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], 
-                      bytes[start + 1 + (x * 4) + 2]);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 6) + 0], 
+                    bytes[start + 1 + (x * 6) + 2], 
+                    bytes[start + 1 + (x * 6) + 4], 
+                    0xff);
+  }
 }
 
-PIXEL oily_png_decode_pixel_truecolor_alpha_16bit(BYTE* bytes, long start, long x, VALUE decoding_palette) {
+void oily_png_decode_scanline_truecolor_alpha_8bit(VALUE pixels, BYTE* bytes, long start, long width, 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], 
-                      bytes[start + 1 + (x * 8) + 6]);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,
+                    bytes[start + 1 + (x * 4) + 0], 
+                    bytes[start + 1 + (x * 4) + 1], 
+                    bytes[start + 1 + (x * 4) + 2], 
+                    bytes[start + 1 + (x * 4) + 3]);    
+  }
 }
 
+void oily_png_decode_scanline_truecolor_alpha_16bit(VALUE pixels, BYTE* bytes, long start, long width, VALUE decoding_palette) {
+  UNUSED_PARAMETER(decoding_palette);
+  long x;
+  for (x = 0; x < width; x++) {
+    ADD_PIXEL_FROM_RGBA(pixels,    
+                    bytes[start + 1 + (x * 8) + 0], 
+                    bytes[start + 1 + (x * 8) + 2], 
+                    bytes[start + 1 + (x * 8) + 4], 
+                    bytes[start + 1 + (x * 8) + 6]);
+  }
+}
 
-pixel_decoder_func oily_png_decode_pixel_func(int color_mode, int bit_depth) {
+scanline_decoder_func oily_png_decode_scanline_func(int color_mode, int bit_depth) {
   switch (color_mode) {
     case OILY_PNG_COLOR_GRAYSCALE:
       switch (bit_depth) {
-        case  1: return &oily_png_decode_pixel_grayscale_1bit;
-        case  2: return &oily_png_decode_pixel_grayscale_2bit;
-        case  4: return &oily_png_decode_pixel_grayscale_4bit;
-        case  8: return &oily_png_decode_pixel_grayscale_8bit;
-        case 16: return &oily_png_decode_pixel_grayscale_16bit;
+        case  1: return &oily_png_decode_scanline_grayscale_1bit;
+        case  2: return &oily_png_decode_scanline_grayscale_2bit;
+        case  4: return &oily_png_decode_scanline_grayscale_4bit;
+        case  8: return &oily_png_decode_scanline_grayscale_8bit;
+        case 16: return &oily_png_decode_scanline_grayscale_16bit;
         default: return NULL;
       }
 
     case OILY_PNG_COLOR_TRUECOLOR:
       switch (bit_depth) {
-        case  8: return &oily_png_decode_pixel_truecolor_8bit;
-        case 16: return &oily_png_decode_pixel_truecolor_16bit;
+        case  8: return &oily_png_decode_scanline_truecolor_8bit;
+        case 16: return &oily_png_decode_scanline_truecolor_16bit;
         default: return NULL;
       }
       
     case OILY_PNG_COLOR_INDEXED:
       switch (bit_depth) {
-        case 1: return &oily_png_decode_pixel_indexed_1bit;
-        case 2: return &oily_png_decode_pixel_indexed_2bit;
-        case 4: return &oily_png_decode_pixel_indexed_4bit;
-        case 8: return &oily_png_decode_pixel_indexed_8bit;
+        case 1: return &oily_png_decode_scanline_indexed_1bit;
+        case 2: return &oily_png_decode_scanline_indexed_2bit;
+        case 4: return &oily_png_decode_scanline_indexed_4bit;
+        case 8: return &oily_png_decode_scanline_indexed_8bit;
         default: return NULL;
       }
       
-    case OILY_PNG_COLOR_GRAYSCALE_ALPHA: 
+    case OILY_PNG_COLOR_GRAYSCALE_ALPHA:
       switch (bit_depth) {
-        case  8: return &oily_png_decode_pixel_grayscale_alpha_8bit;
-        case 16: return &oily_png_decode_pixel_grayscale_alpha_16bit;
+        case  8: return &oily_png_decode_scanline_grayscale_alpha_8bit;
+        case 16: return &oily_png_decode_scanline_grayscale_alpha_16bit;
         default: return NULL;
       }
 
     case OILY_PNG_COLOR_TRUECOLOR_ALPHA:
       switch (bit_depth) {
-        case  8: return &oily_png_decode_pixel_truecolor_alpha_8bit;
-        case 16: return &oily_png_decode_pixel_truecolor_alpha_16bit;
+        case  8: return &oily_png_decode_scanline_truecolor_alpha_8bit;
+        case 16: return &oily_png_decode_scanline_truecolor_alpha_16bit;
         default: return NULL;
       }
     
@@ -253,6 +321,22 @@ pixel_decoder_func oily_png_decode_pixel_func(int color_mode, int bit_depth) {
   }
 }
 
+/////////////////////////////////////////////////////////////////////
+// DECODING AN IMAGE PASS
+/////////////////////////////////////////////////////////////////////
+
+VALUE oily_png_decode_palette(VALUE self) {
+  VALUE palette_instance = rb_funcall(self, rb_intern("decoding_palette"), 0);
+  if (palette_instance != Qnil) {
+    VALUE decoding_map = rb_iv_get(palette_instance, "@decoding_map");
+    if (rb_funcall(decoding_map, rb_intern("kind_of?"), 1, rb_cArray) == Qtrue) {  
+      return decoding_map;
+    }
+  }
+  rb_raise(rb_eRuntimeError, "Could not retrieve a decoding palette for this image!");  
+}
+
+
 VALUE oily_png_decode_png_image_pass(VALUE self, VALUE stream, VALUE width, VALUE height, VALUE color_mode, VALUE depth, VALUE start_pos) {
   
   VALUE pixels = rb_ary_new();
@@ -276,20 +360,16 @@ VALUE oily_png_decode_png_image_pass(VALUE self, VALUE stream, VALUE width, VALU
     // Get the decoding palette for indexed images.
     VALUE decoding_palette = Qnil;
     if (FIX2INT(color_mode) == OILY_PNG_COLOR_INDEXED) {
-      decoding_palette = rb_funcall(self, rb_intern("decoding_palette"), 0);
-    }
+      decoding_palette = oily_png_decode_palette(self);
+    }    
 
-    // Select the pixel decoder function for this color mode.
-    PIXEL (*pixel_decoder)(BYTE*, long, long, VALUE) = NULL;
-    pixel_decoder = oily_png_decode_pixel_func(FIX2INT(color_mode), FIX2INT(depth));
-  
-    if (pixel_decoder == NULL) {
+    // Select the scanline decoder function for this color mode and bit depth.
+    scanline_decoder_func scanline_decoder = oily_png_decode_scanline_func(FIX2INT(color_mode), FIX2INT(depth));
+    if (scanline_decoder == NULL) {
       rb_raise(rb_eRuntimeError, "No decoder for color mode %d and bit depth %d", FIX2INT(color_mode), FIX2INT(depth));
     }
   
-    long y, x, line_start;
-    PIXEL pixel;
-  
+    long y, line_start;
     for (y = 0; y < FIX2LONG(height); y++) {
       line_start = y * line_size;
     
@@ -305,12 +385,7 @@ VALUE oily_png_decode_png_image_pass(VALUE self, VALUE stream, VALUE width, VALU
     
       // Set the filter byte to 0 because the bytearray is now unfiltered.
       bytes[line_start] = OILY_PNG_FILTER_NONE;
-    
-      // Now, iterate over all bytes in this line and convert them into pixels
-      for (x = 0; x < FIX2LONG(width); x++) {
-        pixel = pixel_decoder(bytes, line_start, x, decoding_palette); 
-        rb_ary_store(pixels, FIX2LONG(width) * y + x, UINT2NUM(pixel));
-      }
+      scanline_decoder(pixels, bytes, line_start, FIX2LONG(width), decoding_palette);
     }
   }
   

data/ext/oily_png/png_decoding.h

@@ -1,12 +1,21 @@
 #ifndef PNG_DECODING_H
 #define PNG_DECODING_H
 
-#define BUILD_PIXEL(r, g, b, a) (((PIXEL) r << 24) + ((PIXEL) g << 16) + ((PIXEL) b << 8) + (PIXEL) a)
+#define BUILD_PIXEL(r, g, b, a) (((PIXEL) (r) << 24) + ((PIXEL) (g) << 16) + ((PIXEL) (b) << 8) + (PIXEL) (a))
 #define UNFILTER_BYTE(byte, adjustment)  byte = (BYTE) (((byte) + (adjustment)) & 0x000000ff)
 
-typedef PIXEL(*pixel_decoder_func)(BYTE*, long, long, VALUE);
+#define ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, palette_entry) \
+    if (RARRAY_LEN(decoding_palette) > (palette_entry)) { \
+      rb_ary_push(pixels, rb_ary_entry(decoding_palette, (palette_entry))); \
+    } else { \
+      rb_raise(rb_eRuntimeError, "The decoding palette does not have %d entries!", (palette_entry)); \
+    }
+    
+#define ADD_PIXEL_FROM_RGBA(pixels, r, g, b, a) rb_ary_push(pixels, UINT2NUM(BUILD_PIXEL(r,g,b,a)));
 
 
+typedef void(*scanline_decoder_func)(VALUE, BYTE*, long, long, VALUE);
+
 /*
   Decodes an image pass from the given byte stream at the given position.
   A normal PNG will only have one pass that consumes the entire stream, while an

data/ext/oily_png/png_encoding.c

@@ -1,4 +1,4 @@
-#include <oily_png_ext.h>
+#include "oily_png_ext.h"
 
 ///// Scanline filtering functions //////////////////////////////////////////
 
@@ -47,7 +47,52 @@ void oily_png_encode_filter_paeth(BYTE* bytes, long pos, long line_size, char pi
 ///// 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.
+// We'll uses the same to remain compatible with ChunkyPNG.
+void oily_png_encode_scanline_grayscale_1bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; BYTE p1, p2, p3, p4, p5, p6, p7, p8;
+  for (x = 0; x < width; x += 8) {
+    p1 = (x + 0 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 0))) >> 7);
+    p2 = (x + 1 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 1))) >> 7);
+    p3 = (x + 2 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 2))) >> 7);
+    p4 = (x + 3 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 3))) >> 7);
+    p5 = (x + 4 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 4))) >> 7);
+    p6 = (x + 5 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 5))) >> 7);
+    p7 = (x + 6 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 6))) >> 7);
+    p8 = (x + 7 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 7))) >> 7);
+    bytes[x >> 3] = (BYTE) ((p1 << 7) | (p2 << 6) | (p3 << 5) | (p4 << 4) | (p5 << 3) | (p6 << 2) | (p7 << 1) | (p8));
+  }
+}
+
+
+// Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
+// We'll uses the same to remain compatible with ChunkyPNG.
+void oily_png_encode_scanline_grayscale_2bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; BYTE p1, p2, p3, p4;
+  for (x = 0; x < width; x += 4) {
+    p1 = (x + 0 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 0))) >> 6);
+    p2 = (x + 1 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 1))) >> 6);
+    p3 = (x + 2 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 2))) >> 6);
+    p4 = (x + 3 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 3))) >> 6);
+    bytes[x >> 2] = (BYTE) ((p1 << 6) | (p2 << 4) | (p3 << 2) | (p4));
+  }
+}
+
+// Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
+// We'll uses the same to remain compatible with ChunkyPNG.
+void oily_png_encode_scanline_grayscale_4bit(BYTE* bytes, VALUE pixels, long y, long width, VALUE encoding_palette) {
+  UNUSED_PARAMETER(encoding_palette);
+  long x; BYTE p1, p2;
+  for (x = 0; x < width; x += 2) {
+    p1 = (x + 0 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 0))) >> 4);
+    p2 = (x + 1 >= width) ? 0 : (B_BYTE(NUM2UINT(rb_ary_entry(pixels, y * width + x + 1))) >> 4);
+    bytes[x >> 1] = (BYTE) ((p1 << 4) | (p2));
+  }
+}
+
+// Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
+// We'll uses the same to remain 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;
@@ -58,7 +103,7 @@ void oily_png_encode_scanline_grayscale_8bit(BYTE* bytes, VALUE pixels, long y,
 }
 
 // Assume R == G == B. ChunkyPNG uses the B byte fot performance reasons. 
-// We'll uses the same to reomain compatible with ChunkyPNG.
+// We'll uses the same to remain 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;
@@ -72,7 +117,7 @@ void oily_png_encode_scanline_grayscale_alpha_8bit(BYTE* bytes, VALUE pixels, lo
 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)));
+    bytes[x] = ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x);
   }
 }
 
@@ -141,6 +186,9 @@ scanline_encoder_func oily_png_encode_scanline_func(char color_mode, char bit_de
     case OILY_PNG_COLOR_GRAYSCALE:
       switch (bit_depth) {
         case 8:  return &oily_png_encode_scanline_grayscale_8bit;
+        case 4:  return &oily_png_encode_scanline_grayscale_4bit;
+        case 2:  return &oily_png_encode_scanline_grayscale_2bit;
+        case 1:  return &oily_png_encode_scanline_grayscale_1bit;
         default: return NULL;
       }
       
@@ -175,6 +223,21 @@ scanline_encoder_func oily_png_encode_scanline_func(char color_mode, char bit_de
   }
 }
 
+/////////////////////////////////////////////////////////////////////
+// ENCODING AN IMAGE PASS
+/////////////////////////////////////////////////////////////////////
+
+VALUE oily_png_encode_palette(VALUE self) {
+  VALUE palette_instance = rb_funcall(self, rb_intern("encoding_palette"), 0);
+  if (palette_instance != Qnil) {
+    VALUE encoding_map = rb_iv_get(palette_instance, "@encoding_map");
+    if (rb_funcall(encoding_map, rb_intern("kind_of?"), 1, rb_cHash) == Qtrue) {
+      return encoding_map;
+    }
+  }
+  rb_raise(rb_eRuntimeError, "Could not retrieve a decoding palette for this image!");
+}
+
 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);
@@ -192,7 +255,7 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   // Get the encoding palette if we're encoding to an indexed bytestream.
   VALUE encoding_palette = Qnil;
   if (FIX2INT(color_mode) == OILY_PNG_COLOR_INDEXED) {
-    encoding_palette = rb_funcall(self, rb_intern("encoding_palette"), 0);
+    encoding_palette = oily_png_encode_palette(self);
   }
   
   char pixel_size = oily_png_pixel_bytesize(FIX2INT(color_mode), depth);
@@ -203,8 +266,7 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   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);
+  scanline_encoder_func 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);
   }

data/ext/oily_png/png_encoding.h

@@ -7,7 +7,7 @@
 #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)
+#define ENCODING_PALETTE_INDEX(encoding_palette, pixels, width, y, x) (((x) < (width)) ? ((BYTE) NUM2UINT(rb_hash_aref(encoding_palette, rb_ary_entry(pixels, (y) * (width) + (x))))) : 0)
 
 typedef void(*scanline_encoder_func)(BYTE*, VALUE, long, long, VALUE);
 

data/lib/oily_png/canvas.rb

@@ -0,0 +1,9 @@
+require 'chunky_png'
+require 'oily_png/oily_png'
+
+module OilyPNG
+  class Canvas < ChunkyPNG::Canvas
+    extend OilyPNG::PNGDecoding
+    include OilyPNG::PNGEncoding
+  end
+end

data/lib/oily_png.rb

@@ -2,13 +2,12 @@ require 'chunky_png'
 
 module OilyPNG
   
-  VERSION = "0.3.0"
+  VERSION = "1.0.0.beta1"
 
   def self.included(base)
     base::Canvas.send(:extend, OilyPNG::PNGDecoding)
     base::Canvas.send(:include, OilyPNG::PNGEncoding)
   end
-
 end
 
 require 'oily_png/oily_png'

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.3.0"
-  s.date    = "2010-12-12"
+  s.version = "1.0.0.beta1"
+  s.date    = "2011-01-24"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.extensions    = ["ext/oily_png/extconf.rb"]
   s.require_paths = ["lib", "ext"]
 
-  s.add_runtime_dependency('chunky_png', '~> 0.12')
+  s.add_runtime_dependency('chunky_png', '~> 1.0.0.beta1')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rake-compiler')
@@ -30,6 +30,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 .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.files      = %w(.gitignore .infinity_test Gemfile 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 lib/oily_png/canvas.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

@@ -2,49 +2,65 @@ require 'spec_helper'
 
 describe OilyPNG::PNGEncoding do
 
-  context 'encoding different color modes' do
+  context 'encoding different color settings without palette' do
     before do
       @canvas      = ChunkyPNG::Canvas.from_file(resource_file('gray.png'))
       @oily_canvas = OilyPNG::Canvas.from_canvas(@canvas)
     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, 8, ChunkyPNG::FILTER_NONE)
+    it "should encode an image using 8-bit grayscale correctly" do
       @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 8, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 8, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+    
+    it "should encode an image using 4-bit grayscale correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 4, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 4, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+    
+    it "should encode an image using 2-bit grayscale correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 2, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 2, ChunkyPNG::FILTER_NONE)
       stream1.should == stream2
     end
     
-    it "should encode an image using grayscale alpha correctly" do
+    it "should encode an image using 1-bit grayscale correctly" do
+      @canvas.send(:encode_png_image_pass_to_stream,      stream2 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 1, ChunkyPNG::FILTER_NONE)
+      @oily_canvas.send(:encode_png_image_pass_to_stream, stream1 = ChunkyPNG::Datastream.empty_bytearray, ChunkyPNG::COLOR_GRAYSCALE, 1, ChunkyPNG::FILTER_NONE)
+      stream1.should == stream2
+    end
+    
+    it "should encode an image using 8-bit grayscale alpha correctly" do
       @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
+    it "should encode an image using 8-bit truecolor correctly" do
       @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
+    it "should encode an image using 8-bit truecolor alpha correctly" do
       @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
-
   end
-  
-  context 'encoding with palette images' do
+
+  context 'encoding with paletted images using different bitrates' do
     before do
       @canvas      = ChunkyPNG::Canvas.from_file(resource_file('gray.png'))
       @oily_canvas = OilyPNG::Canvas.from_canvas(@canvas)
       
-      @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)
+      @canvas.encoding_palette = @canvas.palette
+      @canvas.encoding_palette.to_plte_chunk
+      
+      @oily_canvas.encoding_palette = @oily_canvas.palette
+      @oily_canvas.encoding_palette.to_plte_chunk
     end
     
     it "should encode an image using 8-bit indexed colors correctly" do

data/spec/spec_helper.rb

@@ -1,19 +1,7 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.setup
-
-require 'rspec'
+require 'bundler/setup'
 require 'chunky_png'
-require 'oily_png/oily_png'
-
-
-module OilyPNG
-  class Canvas < ChunkyPNG::Canvas
-    extend OilyPNG::PNGDecoding
-    include OilyPNG::PNGEncoding
-  end
-end
+require 'oily_png/canvas'
 
 module ResourceHelper
   def resource_files

data/tasks/github-gem.rake

@@ -220,7 +220,7 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
@@ -339,22 +339,26 @@ module GithubGem
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
-
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
+      require 'net/https'
+      require 'uri'
+      
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
 
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      if Net::HTTPSuccess === response
         open(__FILE__, "w") { |file| file.write(response.body) }
-      end
-
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
-      if `#{git} ls-files -m #{relative_file}`.split("\n").any?
-        sh git, 'add', relative_file
-        sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+          sh git, 'add', relative_file
+          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        else
+          puts "Release managament tasks already are at the latest version."
+        end
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
   end

data/tasks/testing.rake

@@ -1,8 +1,6 @@
 task(:verify, :png_file) do |task, args|
   require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-
+  require 'bundler/setup'
   require 'chunky_png'
   require 'oily_png/oily_png_ext'
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oily_png
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 3
   - 0
-  version: 0.3.0
+  - beta1
+  version: 1.0.0.beta1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -14,25 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -05:00
+date: 2011-01-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chunky_png
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 12
-        version: "0.12"
+        - 0
+        - beta1
+        version: 1.0.0.beta1
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,10 +46,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +59,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,7 +72,6 @@ dependencies:
         - 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: 
@@ -83,7 +86,6 @@ files:
 - .gitignore
 - .infinity_test
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -95,6 +97,7 @@ files:
 - ext/oily_png/png_encoding.c
 - ext/oily_png/png_encoding.h
 - lib/oily_png.rb
+- lib/oily_png/canvas.rb
 - oily_png.gemspec
 - spec/decoding_spec.rb
 - spec/encoding_spec.rb
@@ -191,19 +194,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4404807782310531361
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: -4404807782310531361
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: oily_png

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    oily_png (0.3.0)
-      chunky_png (~> 0.12)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    chunky_png (0.12.0)
-    diff-lcs (1.1.2)
-    rake (0.8.7)
-    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.12)
-  oily_png!
-  rake
-  rake-compiler
-  rspec (~> 2)