vips 8.12.1 → 8.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872a3771eee6d56c17254a27013a7ff1d002506965bf488fad3d055817457f1a
-  data.tar.gz: 76930aa9a3b5456460be220e3373c3a7ff573a86f18c3e07a3cd4ebbf37614af
+  metadata.gz: d6bd237512aae93032374986191fee161225257023c6a25a94a0d3fb9ca94c73
+  data.tar.gz: baf2e85497526b4247f1fdf6b0853241860c6fd1ec7d1002e10a623b5fd66b9c
 SHA512:
-  metadata.gz: 51239e27dfe2b430985f875150abc758f2f4756fca00647e4c976ff36e4569da42a67bf236988bb244c3e4c8d2043d1d2308baceb58833accb0434460fc2ca87
-  data.tar.gz: 11e11cfdece5955686490f861ef20abcfd283d1d2875f5c7212cfabd0bf03aff8589e085e9277b61cd8d0bb71fef6db309617d93134590e574b6817722637d81
+  metadata.gz: c26a85f2626c1c4da2a7221c12d7eb8298ada48cdf2fbbc387ad280e550ad59129de9658c0af4c87be6f6282cefaaeef967fc26b1baba7c69d80f085cdbb9be5
+  data.tar.gz: 2aea627d161349dd7c5bb765118e1689b7b0fa9a09768f5442b8aa8edfd9825f43dca035cbc15693a6fe8d7e2fdc17434c1f833631a341ac2be5341b1d705334

data/.github/workflows/{development.yml → test.yaml}

@@ -1,4 +1,4 @@
-name: Development
+name: Test
 
 on: [push, pull_request]
 
@@ -47,8 +47,7 @@ jobs:
       run: |
         sudo apt-get update -qq -o Acquire::Retries=3
         sudo apt-get install --fix-missing -qq -o Acquire::Retries=3 libvips
-        bundle exec rake ext
     
     - name: Run tests
       timeout-minutes: 5
-      run: ${{matrix.env}} bundle exec rake spec
+      run: ${{matrix.env}} bundle exec rspec

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.15.1"
 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}"
   else
-    "#{name}.so.#{abi_number}"
+    "lib#{name}.so.#{abi_number}"
   end
 end
 
@@ -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

@@ -5,7 +5,6 @@ Gem::Specification.new do |spec|
 	spec.name          = "vips"
 	spec.version       = Vips::VERSION
 	spec.authors       = ["John Cupitt", "Samuel Williams"]
-	spec.email         = ["jcupitt@gmail.com", "samuel.williams@oriontransfer.co.nz"]
 
 	spec.summary       = "Vips is a high-performance image manipulation library."
 	spec.description   = "Provides pre-compiled binaries for libvips."
@@ -15,22 +14,17 @@ 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.extensions = %w[ext/Rakefile]
 
 	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 "bundler"
-	spec.add_development_dependency "rspec", "~> 3.7"
-	spec.add_development_dependency "rake"
-	
-	spec.add_development_dependency "standardrb"
+	spec.add_development_dependency "rake", ["~> 12.0"]
+	spec.add_development_dependency "rspec", ["~> 3.3"]
+	spec.add_development_dependency "yard", ["~> 0.9.11"]
+	spec.add_development_dependency "bundler", [">= 1.0", "< 3"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vips
 version: !ruby/object:Gem::Version
-  version: 8.12.1
+  version: 8.15.1
 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: 2024-02-12 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: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,95 +54,52 @@ 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:
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !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'
+        version: '3'
   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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: standardrb
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Provides pre-compiled binaries for libvips.
 email:
-- jcupitt@gmail.com
-- samuel.williams@oriontransfer.co.nz
 executables: []
-extensions:
-- ext/Rakefile
+extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
-- ".github/workflows/development.yml"
+- ".github/workflows/test.yaml"
 - ".gitignore"
-- ".standard.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - README.md
-- Rakefile
-- TODO
 - example/annotate.rb
 - example/connection.rb
 - example/daltonize8.rb
@@ -158,7 +115,6 @@ files:
 - example/trim8.rb
 - example/watermark.rb
 - example/wobble.rb
-- ext/Rakefile
 - lib/vips.rb
 - lib/vips/access.rb
 - lib/vips/align.rb
@@ -217,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Vips is a high-performance image manipulation library.

data/.standard.yml

@@ -1,17 +0,0 @@
-fix: false              # default: false
-parallel: true          # default: false
-format: progress        # default: Standard::Formatter
-ruby_version: 2.0       # default: RUBY_VERSION
-default_ignores: false  # default: true
-
-ignore:                 # default: []
-  - '**/*':
-    - Standard/SemanticBlocks
-  - 'lib/vips/methods.rb'
-  - '{lib,example}/**/*':
-    - Lint/IneffectiveAccessModifier
-    - Lint/RescueException
-    - Style/GlobalVars
-  - 'spec/**/*':
-      - Lint/BinaryOperatorWithIdenticalOperands
-  - 'vendor/**/*'

data/.travis.yml

@@ -1,57 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-addons:
-  apt:
-    packages:
-      - libexpat1-dev
-      - gettext
-      - libglib2.0-dev
-      - liborc-0.4-dev
-      - libfftw3-dev
-      - liblcms2-dev
-      - libmagickwand-dev
-      - libopenexr-dev
-      - libcfitsio3-dev
-      - libgif-dev
-      - libgsf-1-dev
-      - libmatio-dev
-      - libopenslide-dev
-      - libpango1.0-dev
-      - libpoppler-glib-dev
-      - librsvg2-dev
-      - libwebp-dev
-  homebrew:
-    packages:
-      - glib
-      - libffi
-      - libexif
-    update: true
-
-cache:
-  bundler: true
-  directories: $HOME/vips/ext
-
-matrix:
-  include:
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.6
-      os: osx
-      env: PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
-    - rvm: 2.7
-    - rvm: truffleruby
-    - rvm: jruby-head
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: truffleruby
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-before_script:
-  - bundle exec rake ext
-
-script: 
-  - bundle exec rake

data/Rakefile

@@ -1,33 +0,0 @@
-require "bundler/gem_tasks"
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  warn e.message
-  warn "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require "rake"
-
-require "rspec/core"
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList["spec/**/*_spec.rb"]
-end
-
-task default: :spec
-
-task :ext do
-  Dir.chdir "ext" do
-    sh "rake"
-  end
-end
-
-unless RUBY_PLATFORM.include?("java")
-  require "github/markup"
-  require "yard"
-  require "yard/rake/yardoc_task"
-
-  YARD::Rake::YardocTask.new
-end

data/TODO

@@ -1,43 +0,0 @@
-# Notes
-
-- We should support complex constants, eg: 
-
-	Complex(1, 2)
-	=> (1+2i)
-
-# Common operations
-
-- Lint.
-
-	bundle exec standardrb
-
-- Reinstall local copy of gem after a change.
-
-	bundle exec rake install
-
-- Run test suite.
-
-	bundle exec rake 
-
-- Version bump.
-
-	edit lib/vips/version.rb 
-	edit VERSION
-
-- Regenerate autodocs.
-
-	cd lib/vips
-	ruby > methods.rb
-	require "vips"; Vips::Yard.generate
-	^D
-
-- Regenerate docs.
-
-	bundle exec rake yard
-
-- Push new gem to rubygems, tag repository with version.
-
-	bundle exec rake release
-
-  You'll be asked for a otp from authy / google authenticator / etc. 
-

data/ext/Rakefile

@@ -1,35 +0,0 @@
-
-require_relative '../lib/vips/version'
-
-version = Vips::VERSION[/\d+\.\d+\.\d+/]
-archive_path = "vips-#{version}.tar.gz"
-source_path = "vips-#{version}"
-prefix = ENV['PREFIX'] || File.dirname(__dir__)
-
-task :fetch do
-	url = "https://github.com/libvips/libvips/releases/download/v#{version}/#{archive_path}"
-
-	unless File.exist? archive_path
-		sh "wget #{url} -O #{archive_path}"
-	end
-end
-
-task :extract do
-	unless File.exist? source_path
-		sh "tar -xvf #{archive_path}"
-	end
-end
-
-task :build do
-	Dir.chdir source_path do
-		sh "./configure --prefix=#{prefix} --exec-prefix=#{prefix}"
-		sh "make install"
-	end
-end
-
-task :clean do
-	FileUtils.rm_rf archive_path
-	FileUtils.rm_rf source_path
-end
-
-task :default => [:fetch, :extract, :build]