rmagick-image_colors 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06412df0aaa6381741d700663e7d92dfb0c98f5c
-  data.tar.gz: dc75393dfc7187ba9658307cc1861eb81712a22a
+  metadata.gz: 2f8a4f9337ab4c384fd526c577232638a79a9670
+  data.tar.gz: 76143c368cff08247184ce34b5c9aa7dab1e27cf
 SHA512:
-  metadata.gz: 17d9f5de9dabbf61d4b9420704e2efc3268548160b9a3842db603a0924f2cdc3edaadae278fa3bba2541b4b5b2ac7f5de5458903dbb0dbc099b17edad0ca58ad
-  data.tar.gz: ae853ecd406c1ddd6a0eb579396383094c69d877dce82761f08c902aadd4cd539ed41815225f5910040fae645febfe145510b814ed4c056ac365fd01c025698b
+  metadata.gz: 4cd3bc09c4b6c09fb5dd543f0aeca3db305068cdca6b0caacf9c2bb32341c2f1052e3fc8e04a50e5c064e53087e90b02d1740bae3a0a52c8fbe06a86c467a2af
+  data.tar.gz: cbd84dd404bc94afc6c689957b5974400c83b3df9da9c409dd4bc8e227db02b66f5e9054919c433025657822b74aa7e45835b5ef6c68d16346ea2fce9760463d

data/lib/rmagick/image_colors/version.rb

@@ -1,5 +1,5 @@
 module Magick
   class ImageColors
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/rmagick/image_colors.rb

@@ -19,18 +19,20 @@ module Magick
 
     private
     def aggregate(&block)
-      colors = {}
       depth = @image.depth
-      @image.color_histogram.each do |pixel|
-        if block_given?
-          color = block.call(pixel)
-        else
-          color = pixel[0].to_color(Magick::AllCompliance, false, depth, true)
-        end
-        colors[color] ||= 0
-        colors[color] += pixel[1]
-      end
-      @colors = colors.sort{|a, b| b[1] <=> a[1]}
+      @colors = @image.color_histogram.inject({}) do |colors, pixel|
+                  color = if block_given?
+                            block.call(pixel, depth)
+                          else
+                            pixel[0].to_color(Magick::AllCompliance, false, depth, true)
+                          end
+
+                  next if color.nil?
+
+                  colors[color] ||= 0
+                  colors[color] += pixel[1]
+                  colors
+                end.sort{|a, b| b[1] <=> a[1]}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick-image_colors
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - shiro16