colorfulness 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61edbcd378454f2eebe6c3ee9055205060b35ad6
-  data.tar.gz: ae0a4ab32b49c0f02705e84811aa2062c76ebc50
+  metadata.gz: f2417ae2a64e9c33b18e606fca5ae0f5904e70a6
+  data.tar.gz: 9dbf0801a1899e7455af35ab0c69378c4e9b3b1d
 SHA512:
-  metadata.gz: 3dfb82ba53fe752bc7970525e92e9dc03b3c8fd783e676ccfad4634f2936d84bc53e86ac13b153c2f301f4a2dfdf08357f67ff029c5397095b1dc00e6d1dfcf2
-  data.tar.gz: 38fda323aacfd78123f92066cc8e5c5a1bf2efbc63243dc7399f9880caf964a55eaba5bda79ab7b774d13fa1a0210252a8ae7781dfdb042057d7b487f071d00a
+  metadata.gz: 3c5fcef63c62b055f865d641e63c3b00f82503a7da6c51bd8a3218609352d75df0b3a42b6875d516c54015da68e3cd9f02616a4ed204f0b2c9c602b23d77a6fb
+  data.tar.gz: ea1baaf6de2468a380f80013c638c16e18653f21417d6759d7fa46dbeafe1547478ba1951aad6a31a3009976af81d95d55197c82735a4e01c4a481a54ebb4d85

data/colorfulness.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "colorfulness"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Tom Taylor"]
   s.email       = ["tom@tomtaylor.co.uk"]
   s.homepage    = "https://github.com/tomtaylor/colorfulness"

data/lib/colorfulness/calculator.rb

@@ -4,8 +4,12 @@ require 'oily_png'
 module Colorfulness
   class Calculator
 
-    def initialize(image)
+    # Initialize the Calculator with a ChunkyPNG::Image, and an optional
+    # background color to composite against, to remove the alpha component, if
+    # any.
+    def initialize(image, background_color = ChunkyPNG::Color::WHITE)
       @image = image
+      @background_color = background_color
     end
 
     # Technique from https://gist.github.com/zabela/8539116, a MATLAB
@@ -17,8 +21,13 @@ module Colorfulness
 
       (0...@image.width).each do |x|
         (0...@image.height).each do |y|
+          # Gets the integer RGB value
           pixel = @image.get_pixel(x, y)
-          rgb = ChunkyPNG::Color.to_truecolor_bytes(pixel)
+          # Compose the pixel against a background color to remove the alpha
+          # component.
+          flat_pixel = ChunkyPNG::Color.compose(pixel, @background_color)
+          rgb = ChunkyPNG::Color.to_truecolor_bytes(flat_pixel)
+          # Convert each component to float values between 0 and 1
           r, g, b = rgb.map { |c| c.to_f / ChunkyPNG::Color::MAX }
 
           rg << (r - g).abs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorfulness
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png