ruby-vips 2.1.4 → 2.2.4

data/lib/vips/mutableimage.rb

@@ -58,7 +58,7 @@ module Vips
       # See also the comment on set_type! before changing this.
       pointer = copy_image.ptr
       ::GObject.g_object_ref pointer
-      super pointer
+      super(pointer)
 
       # and save the copy ready for when we finish mutating
       @image = copy_image
@@ -96,6 +96,13 @@ module Vips
       Vips::Operation.call name.to_s, [self, *args], options
     end
 
+    # Draw a point on an image.
+    #
+    # See {Image#draw_rect}.
+    def draw_point! ink, left, top, **opts
+      draw_rect! ink, left, top, 1, 1, **opts
+    end
+
     # Create a metadata item on an image of the specifed type. Ruby types
     # are automatically transformed into the matching glib type (eg.
     # {GObject::GINT_TYPE}), if possible.

data/lib/vips/object.rb

@@ -9,9 +9,6 @@ require "ffi"
 module Vips
   private
 
-  # debugging support
-  attach_function :vips_object_print_all, [], :void
-
   # we must init these by hand, since they are usually made on first image
   # create
   attach_function :vips_band_format_get_type, [], :GType
@@ -337,6 +334,7 @@ module Vips
       ArgumentClassPtr.ptr, ArgumentInstancePtr.ptr],
     :int
 
+  # debugging support
   attach_function :vips_object_print_all, [], :void
 
   attach_function :vips_object_set_from_string, [:pointer, :string], :int

data/lib/vips/operation.rb

@@ -151,7 +151,7 @@ module Vips
         flags = details[:flags]
         gtype = details[:gtype]
 
-        details[:yard_name] = arg_name == "in" ? "im" : arg_name
+        details[:yard_name] = (arg_name == "in") ? "im" : arg_name
         pspec = @op.get_pspec arg_name
         details[:blurb] = GObject.g_param_spec_get_blurb pspec
 
@@ -218,7 +218,7 @@ module Vips
         raise Vips::Error if value.null?
       end
 
-      super value
+      super
     end
 
     def build
@@ -283,7 +283,7 @@ module Vips
         value = value.map { |x| Operation.imageize match_image, x }
       end
 
-      super name, value
+      super(name, value)
     end
 
     public
@@ -440,14 +440,12 @@ module Vips
         end
       end
 
-      # collect a list of all input references here
-      references = Set.new
+      # dedupe all input references here
+      deduped_references = Set.new
 
       add_reference = lambda do |x|
         if x.is_a?(Vips::Image)
-          x.references.each do |i|
-            references << i
-          end
+          deduped_references.merge x.references
         end
         false
       end
@@ -482,20 +480,27 @@ module Vips
 
       op = op.build
 
+      # we need an array of references for output objects
+      references = deduped_references.to_a
+
       # attach all input refs to output x
       set_reference = lambda do |x|
+        # stop early if there are no refs to attach
+        return true if references == []
+
         if x.is_a? Vips::Image
-          x.references += references
+          references.each { |i| x.references << i }
         end
+
         false
       end
 
       # get all required results
       result = []
       required_output.each do |details|
-        value = details[:arg_name]
+        value = op.get(details[:arg_name])
         flat_find value, &set_reference
-        result << op.get(value)
+        result << value
       end
 
       # fetch all optional ones

data/lib/vips/region.rb

@@ -44,10 +44,10 @@ module Vips
     end
 
     def initialize(name)
-      ptr = Vips.vips_region_new name
-      raise Vips::Error if ptr.null?
+      pointer = Vips.vips_region_new name
+      raise Vips::Error if pointer.null?
 
-      super ptr
+      super(pointer)
     end
 
     def width

data/lib/vips/sourcecustom.rb

@@ -47,7 +47,7 @@ module Vips
       pointer = Vips.vips_source_custom_new
       raise Vips::Error if pointer.null?
 
-      super pointer
+      super(pointer)
     end
 
     # The block is executed to read data from the source. The interface is

data/lib/vips/targetcustom.rb

@@ -47,7 +47,7 @@ module Vips
       pointer = Vips.vips_target_custom_new
       raise Vips::Error if pointer.null?
 
-      super pointer
+      super(pointer)
     end
 
     # The block is executed to write data to the source. The interface is

data/lib/vips/version.rb

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

data/lib/vips.rb

@@ -33,6 +33,30 @@ def library_name(name, abi_number)
   end
 end
 
+# we can sometimes get dependent libraries from libvips -- either the platform
+# will open dependencies for us automatically, or the libvips binary has been
+# built to includes all main dependencies (common on windows, can happen
+# elsewhere)
+#
+# we must get glib functions from libvips if we can, since it will be the
+# one that libvips itself is using, and they will share runtime types
+module Vips
+  extend FFI::Library
+
+  ffi_lib library_name("vips", 42)
+
+  begin
+    attach_function :g_malloc, [:size_t], :pointer
+    @@is_unified = true
+  rescue FFI::NotFoundError
+    @@is_unified = false
+  end
+
+  def self.unified?
+    @@is_unified
+  end
+end
+
 module GLib
   class << self
     attr_accessor :logger
@@ -42,7 +66,11 @@ module GLib
 
   extend FFI::Library
 
-  ffi_lib library_name("glib-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("glib-2.0", 0)
+  end
 
   attach_function :g_malloc, [:size_t], :pointer
 
@@ -134,7 +162,11 @@ end
 module GObject
   extend FFI::Library
 
-  ffi_lib library_name("gobject-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("gobject-2.0", 0)
+  end
 
   # we can't just use ulong, windows has different int sizing rules
   if FFI::Platform::ADDRESS_SIZE == 64
@@ -568,9 +600,7 @@ require "vips/gvalue"
 # {Image#median}.
 
 module Vips
-  extend FFI::Library
-
-  ffi_lib library_name("vips", 42)
+  # we've already opened the libvips library
 
   LOG_DOMAIN = "VIPS"
   GLib.set_log_domain LOG_DOMAIN
@@ -625,7 +655,12 @@ module Vips
 
   attach_function :vips_leak_set, [:int], :void
   attach_function :vips_vector_set_enabled, [:int], :void
+  attach_function :vips_vector_isenabled, [], :int
   attach_function :vips_concurrency_set, [:int], :void
+  attach_function :vips_concurrency_get, [], :int
+
+  # Track the original default concurrency so we can reset to it.
+  DEFAULT_CONCURRENCY = vips_concurrency_get
 
   # vips_foreign_get_suffixes was added in libvips 8.8
   begin
@@ -640,20 +675,66 @@ module Vips
     vips_leak_set((leak ? 1 : 0))
   end
 
+  attach_function :vips_tracked_get_mem, [], :int
+  attach_function :vips_tracked_get_mem_highwater, [], :int
+  attach_function :vips_tracked_get_allocs, [], :int
+  attach_function :vips_tracked_get_files, [], :int
+  attach_function :vips_cache_get_max, [], :int
+  attach_function :vips_cache_get_max_mem, [], :int
+  attach_function :vips_cache_get_max_files, [], :int
   attach_function :vips_cache_set_max, [:int], :void
   attach_function :vips_cache_set_max_mem, [:int], :void
   attach_function :vips_cache_set_max_files, [:int], :void
+  attach_function :vips_cache_print, [], :void
+  attach_function :vips_cache_drop_all, [], :void
+
+  # Get the number of bytes currently allocated via vips_malloc.
+  def self.tracked_mem
+    vips_tracked_get_mem
+  end
+
+  # Get the greatest number of bytes ever actively allocated via vips_malloc.
+  def self.tracked_mem_highwater
+    vips_tracked_get_mem_highwater
+  end
+
+  # Get the number of active allocations.
+  def self.tracked_allocs
+    vips_tracked_get_allocs
+  end
+
+  # Get the number of open files.
+  def self.tracked_files
+    vips_tracked_get_files
+  end
+
+  # Get the maximum number of operations that libvips should cache.
+  def self.cache_max
+    vips_cache_get_max
+  end
+
+  # Get the maximum amount of memory that libvips uses for the operation cache.
+  def self.cache_max_mem
+    vips_cache_get_max_mem
+  end
+
+  # Get the maximum number of files libvips keeps open in the operation cache.
+  def self.cache_max_files
+    vips_cache_get_max_files
+  end
 
   # Set the maximum number of operations that libvips should cache. Set 0 to
   # disable the operation cache. The default is 1000.
   def self.cache_set_max size
     vips_cache_set_max size
+    cache_max
   end
 
   # Set the maximum amount of memory that libvips should use for the operation
   # cache. Set 0 to disable the operation cache. The default is 100mb.
   def self.cache_set_max_mem size
     vips_cache_set_max_mem size
+    cache_max_mem
   end
 
   # Set the maximum number of files libvips should keep open in the
@@ -661,12 +742,43 @@ module Vips
   # 100.
   def self.cache_set_max_files size
     vips_cache_set_max_files size
+    cache_max_files
+  end
+
+  # Print the libvips operation cache to stdout. Handy for debugging.
+  def self.cache_print # :nodoc:
+    vips_cache_print
+  end
+
+  # Drop the libvips operation cache. Handy for leak tracking.
+  def self.cache_drop_all # :nodoc:
+    vips_cache_drop_all
+  end
+
+  # Get the size of libvips worker pools. Defaults to the VIPS_CONCURRENCY env
+  # var or the number of hardware threads on your computer.
+  def self.concurrency
+    vips_concurrency_get
+  end
+
+  # Get the default size of libvips worker pools.
+  def self.concurrency_default
+    DEFAULT_CONCURRENCY
   end
 
-  # Set the size of the libvips worker pool. This defaults to the number of
-  # hardware threads on your computer. Set to 1 to disable threading.
+  # Set the size of each libvips worker pool. Max 1024 threads. Set to 1 to
+  # disable threading. Set to 0 or nil to reset to default.
   def self.concurrency_set n
+    n = DEFAULT_CONCURRENCY if n.to_i == 0
     vips_concurrency_set n
+    concurrency
+  end
+
+  # Whether SIMD and the run-time compiler are enabled. This can give a nice
+  # speed-up, but can also be unstable on some systems or with some versions
+  # of the run-time compiler.
+  def self.vector?
+    vips_vector_isenabled == 1
   end
 
   # Enable or disable SIMD and the run-time compiler. This can give a nice
@@ -674,6 +786,7 @@ module Vips
   # of the run-time compiler.
   def self.vector_set enabled
     vips_vector_set_enabled(enabled ? 1 : 0)
+    vector?
   end
 
   # Deprecated compatibility function.
@@ -696,6 +809,31 @@ module Vips
     major > x || (major == x && minor >= y)
   end
 
+  if at_least_libvips?(8, 13)
+    attach_function :vips_block_untrusted_set, [:int], :void
+    attach_function :vips_operation_block_set, [:string, :int], :void
+
+    # Block/unblock all untrusted operations from running.
+    # Use `vips -l` at the command-line to see the class hierarchy and which operations are marked as untrusted.
+    def self.block_untrusted(state)
+      vips_block_untrusted_set(state ? 1 : 0)
+    end
+
+    # Block/unblock all operations in the libvips class hierarchy at specified *operation_name* and below.
+    #
+    # For example this will block all loaders except JPEG
+    #
+    #   Vips.block("VipsForeignLoad", true);
+    #   Vips.block("VipsForeignLoadJpeg", false)
+    #
+    # Use `vips -l` at the command-line to see the class hierarchy.
+    # This call does nothing if the named operation is not found.
+    #
+    def self.block(operation_name, state)
+      vips_operation_block_set(operation_name, state ? 1 : 0)
+    end
+  end
+
   # Get a list of all supported file suffixes.
   #
   # @return [[String]] array of supported suffixes

data/ruby-vips.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "ffi", ["~> 1.12"]
+  spec.add_runtime_dependency "logger"
 
   spec.add_development_dependency "rake", ["~> 12.0"]
   spec.add_development_dependency "rspec", ["~> 3.3"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.4
 platform: ruby
 authors:
 - John Cupitt
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +126,7 @@ extra_rdoc_files:
 - TODO
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".standard.yml"
@@ -135,6 +149,7 @@ files:
 - example/example5.rb
 - example/inheritance_with_refcount.rb
 - example/progress.rb
+- example/revalidate.rb
 - example/thumb.rb
 - example/trim8.rb
 - example/watermark.rb
@@ -189,7 +204,6 @@ metadata:
   homepage_uri: http://github.com/libvips/ruby-vips
   source_code_uri: https://github.com/libvips/ruby-vips
   msys2_mingw_dependencies: libvips
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A fast image processing library with low memory needs
 test_files: []