oily_png 1.0.2 → 1.0.3

data/.travis.yml

@@ -1,8 +1,15 @@
+language: ruby
+script: bundle exec rake
 rvm:
-  - 1.8.6
   - 1.8.7
-  - 1.9.1
   - 1.9.2
+  - 1.9.3
   - ruby-head
   - ree
-  - rbx
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: ruby-head

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubyforge
+source :rubygems
 
 if ENV['CHUNKY_PNG']
   gem 'chunky_png', :path => ENV['CHUNKY_PNG']

data/ext/oily_png/color.c

@@ -1,17 +1,18 @@
 #include "oily_png_ext.h"
 
 PIXEL oily_png_compose_color(PIXEL fg, PIXEL bg) {
-  
+  BYTE a_com, new_r, new_g, new_b, new_a;
+
   // 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;
+  a_com = INT8_MULTIPLY(0xff - A_BYTE(fg), A_BYTE(bg));
+  new_r = INT8_MULTIPLY(A_BYTE(fg), R_BYTE(fg)) + INT8_MULTIPLY(a_com, R_BYTE(bg));
+  new_g = INT8_MULTIPLY(A_BYTE(fg), G_BYTE(fg)) + INT8_MULTIPLY(a_com, G_BYTE(bg));
+  new_b = INT8_MULTIPLY(A_BYTE(fg), B_BYTE(fg)) + INT8_MULTIPLY(a_com, B_BYTE(bg));
+  new_a = A_BYTE(fg) + a_com;
   
   return BUILD_PIXEL(new_r, new_g, new_b, new_a);
 }
@@ -23,24 +24,20 @@ VALUE oily_png_color_compose_quick(VALUE self, VALUE fg_color, VALUE bg_color) {
 
 VALUE oily_png_color_r(VALUE self, VALUE value) {
   UNUSED_PARAMETER(self);  
-  BYTE red = R_BYTE(NUM2UINT(value));
-  return INT2FIX(red);
+  return INT2FIX(R_BYTE(NUM2UINT(value)));
 }
 
 VALUE oily_png_color_g(VALUE self, VALUE value) {
   UNUSED_PARAMETER(self);  
-  BYTE green = G_BYTE(NUM2UINT(value));
-  return INT2FIX(green);
+  return INT2FIX(G_BYTE(NUM2UINT(value)));
 }
 
 VALUE oily_png_color_b(VALUE self, VALUE value) {
-  UNUSED_PARAMETER(self);  
-  BYTE blue = B_BYTE(NUM2UINT(value));
-  return INT2FIX(blue);
+  UNUSED_PARAMETER(self);
+  return INT2FIX(B_BYTE(NUM2UINT(value)));
 }
 
 VALUE oily_png_color_a(VALUE self, VALUE value) {
   UNUSED_PARAMETER(self);
-  BYTE alpha = A_BYTE(NUM2UINT(value));
-  return INT2FIX(alpha);
+  return INT2FIX(A_BYTE(NUM2UINT(value)));
 }

data/ext/oily_png/png_decoding.c

@@ -81,33 +81,11 @@ BYTE oily_png_resample_1bit_element(BYTE* bytes, long start, long x) {
 }
 
 BYTE oily_png_resample_2bit_element(BYTE* bytes, long start, long x) {
-  switch (oily_png_extract_2bit_element(bytes, start, x)) {
-    case 0x00: return 0x00;
-    case 0x01: return 0x55;
-    case 0x02: return 0xaa;
-    case 0x03: default: return 0xff;
-  }
+  return oily_png_extract_2bit_element(bytes, start, x) * 85;
 }
 
 BYTE oily_png_resample_4bit_element(BYTE* bytes, long start, long x) {
-  switch(oily_png_extract_4bit_element(bytes, start, x)) {
-    case 0x00: return 0;
-    case 0x01: return 17;
-    case 0x02: return 34;
-    case 0x03: return 51;
-    case 0x04: return 68;
-    case 0x05: return 85;
-    case 0x06: return 102;
-    case 0x07: return 119;
-    case 0x08: return 137;
-    case 0x09: return 154;
-    case 0x0a: return 171;
-    case 0x0b: return 188;
-    case 0x0c: return 205;
-    case 0x0d: return 222;
-    case 0x0e: return 239;
-    case 0x0f: default: return 255;
-  }
+  return oily_png_extract_4bit_element(bytes, start, x) * 17;
 }
 
 /////////////////////////////////////////////////////////////////////

data/ext/oily_png/resampling.c

@@ -44,6 +44,7 @@ void oily_png_generate_steps_residues(long width, long new_width, long *steps, l
 }
 
 VALUE oily_png_canvas_steps(VALUE self, VALUE v_width, VALUE v_new_width) {
+  UNUSED_PARAMETER(self);
   long width = NUM2LONG(v_width);
   long new_width = NUM2LONG(v_new_width);
 
@@ -70,6 +71,7 @@ VALUE oily_png_canvas_steps(VALUE self, VALUE v_width, VALUE v_new_width) {
 
 
 VALUE oily_png_canvas_steps_residues(VALUE self, VALUE v_width, VALUE v_new_width) {
+  UNUSED_PARAMETER(self);
   long width = NUM2LONG(v_width);
   long new_width = NUM2LONG(v_new_width);
 

data/lib/oily_png.rb

@@ -2,7 +2,7 @@ require 'chunky_png'
 
 module OilyPNG
   
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   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 = "1.0.2"
-  s.date    = "2011-08-10"
+  s.version = "1.0.3"
+  s.date    = "2013-01-19"
 
   s.summary     = "Native mixin to speed up ChunkyPNG"
   s.description = <<-EOT

metadata

@@ -1,86 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oily_png
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-10 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chunky_png
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70150338537120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70150338537120
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70150338536620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70150338536620
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70150338535960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70150338535960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70150338534780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-description: "    This Ruby C extenstion defines a module that can be included into ChunkyPNG to improve its speed.\n"
-email: 
+  prerelease: false
+  version_requirements: *70150338534780
+description: ! '    This Ruby C extenstion defines a module that can be included into
+  ChunkyPNG to improve its speed.
+
+'
+email:
 - willem@railsdoctors.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oily_png/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -198,45 +184,38 @@ files:
 - spec/spec_helper.rb
 - tasks/github-gem.rake
 - tasks/testing.rake
-has_rdoc: true
 homepage: http://wiki.github.com/wvanbergen/oily_png
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - oily_png
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oily_png
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Native mixin to speed up ChunkyPNG
-test_files: 
+test_files:
 - spec/color_spec.rb
 - spec/decoding_spec.rb
 - spec/encoding_spec.rb