vips 8.12.1 → 8.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872a3771eee6d56c17254a27013a7ff1d002506965bf488fad3d055817457f1a
-  data.tar.gz: 76930aa9a3b5456460be220e3373c3a7ff573a86f18c3e07a3cd4ebbf37614af
+  metadata.gz: 04f3fd36552bb4da990741e7ceabd7c3d45d1f9e46922cdc9395d4eef642ad03
+  data.tar.gz: 448cf9fa2b624c8867d030ed6403b5d4573671a260a2618cf7eed4bf62f1afa8
 SHA512:
-  metadata.gz: 51239e27dfe2b430985f875150abc758f2f4756fca00647e4c976ff36e4569da42a67bf236988bb244c3e4c8d2043d1d2308baceb58833accb0434460fc2ca87
-  data.tar.gz: 11e11cfdece5955686490f861ef20abcfd283d1d2875f5c7212cfabd0bf03aff8589e085e9277b61cd8d0bb71fef6db309617d93134590e574b6817722637d81
+  metadata.gz: fc0f77d035c10ee9760c8c96e4dad26bf776d272e23360b24a4e15e0d6bcc5fdb26cda7e05900b7acd52ab62e602a6a3710be7b1b12b0de6cbcf1d96e88726bf
+  data.tar.gz: e88b05b9b2382d7ecc3ef061a3e96a4a35013e232da294d963b9765ebd0204598352dcda4a09b3f83bdc31538021be8506f17ac5af03f0aeec5ec7f39abdcb2a

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+* add `draw_point!` [jcupitt]
+* add `Vips.tracked_*` for getting file and memory metrics [jeremy]
+* add `Vips.cache_*` for getting cache settings [jeremy]
+* add `Vips.vector?` to get/set SIMD status [jeremy]
+* add `Vips.concurrency` to get/set threadpool size [jeremy]
+* add `Vips.concurrency_default` to get the default threadpool size [jeremy]
+
 ## Version 2.1.4 (2021-10-28)
 
 * `write_to_buffer` tries to use the new target API, then falls back to the old 

data/Gemfile

@@ -4,8 +4,8 @@ source "https://rubygems.org"
 gemspec
 
 group :maintenance, optional: true do
-	gem "bake"
-	gem "bake-gem"
+  gem "bake"
+  gem "bake-gem"
 end
 
 gem "github-markup"

data/README.md

@@ -1,9 +1,15 @@
 # Vips
 
-[![Gem Version](https://badge.fury.io/rb/ruby-vips.svg)](https://badge.fury.io/rb/ruby-vips)
-[![Test](https://github.com/libvips/ruby-vips/workflows/Test/badge.svg)](https://github.com/libvips/ruby-vips/actions?query=workflow%3ATest)
+[![Development](https://github.com/ioquatix/vips/workflows/Development/badge.svg)](https://github.com/libvips/ruby-vips/actions?query=workflow%3ATest)
 
-This gem is a backwards compatible fork of `ruby-vips` but also includes (and compiles) the [libvips] source code.
+This gem is a Ruby binding for the [libvips image processing
+library](https://libvips.github.io/libvips). It has been tested on
+Linux, macOS and Windows, and with ruby 2, ruby 3 and jruby. It uses
+[ruby-ffi](https://github.com/ffi/ffi) to call functions in the libvips
+library.
+
+This fork is compatible witih `ruby-vips` but also includes (and compiles)
+the [libvips] source code.
 
 libvips is a [demand-driven, horizontally
 threaded](https://github.com/libvips/libvips/wiki/Why-is-libvips-quick)
@@ -13,14 +19,32 @@ memory](https://github.com/libvips/libvips/wiki/Speed-and-memory-use).
 libvips is licensed under the [LGPL
 2.1+](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html).
 
-[libvips]: https://libvips.github.io/libvips
+## Install on linux and macOS
 
-## Installation
+Install the libvips binary with your package manager (eg. `apt install
+libvips42` or perhaps `brew install vips`, see the [libvips install
+instructions](https://libvips.github.io/libvips/install.html)) then install
+this gem with:
 
 ``` shell
 $ bundle add vips
 ```
 
+## Install on Windows
+
+The gemspec will pull in the msys libvips for you.
+
+Tested with the ruby and msys from choco, but others may work.
+
+## Example
+
+```ruby
+require "vips"
+
+Or install it yourself as:
+
+	$ gem install vips
+
 You'll still need to install `glib` and `gobject-introspection`.
 
 ## Usage

data/lib/vips/mutableimage.rb

@@ -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/version.rb

@@ -1,4 +1,4 @@
 
 module Vips
-	VERSION = "8.12.1"
+	VERSION = "8.12.2"
 end

data/lib/vips.rb

@@ -27,9 +27,9 @@ def library_name(name, abi_number)
   if FFI::Platform.windows?
     "lib#{name}-#{abi_number}.dll"
   elsif FFI::Platform.mac?
-    "#{name}.#{abi_number}"
+    "lib#{name}.#{abi_number}.dylib"
   else
-    "#{name}.so.#{abi_number}"
+    "lib#{name}.so.#{abi_number}"
   end
 end
 
@@ -570,7 +570,7 @@ require "vips/gvalue"
 module Vips
   extend FFI::Library
 
-  ffi_lib library_name("vips", 42)
+  ffi_lib File.expand_path(library_name("vips", 42), __dir__)
 
   LOG_DOMAIN = "VIPS"
   GLib.set_log_domain LOG_DOMAIN
@@ -625,7 +625,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 +645,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 +712,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
 
-  # 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.
+  # Get the default size of libvips worker pools.
+  def self.concurrency_default
+    DEFAULT_CONCURRENCY
+  end
+
+  # 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 +756,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.

data/vips.gemspec

@@ -15,22 +15,21 @@ Gem::Specification.new do |spec|
 	spec.files         = `git ls-files -z`.split("\x0").reject do |f|
 		f.match(%r{^(test|spec|features)/})
 	end
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+
 	spec.require_paths = ["lib"]
 	
 	spec.required_ruby_version = ">= 2.1"
 
 	spec.extensions = %w[ext/Rakefile]
 
-	spec.add_runtime_dependency "ffi", ["~> 1.12"]
+	spec.add_runtime_dependency "ffi", "~> 1.12"
 
-	spec.add_development_dependency "yard", "~> 0.8"
-	spec.add_development_dependency "redcarpet", "~> 3.3"
-	spec.add_development_dependency "github-markup", "~> 1.4"
+	spec.add_development_dependency "rake", "~> 13.0"
+	spec.add_development_dependency "rspec", "~> 3.3"
+	spec.add_development_dependency "yard", "~> 0.9.11"
+	spec.add_development_dependency "bundler", ">= 1.0"
 
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rspec", "~> 3.7"
-	spec.add_development_dependency "rake"
-	
-	spec.add_development_dependency "standardrb"
+	if Gem.ruby_version >= Gem::Version.new("2.2")
+		spec.add_development_dependency "standard"
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vips
 version: !ruby/object:Gem::Version
-  version: 8.12.1
+  version: 8.12.2
 platform: ruby
 authors:
 - John Cupitt
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,21 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,63 +54,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: standardrb
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -217,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Vips is a high-performance image manipulation library.