ffi-gmagick 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e772427cb4e7ed886e6297ec02d1cf88676fe5
-  data.tar.gz: 49d2a50de80e00f8a334a209b06ccf6c7992c1ea
+  metadata.gz: b4d35771f4f73c964d3d41cf48d411c6b87556e6
+  data.tar.gz: adf9c47547359d756b9bd142cf94b4bd7e700a53
 SHA512:
-  metadata.gz: 77d85f31f95bd7475d17e42d4ce6c7947c95f36c89a006eb96f974c2d6a024b797f95779c0176526522254d84d22ce9d8624a9f90549e695cc559e104b386262
-  data.tar.gz: a2e6dda11c05124df49d2b7244b52e7934b09466295568a2dd5e36f17ffcdf9b2f85f964caaf83a3ec2cc1c5e35232e353f8c8058bf6da82bc616a88c9eff493
+  metadata.gz: 0d67b0825501d5e4666dc99f776d3ad8fda8d2ccb99e98ccc200fbf9191289c207a47ca5cca2d268d94850226403023461b2d0341fcb876baaf463c23fa5011f
+  data.tar.gz: 3e21e5130fcff8af7ff7ae576f6e6c340999ba0cdc672d9c95c0108490c0ed3d48878da9e66a0ad5ace2b521c84598873a81b31b9a8f7e9877f73ca92b14a9db

data/lib/ffi/gmagick/image.rb

@@ -4,6 +4,7 @@ module FFI
     typedef :pointer, :composite_wand
     typedef :pointer, :blob
     typedef :pointer, :profile
+    typedef :pointer, :gravity
     typedef :string,  :name
     typedef :string,  :filename
     typedef :string,  :format
@@ -58,6 +59,11 @@ module FFI
     attach_function :MagickSetImageDepth,           [ :wand, :depth ], :magick_pass_fail
     attach_function :MagickGetImageSize,            [ :wand ], :ulong
 
+    attach_function :MagickGetNumberImages,         [ :wand ], :ulong
+    attach_function :MagickNextImage,               [ :wand ], :magick_pass_fail
+    attach_function :MagickPreviousImage,           [ :wand ], :magick_pass_fail
+    attach_function :MagickRemoveImage,             [ :wand ], :magick_pass_fail
+
     attach_function :MagickSetCompressionQuality,   [ :wand, :quality ], :magick_pass_fail
     attach_function :MagickStripImage,              [ :wand ], :magick_pass_fail
     attach_function :MagickUnsharpMaskImage,        [ :wand, :radius, :sigma, :amount, :threshold ], :magick_pass_fail
@@ -71,6 +77,7 @@ module FFI
     attach_function :MagickSetImageInterlaceScheme, [ :wand, :interlace_type ], :magick_pass_fail
     attach_function :MagickSetInterlaceScheme,      [ :wand, :interlace_type ], :magick_pass_fail
     attach_function :MagickFlattenImages,           [ :wand ], :wand
+    # attach_function :MagickSetImageGravity,         [ :wand, :gravity ], :magick_pass_fail
     attach_function :MagickMapImage,                [ :wand, :wand, :dither ], :magick_pass_fail
     attach_function :MagickGetImageHistogram,       [ :wand, :pointer ], :pointer
     attach_function :MagickGetImageColors,          [ :wand ], :ulong
@@ -172,6 +179,36 @@ module FFI
       end
       alias_method :length, :size
 
+      # Get the number of bits used to represent a single component of a pixel
+      def depth
+        return FFI::GMagick.MagickGetImageDepth( @wand )
+      end
+
+      # Set the number of bits used to represent a single component of a pixel
+      def depth=(depth=8)
+        @status = FFI::GMagick.MagickSetImageDepth( @wand, depth )
+      end
+
+      # Return the number of images in this wand (sequence)
+      def count
+        return FFI::GMagick.MagickGetNumberImages( @wand )
+      end
+
+      # Go to the next image in the sequence
+      def next
+        @status = FFI::GMagick.MagickNextImage( @wand )
+      end
+
+      # Go to the previous image in the sequence
+      def previous
+        @status = FFI::GMagick.MagickPreviousImage( @wand )
+      end
+
+      # Remove the current image in the sequence
+      def remove
+        @status = FFI::GMagick.MagickRemoveImage( @wand )
+      end
+
       # Return the image format
       def format
         FFI::GMagick.MagickGetImageFormat( @wand )
@@ -216,14 +253,12 @@ module FFI
       def colorspace
         FFI::GMagick.MagickGetImageColorspace( @wand )
       end
-      alias_method :colormodel, :colorspace
 
       # Set the image colorspace to one of the valid
       # <a href="http://www.graphicsmagick.org/api/types.html#colorspacetype">colorspace types</a>.
       def colorspace=(colorspace)
         FFI::GMagick.MagickSetImageColorspace( @wand, colorspace )
       end
-      alias_method :colormodel=, :colorspace=
 
       # Return the information for a specific profile in the image
       def profile(name="ICC")
@@ -269,12 +304,17 @@ module FFI
       end
 
       # Returns the number of unique colors in the image
-      def get_color_count
+      def colorcount
         return FFI::GMagick.MagickGetImageColors( @wand )
       end
 
+      # Replace the colors of an image with the closest color from a reference image.
+      def map(reference_image, dither=0)
+        FFI::GMagick.MagickMapImage( @wand, reference_image.wand, dither )
+      end
+
       # Get a simplified histogram for this image.
-      def get_histogram(web_safe=true)
+      def histogram(web_safe=false)
         new_wand = FFI::GMagick.CloneMagickWand( @wand )
 
         # "WebSafe" colors are built around the original 216 colors defined by Netscape
@@ -285,22 +325,30 @@ module FFI
           FFI::GMagick.DestroyMagickWand( netscape )
         end
 
+        total_color_count = 0.0
         histogram = {}
-        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(max_colors.read_int)
+          pixel_wands = pointer.read_array_of_pointer(number_of_colors)
           pixel_wands.each do |wand|
             pixel = FFI::GMagick::Pixel.new(wand)
             hex_color   = "#%02X%02X%02X" % pixel.get_color.split(",").map(&:to_i)
-            histogram[hex_color] = (pixel.get_color_count / number_of_colors)
+            color_count = pixel.get_color_count
+            total_color_count   += color_count
+            histogram[hex_color] = color_count
           end
         end
         FFI::GMagick.DestroyMagickWand( new_wand )
 
-        return histogram
+        # Convert values to percentage of colors and remove infinitesimal numbers
+        final = {}
+        histogram.map do |k,v|
+          final[k] = (v / total_color_count).round(3) if (v/total_color_count) >= 0.001
+        end
+
+        return final
       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.8"
+    VERSION = "0.0.10"
   end
 end

data/test/image_test.rb

@@ -60,7 +60,6 @@ class ImageTest < MiniTest::Unit::TestCase
 
   def test_colorspace
     assert_equal :RGBColorspace, @image.colorspace, "invalid color space"
-    assert_equal :RGBColorspace, @image.colormodel, "invalid color model"
   end
 
   def test_get_type
@@ -72,6 +71,15 @@ class ImageTest < MiniTest::Unit::TestCase
     assert_equal :PlaneInterlace, @image.interlace, "invalid interlace"
   end
 
+  def test_get_depth
+    assert_equal 8, @image.depth
+  end
+
+  def test_set_depth
+    @image.depth = 2
+    assert_equal 2, @image.depth
+  end
+
   def test_set_type
     skip
     @image.type = :TrueColorType

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gmagick
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Richard Hurt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi