oily_png 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2c45f77de934d139cc78eadddf854af7889500
-  data.tar.gz: 192166b7e91148d078853b5c89b64a7e11f9b4ed
+  metadata.gz: 1b84a04e46948ddd4be00b39c9875a2ab28f20b1
+  data.tar.gz: 75442b85ad8fde3f8bed8a49767c4b03739ff469
 SHA512:
-  metadata.gz: db684810f478ab4849534bbe68108c5f68410954c89570045425be01e73bf7012430ba393444ebdd60f3a08b35bdb7455c0e1ac3efc3871e41565338eb7d9eb5
-  data.tar.gz: 67de9ecf90494bbbca1a7226046110f2a1e5fb4d970aa7751911f4535192e4a65e87f618d422fdb35173be4ee9c09dc21f4b0028f1c477ee31dead29d434de05
+  metadata.gz: 2df5b8e3fdcb0c7bc55021231cbc06b077892de1a0cea5cdcbda979bdc7f94875a980520c67ca2e786c2ef5fb68780988c93d5ccf4e650bf67bbd108e3363ecf
+  data.tar.gz: 70137f6debdd292c3b9bc5b443e740e849fef83ec35175e154f8b0feb84211537dab1508b0f5427ac23f182c8e917df583a1bd6d3c1236ce2c163fb36a92cbb1

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 script: bundle exec rake
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - ree
   - ruby-head
   - rbx-18mode

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Willem van Bergen
+Copyright (c) 2010-2014 Willem van Bergen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,4 +1,4 @@
-= OilyPNG
+= OilyPNG {<img src="https://travis-ci.org/wvanbergen/oily_png.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/wvanbergen/oily_png]
 
 OilyPNG is a Ruby C extension to speed up the pure Ruby ChunkyPNG library. It is a standalone
 module, so it does not require LibPNG, ImageMagick or any other library. Currently it has an 

data/ext/oily_png/color.c

@@ -1,4 +1,5 @@
 #include "oily_png_ext.h"
+#include <math.h>
 
 PIXEL oily_png_compose_color(PIXEL fg, PIXEL bg) {
   BYTE a_com, new_r, new_g, new_b, new_a;
@@ -37,6 +38,15 @@ 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)));
 }
 
+VALUE oily_png_euclidean_distance_rgba(VALUE self, VALUE color_after, VALUE color_before) {
+  UNUSED_PARAMETER(self);
+
+  return rb_float_new(sqrt(pow((R_BYTE(NUM2UINT(color_after)) - R_BYTE(NUM2UINT(color_before))), 2) +
+                           pow((G_BYTE(NUM2UINT(color_after)) - G_BYTE(NUM2UINT(color_before))), 2) +
+                           pow((B_BYTE(NUM2UINT(color_after)) - B_BYTE(NUM2UINT(color_before))), 2) +
+                           pow((A_BYTE(NUM2UINT(color_after)) - A_BYTE(NUM2UINT(color_before))), 2)));
+}
+
 VALUE oily_png_color_r(VALUE self, VALUE value) {
   UNUSED_PARAMETER(self);
   return INT2FIX(R_BYTE(NUM2UINT(value)));

data/ext/oily_png/color.h

@@ -20,6 +20,9 @@ VALUE oily_png_color_compose_quick(VALUE self, VALUE fg_color, VALUE bg_color);
 PIXEL oily_png_compose_color(PIXEL fg, PIXEL bg);
 PIXEL oily_png_color_interpolate_quick(PIXEL fg, PIXEL bg, int alpha);
 
+/* Color comparison */
+VALUE oily_png_euclidean_distance_rgba(VALUE self, VALUE color_after, VALUE color_before);
+
 /* Accessors */
 VALUE oily_png_color_r(VALUE self, VALUE pixel);
 VALUE oily_png_color_g(VALUE self, VALUE pixel);

data/ext/oily_png/oily_png_ext.c

@@ -20,6 +20,7 @@ void Init_oily_png() {
   // 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);
+  rb_define_method(OilyPNG_Color, "euclidean_distance_rgba", oily_png_euclidean_distance_rgba, 2);
   rb_define_method(OilyPNG_Color, "r", oily_png_color_r, 1);
   rb_define_method(OilyPNG_Color, "g", oily_png_color_g, 1);
   rb_define_method(OilyPNG_Color, "b", oily_png_color_b, 1);
@@ -38,7 +39,9 @@ char oily_png_samples_per_pixel(char color_mode) {
     case OILY_PNG_COLOR_INDEXED:         return 1;
     case OILY_PNG_COLOR_GRAYSCALE_ALPHA: return 2;
     case OILY_PNG_COLOR_TRUECOLOR_ALPHA: return 4;
-    default: rb_raise(rb_eRuntimeError, "Unsupported color mode: %d", color_mode);
+    default:
+      rb_raise(rb_eRuntimeError, "Unsupported color mode: %d", color_mode);
+      return 0;
   }
 }
 

data/ext/oily_png/png_decoding.c

@@ -312,6 +312,7 @@ VALUE oily_png_decode_palette(VALUE self) {
     }
   }
   rb_raise(rb_eRuntimeError, "Could not retrieve a decoding palette for this image!");  
+  return Qnil;
 }
 
 

data/ext/oily_png/png_encoding.c

@@ -236,6 +236,7 @@ VALUE oily_png_encode_palette(VALUE self) {
     }
   }
   rb_raise(rb_eRuntimeError, "Could not retrieve a decoding palette for this image!");
+  return Qnil;
 }
 
 VALUE oily_png_encode_png_image_pass_to_stream(VALUE self, VALUE stream, VALUE color_mode, VALUE bit_depth, VALUE filtering) {

data/ext/oily_png/resampling.c

@@ -178,12 +178,12 @@ VALUE oily_png_canvas_resample_bilinear_bang(VALUE self, VALUE v_new_width, VALU
   PIXEL pixel_top, pixel_bot;
   for (y = 0; y < new_height; y++) {
     y1 = index_y[y] < 0 ? 0 : index_y[y];
-    y2 = y1+1 >= self_height ? self_height-1 : y1+1;
+    y2 = index_y[y]+1 >= self_height ? self_height-1 : index_y[y]+1;
     y_residue = interp_y[y];
 
     for (x = 0; x < new_width; x++) {
       x1 = index_x[x] < 0 ? 0 : index_x[x];
-      x2 = x1+1 >= self_width ? self_height-1 : x1+1;
+      x2 = index_x[x]+1 >= self_width ? self_width-1 : index_x[x]+1;
       x_residue = interp_x[x];
 
       pixel_11 = NUM2UINT(rb_ary_entry(source, y1*self_width + x1));

data/lib/oily_png/version.rb

@@ -1,3 +1,3 @@
 module OilyPNG
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/oily_png.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.extensions    = ["ext/oily_png/extconf.rb"]
   s.require_paths = ["lib", "ext"]
 
-  s.add_runtime_dependency('chunky_png', '~> 1.3.0')
+  s.add_runtime_dependency('chunky_png', '~> 1.3.1')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rake-compiler')

data/spec/color_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe OilyPNG::Color do
-
   include OilyPNG::Color
 
   before(:each) do
@@ -13,26 +12,38 @@ describe OilyPNG::Color do
   end
 
   describe '#compose_quick' do
-
-    it "should use the foregorund color as is when the background color is fully transparent" 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
+    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
+    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
+    it 'should compose pixels correctly' do
       compose_quick(@non_opaque, @white).should == 0x9fc2d6ff
     end
-    
-    it "should compose colors exactly the same as ChunkyPNG" do
+
+    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
+
+  describe '#euclidean_distance_rgba' do
+    let(:color_a) { rand(0xffffffff) }
+    let(:color_b) { rand(0xffffffff) }
+    subject { euclidean_distance_rgba(color_a, color_b) }
+
+    it { should == ChunkyPNG::Color.euclidean_distance_rgba(color_a, color_b) }
+
+    context 'when both colors are the same' do
+      let(:color_b) { color_a }
+      it { should == 0 }
+    end
+  end
+end

data/spec/resampling_spec.rb

@@ -47,5 +47,14 @@ describe OilyPNG::Resampling do
     it "should resample an image to 11x19 as ChunkyPNG does" do
       @reference.resample_bilinear(11,19).should == OilyPNG::Canvas.from_canvas(@reference).resample_bilinear(11,19)
     end
+
+    it "should upsample an image to 88x44 as ChunkyPNG does" do
+      @reference.resample_bilinear(88,44).should == OilyPNG::Canvas.from_canvas(@reference).resample_bilinear(88,44)
+    end
+
+    it "should not crash upsampling tall image" do
+      @reference = ChunkyPNG::Canvas.from_file(resource_file('nonsquaretall.png'))
+      expect { OilyPNG::Canvas.from_canvas(@reference).resample_bilinear(44,88) }.to_not raise_error
+    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: oily_png
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 description: |2
@@ -76,8 +76,8 @@ extensions:
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -138,6 +138,7 @@ files:
 - spec/resources/gray.png
 - spec/resources/interlaced.png
 - spec/resources/nonsquare.png
+- spec/resources/nonsquaretall.png
 - spec/resources/operations.png
 - spec/resources/replaced.png
 - spec/resources/s01i3p01.png
@@ -198,28 +199,28 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - oily_png
-- "--main"
+- --main
 - README.rdoc
-- "--line-numbers"
-- "--inline-source"
+- --line-numbers
+- --inline-source
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oily_png
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Native mixin to speed up ChunkyPNG
@@ -263,6 +264,7 @@ test_files:
 - spec/resources/gray.png
 - spec/resources/interlaced.png
 - spec/resources/nonsquare.png
+- spec/resources/nonsquaretall.png
 - spec/resources/operations.png
 - spec/resources/replaced.png
 - spec/resources/s01i3p01.png