ffi-gmagick 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd0e82c18ae40fdac196a30427d057c0d7ef6c4
-  data.tar.gz: 8c5ecdd6bb78c1e3bb5186b9a69370d1036fe8ba
+  metadata.gz: 30e772427cb4e7ed886e6297ec02d1cf88676fe5
+  data.tar.gz: 49d2a50de80e00f8a334a209b06ccf6c7992c1ea
 SHA512:
-  metadata.gz: fadf91e22cac1576821a48d0f5b3b71984a2c5f7e81f2f247cde323f87896db0add2eba15e2177b8d94b6058051860a0313a6011136ae79252f18094d2bb5af3
-  data.tar.gz: 69ec4bc5171084bdca4856083e5057e679bc8626c7842cf7af3a8ebbfc3f5c1457b1a691ee112402136e17d253f005e2e82335c2625d11819c08b59ebd5ad462
+  metadata.gz: 77d85f31f95bd7475d17e42d4ce6c7947c95f36c89a006eb96f974c2d6a024b797f95779c0176526522254d84d22ce9d8624a9f90549e695cc559e104b386262
+  data.tar.gz: a2e6dda11c05124df49d2b7244b52e7934b09466295568a2dd5e36f17ffcdf9b2f85f964caaf83a3ec2cc1c5e35232e353f8c8058bf6da82bc616a88c9eff493

data/lib/ffi/gmagick/image.rb

@@ -73,6 +73,7 @@ module FFI
     attach_function :MagickFlattenImages,           [ :wand ], :wand
     attach_function :MagickMapImage,                [ :wand, :wand, :dither ], :magick_pass_fail
     attach_function :MagickGetImageHistogram,       [ :wand, :pointer ], :pointer
+    attach_function :MagickGetImageColors,          [ :wand ], :ulong
 
     attach_function :MagickResizeImage,             [ :wand, :columns, :rows, :filter_type, :blur ], :magick_pass_fail
     attach_function :MagickResampleImage,           [ :wand, :x_resolution, :y_resolution, :filter_type, :blur ], :magick_pass_fail
@@ -267,6 +268,11 @@ module FFI
         return FFI::GMagick::Image.new(local_wand)
       end
 
+      # Returns the number of unique colors in the image
+      def get_color_count
+        return FFI::GMagick.MagickGetImageColors( @wand )
+      end
+
       # Get a simplified histogram for this image.
       def get_histogram(web_safe=true)
         new_wand = FFI::GMagick.CloneMagickWand( @wand )
@@ -280,24 +286,21 @@ module FFI
         end
 
         histogram = {}
-        total_color_count = 0.0
+        number_of_colors = FFI::GMagick.MagickGetImageColors(new_wand).to_f
+
         FFI::MemoryPointer.new(:ulong, 1) do |max_colors|
           pointer   = FFI::GMagick.MagickGetImageHistogram( new_wand, max_colors )
-          number_of_colors  = max_colors.read_int
 
-          pixel_wands = pointer.read_array_of_pointer(number_of_colors)
+          pixel_wands = pointer.read_array_of_pointer(max_colors.read_int)
           pixel_wands.each do |wand|
             pixel = FFI::GMagick::Pixel.new(wand)
             hex_color   = "#%02X%02X%02X" % pixel.get_color.split(",").map(&:to_i)
-            color_count = pixel.get_color_count
-            total_color_count   += color_count
-            histogram[hex_color] = color_count
+            histogram[hex_color] = (pixel.get_color_count / number_of_colors)
           end
         end
         FFI::GMagick.DestroyMagickWand( new_wand )
 
-        # Convert distribution to %
-        return histogram.map{|k,v| {k => v / total_color_count}}
+        return histogram
       end
 
       # Change the quality (compression) of the image

data/lib/ffi/gmagick/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module GMagick
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gmagick
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Richard Hurt