oily_png 1.0.0.beta1 → 1.0.0.rc1

data/.infinity_test

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

data/ext/oily_png/color.c

@@ -0,0 +1,21 @@
+#include "oily_png_ext.h"
+
+PIXEL oily_png_compose_color(PIXEL fg, PIXEL bg) {
+  
+  // Check for simple cases first
+  if ((A_BYTE(fg) == 0xff) || (A_BYTE(bg) == 0x00)) return fg;
+  if (A_BYTE(fg) == 0x00) return bg;
+
+  // Calculate the new values using fast 8-bit multiplication
+  BYTE a_com = INT8_MULTIPLY(0xff - A_BYTE(fg), A_BYTE(bg));
+  BYTE new_r = INT8_MULTIPLY(A_BYTE(fg), R_BYTE(fg)) + INT8_MULTIPLY(a_com, R_BYTE(bg));
+  BYTE new_g = INT8_MULTIPLY(A_BYTE(fg), G_BYTE(fg)) + INT8_MULTIPLY(a_com, G_BYTE(bg));
+  BYTE new_b = INT8_MULTIPLY(A_BYTE(fg), B_BYTE(fg)) + INT8_MULTIPLY(a_com, B_BYTE(bg));
+  BYTE new_a = A_BYTE(fg) + a_com;
+  
+  return BUILD_PIXEL(new_r, new_g, new_b, new_a);
+}
+
+VALUE oily_png_color_compose_quick(VALUE self, VALUE fg_color, VALUE bg_color) {
+  return UINT2NUM(oily_png_compose_color(NUM2UINT(fg_color), NUM2UINT(bg_color)));
+}

data/ext/oily_png/color.h

@@ -0,0 +1,22 @@
+#ifndef OILY_PNG_COLOR_H
+#define OILY_PNG_COLOR_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 BUILD_PIXEL(r, g, b, a)  (((PIXEL) (r) << 24) + ((PIXEL) (g) << 16) + ((PIXEL) (b) << 8) + (PIXEL) (a))
+#define INT8_MULTIPLY(a, b)      (((((a) * (b) + 0x80) >> 8) + ((a) * (b) + 0x80)) >> 8)
+
+/* 
+  Ruby replacement method for color composition using alpha transparency.
+  
+  This method should replace ChunkyPNG::Color.compose_quick
+*/
+VALUE oily_png_color_compose_quick(VALUE self, VALUE fg_color, VALUE bg_color);
+
+/* Color composition using alpha transparency. */
+PIXEL oily_png_compose_color(PIXEL fg, PIXEL bg);
+
+#endif

data/ext/oily_png/oily_png_ext.c

@@ -3,13 +3,17 @@
 void Init_oily_png() {
   VALUE OilyPNG = rb_define_module("OilyPNG");
 
-  // Setup decoding
+  // Setup decoding module
   VALUE OilyPNG_PNGDecoding = rb_define_module_under(OilyPNG, "PNGDecoding");
   rb_define_method(OilyPNG_PNGDecoding, "decode_png_image_pass", oily_png_decode_png_image_pass, 6);
   
-  // Setup encoding
+  // Setup encoding module
   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, 4);
+  
+  // Setup Color module
+  VALUE OilyPNG_Color = rb_define_module_under(OilyPNG, "Color");
+  rb_define_method(OilyPNG_Color, "compose_quick", oily_png_color_compose_quick, 2);
 }
 
 char oily_png_samples_per_pixel(char color_mode) {

data/ext/oily_png/oily_png_ext.h

@@ -1,5 +1,5 @@
-#ifndef OILY_PNG_EXT
-#define OILY_PNG_EXT
+#ifndef OILY_PNG_OILY_PNG_EXT
+#define OILY_PNG_OILY_PNG_EXT
 
 #include "ruby.h"
 
@@ -24,9 +24,10 @@
 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"
-
+#include "color.h"
 
 /*
   Initialize the extension by creating the OilyPNG modules, and registering

data/ext/oily_png/png_decoding.h

@@ -1,7 +1,6 @@
-#ifndef PNG_DECODING_H
-#define PNG_DECODING_H
+#ifndef OILY_PNG_PNG_DECODING_H
+#define OILY_PNG_PNG_DECODING_H
 
-#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)
 
 #define ADD_PIXEL_FROM_PALLETE(pixels, decoding_palette, palette_entry) \

data/ext/oily_png/png_encoding.c

@@ -263,7 +263,7 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   long pass_size  = oily_png_pass_bytesize(FIX2INT(color_mode), depth, width, height);
 
   // Allocate memory for the byte array.
-  BYTE* bytes = ALLOCA_N(BYTE, pass_size);
+  BYTE* bytes = ALLOC_N(BYTE, pass_size);
   
   // Get the scanline encoder function.
   scanline_encoder_func scanline_encoder = oily_png_encode_scanline_func(FIX2INT(color_mode), depth);
@@ -297,5 +297,6 @@ VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE c
   
   // Append to encoded image pass to the output stream.
   rb_str_cat(stream, (char*) bytes, pass_size);
+  xfree(bytes);
   return Qnil;
 }

data/ext/oily_png/png_encoding.h

@@ -1,10 +1,5 @@
-#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)))
+#ifndef OILY_PNG_PNG_ENCODING_H
+#define OILY_PNG_PNG_ENCODING_H
 
 #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_hash_aref(encoding_palette, rb_ary_entry(pixels, (y) * (width) + (x))))) : 0)

data/lib/oily_png.rb

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

data/lib/oily_png/canvas.rb

@@ -6,4 +6,8 @@ module OilyPNG
     extend OilyPNG::PNGDecoding
     include OilyPNG::PNGEncoding
   end
+  
+  module Color
+    extend self
+  end
 end

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 = "1.0.0.beta1"
-  s.date    = "2011-01-24"
+  s.version = "1.0.0.rc1"
+  s.date    = "2011-02-24"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT
@@ -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 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)
+  s.files      = %w(.gitignore .infinity_test Gemfile LICENSE README.rdoc Rakefile ext/oily_png/color.c ext/oily_png/color.h 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/color_spec.rb 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/color_spec.rb spec/decoding_spec.rb spec/encoding_spec.rb)
 end

data/spec/color_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe OilyPNG::Color do
+
+  include OilyPNG::Color
+
+  before(:each) do
+    @white             = 0xffffffff
+    @black             = 0x000000ff
+    @opaque            = 0x0a6496ff
+    @non_opaque        = 0x0a649664
+    @fully_transparent = 0x0a649600
+  end
+
+  describe '#compose_quick' do
+
+    it "should use the foregorund color as is when the background color is fully transparent" do
+      compose_quick(@non_opaque, @fully_transparent).should == @non_opaque
+    end
+
+    it "should use the foregorund color as is when an opaque color is given as foreground color" do
+      compose_quick(@opaque, @white).should == @opaque
+    end
+
+    it "should use the background color as is when a fully transparent pixel is given as foreground color" do
+      compose_quick(@fully_transparent, @white).should == @white
+    end
+
+    it "should compose pixels correctly" do
+      compose_quick(@non_opaque, @white).should == 0x9fc2d6ff
+    end
+    
+    it "should compose colors exactly the same as ChunkyPNG" do
+      fg, bg = rand(0xffffffff), rand(0xffffffff)
+      compose_quick(fg, bg).should == ChunkyPNG::Color.compose_quick(fg, bg)
+    end
+  end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -05:00
+date: 2011-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,8 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- ext/oily_png/color.c
+- ext/oily_png/color.h
 - ext/oily_png/extconf.rb
 - ext/oily_png/oily_png_ext.c
 - ext/oily_png/oily_png_ext.h
@@ -99,6 +101,7 @@ files:
 - lib/oily_png.rb
 - lib/oily_png/canvas.rb
 - oily_png.gemspec
+- spec/color_spec.rb
 - spec/decoding_spec.rb
 - spec/encoding_spec.rb
 - spec/resources/basi0g01.png
@@ -215,5 +218,6 @@ signing_key:
 specification_version: 3
 summary: Native mixin to speed up ChunkyPNG
 test_files: 
+- spec/color_spec.rb
 - spec/decoding_spec.rb
 - spec/encoding_spec.rb