oily_png 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oily_png (0.0.7)
+    oily_png (0.0.8)
       chunky_png (~> 0.10.2)
 
 GEM

data/ext/oily_png/png_encoding.c

@@ -3,11 +3,15 @@
 ///// Pixel encoding functions //////////////////////////////////////////
 
 void oily_png_encode_pixel_grayscale(PIXEL pixel, BYTE* bytes, int pos, VALUE palette) {
-  bytes[pos] = R_BYTE(pixel);
+  // 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, int pos, VALUE palette) {
-  bytes[pos + 0] = R_BYTE(pixel);
+  // 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);
 }
 
@@ -80,7 +84,7 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   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;
   if (FIX2INT(color_mode) == OILY_PNG_COLOR_INDEXED) {
@@ -109,10 +113,10 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   PIXEL pixel;
   int x, y, pos;
   for (y = 0; y < height; y++) {
-    bytes[line_size * y] = FIX2INT(filtering);
+    bytes[line_size * y] = (BYTE) FIX2INT(filtering);
     
     for (x = 0; x < width; x++) {
-      pixel = NUM2UINT(rb_ary_entry(pixels, y * height + x));
+      pixel = NUM2UINT(rb_ary_entry(pixels, y * width + x));
       pos   = (line_size * y) + (pixel_size * x) + 1;
       pixel_encoder(pixel, bytes, pos, palette);
     }

data/ext/oily_png/png_encoding.h

@@ -1,10 +1,10 @@
 #ifndef PNG_ENCODING_H
 #define PNG_ENCODING_H
 
-#define R_BYTE(pixel)  ((BYTE) ((pixel & (PIXEL) 0xff000000) >> 24))
-#define G_BYTE(pixel)  ((BYTE) ((pixel & (PIXEL) 0x00ff0000) >> 16))
-#define B_BYTE(pixel)  ((BYTE) ((pixel & (PIXEL) 0x0000ff00) >> 8))
-#define A_BYTE(pixel)  ((BYTE) ((pixel & (PIXEL) 0x000000ff)))
+#define R_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0xff000000) >> 24))
+#define G_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x00ff0000) >> 16))
+#define B_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x0000ff00) >> 8))
+#define A_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x000000ff)))
 
 #define FILTER_BYTE(byte, adjustment)  byte = (BYTE) (((byte) - (adjustment)) & 0x000000ff)
 

data/lib/oily_png.rb

@@ -2,7 +2,7 @@ require 'chunky_png'
 
 module OilyPNG
   
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   def self.included(base)
     base::Canvas.send(:extend, OilyPNG::PNGDecoding)

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.0.7"
-  s.date    = "2010-10-07"
+  s.version = "0.0.8"
+  s.date    = "2010-10-08"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT
@@ -29,6 +29,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 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/gray.png spec/resources/interlaced.png spec/resources/operations.png spec/spec_helper.rb tasks/github-gem.rake)
+  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/gray.png spec/resources/interlaced.png spec/resources/nonsquare.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/decoding_spec.rb

@@ -4,12 +4,12 @@ describe OilyPNG::PNGDecoding do
 
   it "should call Color.bytesize in the pure ruby version" do
     ChunkyPNG::Color.should_receive(:bytesize).and_return(3)
-    ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+    ChunkyPNG::Canvas.from_file(resource_file('square.png'))
   end
 
   it "should not call Color.bytesize in the native version" do
     ChunkyPNG::Color.should_not_receive(:bytesize)
-    OilyCanvas.from_file(resource_file('operations.png'))
+    OilyCanvas.from_file(resource_file('square.png'))
   end
   
   it "should decode an interlaced image correctly" do
@@ -19,7 +19,7 @@ describe OilyPNG::PNGDecoding do
   end
   
   context 'decoding different filtering methods' do
-    before(:all) { @reference = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))}
+    before(:all) { @reference = ChunkyPNG::Canvas.from_file(resource_file('nonsquare.png'))}
     
     it "should decode NONE filtering exactly the same as ChunkyPNG" do
       filtered_data = @reference.to_blob(:filtering => ChunkyPNG::FILTER_NONE)

data/spec/encoding_spec.rb

@@ -46,7 +46,7 @@ describe OilyPNG::PNGEncoding do
   
   context 'encoding different filters' do
     before do 
-      @canvas      = ChunkyPNG::Canvas.from_file(resource_file('operations.png'))
+      @canvas      = ChunkyPNG::Canvas.from_file(resource_file('nonsquare.png'))
       @oily_canvas = OilyCanvas.from_canvas(@canvas)
     end
     

data/tasks/testing.rake

@@ -0,0 +1,51 @@
+task(:verify, :png_file) do |task, args|
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+
+  require 'chunky_png'
+  require 'oily_png/oily_png_ext'
+
+  class OilyPNG::Canvas < ChunkyPNG::Canvas
+    extend OilyPNG::PNGDecoding
+    include OilyPNG::PNGEncoding
+  end
+  
+  file = args[:png_file] || ENV['PNG_FILE']
+  raise "Please specify a valid PNG file to verify!" unless File.exist?(file.to_s)
+  
+  decoding_reference = ChunkyPNG::Canvas.from_file(file)
+  decoding_oily_png  = OilyPNG::Canvas.from_file(file)
+  
+  if decoding_reference == decoding_oily_png
+    puts "Decoding test succeeded!"
+  else
+    puts "Decoding test FAILED!"
+  end
+  
+  oily_png = OilyPNG::Canvas.from_canvas(decoding_reference)
+  
+  [ChunkyPNG::FILTER_NONE, ChunkyPNG::FILTER_SUB, ChunkyPNG::FILTER_UP, ChunkyPNG::FILTER_AVERAGE, ChunkyPNG::FILTER_PAETH].each do |filter_method|
+    
+    encoding_reference = decoding_reference.to_blob(:filtering => filter_method, :color_mode => ChunkyPNG::COLOR_TRUECOLOR_ALPHA)
+    encoding_oily_png  = oily_png.to_blob(:filtering => filter_method, :color_mode => ChunkyPNG::COLOR_TRUECOLOR_ALPHA)
+    
+    if encoding_reference == encoding_oily_png
+      puts "Encoding test succeeded for filter method #{filter_method}!"
+    else
+      puts "Encoding test FAILED for filter method #{filter_method}!"
+    end
+  end
+  
+  [ChunkyPNG::COLOR_GRAYSCALE, ChunkyPNG::COLOR_GRAYSCALE_ALPHA, ChunkyPNG::COLOR_INDEXED, ChunkyPNG::COLOR_TRUECOLOR, ChunkyPNG::COLOR_TRUECOLOR_ALPHA].each do |color_mode|
+    
+    encoding_reference = decoding_reference.to_blob(:filtering => ChunkyPNG::FILTER_NONE, :color_mode => color_mode)
+    encoding_oily_png  = oily_png.to_blob(:filtering => ChunkyPNG::FILTER_NONE, :color_mode => color_mode)
+    
+    if encoding_reference == encoding_oily_png
+      puts "Encoding test succeeded for color mode #{color_mode}!"
+    else
+      puts "Decoding test FAILED for color mode #{color_mode}!"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oily_png
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,9 +92,11 @@ files:
 - spec/encoding_spec.rb
 - spec/resources/gray.png
 - spec/resources/interlaced.png
-- spec/resources/operations.png
+- spec/resources/nonsquare.png
+- spec/resources/square.png
 - spec/spec_helper.rb
 - tasks/github-gem.rake
+- tasks/testing.rake
 has_rdoc: true
 homepage: http://wiki.github.com/wvanbergen/oily_png
 licenses: []