ruby-vips 2.1.0 → 2.1.4

data/lib/vips/mutableimage.rb

@@ -53,8 +53,9 @@ module Vips
       # it's the thing we return at the end of the mutate block.
       copy_image = image.copy
 
-      # use ptr since we need the raw unwrapped pointer inside the image ...
-      # and make the ref that gobject will unref when it finishes
+      # Use ptr since we need the raw unwrapped pointer inside the image ...
+      # and make the ref that gobject will unref when it finishes.
+      # See also the comment on set_type! before changing this.
       pointer = copy_image.ptr
       ::GObject.g_object_ref pointer
       super pointer
@@ -79,7 +80,7 @@ module Vips
     end
 
     def respond_to_missing? name, include_all = false
-      # respond to all vips operations by nickname
+      # Respond to all vips operations by nickname.
       return true if Vips.type_find("VipsOperation", name.to_s) != 0
 
       super
@@ -115,7 +116,21 @@ module Vips
       gvalue = GObject::GValue.alloc
       gvalue.init gtype
       gvalue.set value
-      Vips.vips_image_set self, name, gvalue
+
+      # libvips 8.9.1 had a terrible misfeature which would block metadata
+      # modification unless the object had a ref_count of 1. MutableImage
+      # will always have a ref_count of at least 2 (the parent gobject keeps a
+      # ref, and we keep a ref to the copy ready to return to our caller),
+      # so we must temporarily drop the refs to 1 around metadata changes.
+      #
+      # See https://github.com/libvips/ruby-vips/issues/291
+      begin
+        ::GObject.g_object_unref ptr
+        Vips.vips_image_set self, name, gvalue
+      ensure
+        ::GObject.g_object_ref ptr
+      end
+
       gvalue.unset
     end
 
@@ -148,7 +163,11 @@ module Vips
     #
     # @param name [String] Metadata field to remove
     def remove! name
+      # See set_type! for an explanation. Image#remove can't throw an
+      # exception, so there's no need to ensure we unref.
+      ::GObject.g_object_unref ptr
       Vips.vips_image_remove self, name
+      ::GObject.g_object_ref ptr
     end
   end
 end

data/lib/vips/object.rb

@@ -64,11 +64,8 @@ module Vips
 
   MARSHAL_PROGRESS = proc do |handler|
     FFI::Function.new(:void, [:pointer, :pointer, :pointer]) do |vi, prog, cb|
-      begin
-        handler.call(Progress.new(prog))
-      rescue Exception => e
-        puts "progress: #{e}"
-      end
+      # this can't throw an exception, so no catch is necessary
+      handler.call(Progress.new(prog))
     end
   end
 
@@ -113,11 +110,8 @@ module Vips
 
   MARSHAL_FINISH = proc do |handler|
     FFI::Function.new(:void, [:pointer, :pointer]) do |i, cb|
-      begin
-        handler.call
-      rescue Exception => e
-        puts "finish: #{e}"
-      end
+      # this can't throw an exception, so no catch is necessary
+      handler.call
     end
   end
 

data/lib/vips/operation.rb

@@ -48,7 +48,8 @@ module Vips
   class Introspect
     attr_reader :name, :description, :flags, :args, :required_input,
       :optional_input, :required_output, :optional_output, :member_x,
-      :method_args, :vips_name, :destructive
+      :method_args, :vips_name, :destructive, :doc_optional_input,
+      :doc_optional_output
 
     @@introspect_cache = {}
 
@@ -142,6 +143,8 @@ module Vips
       @flags = Vips.vips_operation_get_flags @op
       @member_x = nil
       @method_args = []
+      @doc_optional_input = {}
+      @doc_optional_output = {}
 
       @args.each do |details|
         arg_name = details[:arg_name]
@@ -164,6 +167,17 @@ module Vips
           end
         end
       end
+
+      # and make the arg sets to document by filtering out deprecated args
+      @optional_input.each do |arg_name, details|
+        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
+        @doc_optional_input[details[:arg_name]] = details
+      end
+
+      @optional_output.each do |arg_name, details|
+        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
+        @doc_optional_output[details[:arg_name]] = details
+      end
     end
 
     def self.get name

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module Vips
-  VERSION = "2.1.0"
+  VERSION = "2.1.4"
 end

data/lib/vips.rb

@@ -575,10 +575,17 @@ module Vips
   LOG_DOMAIN = "VIPS"
   GLib.set_log_domain LOG_DOMAIN
 
-  typedef :ulong, :GType
+  # we can't just use ulong, windows has different int sizing rules
+  if FFI::Platform::ADDRESS_SIZE == 64
+    typedef :uint64, :GType
+  else
+    typedef :uint32, :GType
+  end
 
   attach_function :vips_error_buffer, [], :string
   attach_function :vips_error_clear, [], :void
+  attach_function :vips_error_freeze, [], :void
+  attach_function :vips_error_thaw, [], :void
 
   # The ruby-vips error class.
   class Error < RuntimeError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: A fast image processing library with low memory needs