dragonfly_libvips 2.5.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff758f1df0a5d5e76957e22e4408a990e16e2e80627b4c1cc29fbe5fd8e2a6ac
-  data.tar.gz: ccb9ffe5f11e224e4672994f84dd48e3dd5157205ccac4acc543b23c51c71230
+  metadata.gz: ac08b81580206004f1709059bb96da651d90e5e8868180034ed75456f41f63e9
+  data.tar.gz: ff3c231366b1e0da6b958e5c5527fd3294d78e416efd233dda967cb31dcf413e
 SHA512:
-  metadata.gz: 2c23ab254f3191a1c65db60aeab578aa3be6365d7cd24ce98a1ed80f08d3eed6557d4b9126cf9ff0b76e82e499d605c54dbf0c2ba4b79ac11fe7dfe67607f885
-  data.tar.gz: 3c97170ab5e17b824843e2936f9ddd2298b4a8fc1a8f1d48f8ddff166cbf6a7f092f71e16e932fb58f2b600661a701898094d1c13194c5c6fd2d112cb103fe5c
+  metadata.gz: 1713ef73b5bf75c09c8bb6dabfacc44e4dd182027a1e07739e909cc6342e5a23216ba17d071548f64c4c127a2b874ef90fff6d12ec75e1544d609c69319ce871
+  data.tar.gz: d7fc776e24bf6c08c184d3db39673226e902b6618ef3f617558aab57fae57b4e6011c60227afae3e86dfc0d7279f847d1b2aef8abbc84ef15d69d2bc1924323c

data/.github/workflows/test.yml

@@ -1,22 +1,22 @@
 name: Test
-on: [push, pull_request]
+on:
+  pull_request:
+    branches: ["master"]
+  push:
+    branches: ["master"]
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.2']
+        ruby: ['3.2', '3.3', '3.4']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: |
           sudo apt-get clean
           sudo apt-get update
-          sudo apt-get install -y gobject-introspection libgirepository1.0-dev libglib2.0-dev libpoppler-glib-dev libgif-dev
-          curl -OL https://github.com/libvips/libvips/releases/download/v8.13.3/vips-8.13.3.tar.gz
-          tar zxvf vips-8.13.3.tar.gz && cd vips-8.13.3 && ./configure $1 && sudo make && sudo make install
-          export GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0/
-          sudo ldconfig
+          sudo apt-get install -y gobject-introspection libgirepository1.0-dev libglib2.0-dev libpoppler-glib-dev libgif-dev libvips-tools
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.4.5

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.3
+ruby 3.4.5

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 2.6.1
+
+* Fix auto_profile implementation in thumb processor by @asgerb
+
+## 2.6.0
+
+* Add auto_profile configuration option by @asgerb
+* Fix output not having the ICC profile embedded by @asgerb
+
 ## 2.5.1
 
 * Update all DragonflyLibvips.symbolize_keys to new syntax by @Bartuz

data/dragonfly_libvips.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dragonfly", "~> 1.0"
   spec.add_dependency "ruby-vips", "~> 2.0", ">= 2.0.16"
+  spec.add_dependency "base64"
 
   spec.add_development_dependency "bundler" # , '~> 2.0'
   spec.add_development_dependency "rb-readline"
@@ -29,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "rake"
-
   spec.add_development_dependency "lefthook"
   spec.add_development_dependency "rubocop-rails_config"
 end

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -29,6 +29,7 @@ module DragonflyLibvips
           "height" => height,
           "xres" => xres,
           "yres" => yres,
+          "has_alpha" => img.has_alpha?,
           "progressive" => (content.mime_type == "image/jpeg" && img.get("jpeg-multiscan") != 0)
         }
       end

data/lib/dragonfly_libvips/processors/encode.rb

@@ -32,7 +32,7 @@ module DragonflyLibvips
         output_options = options.fetch("output_options", {})
         if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
           output_options.delete("profile")
-        else
+        elsif DragonflyLibvips.auto_profile
           output_options["profile"] ||= input_options.fetch("profile", EPROFILE_PATH)
         end
         output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
@@ -40,6 +40,15 @@ module DragonflyLibvips
 
         img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
 
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
           img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
           "name" => "temp.#{format}",

data/lib/dragonfly_libvips/processors/extract_area.rb

@@ -22,7 +22,7 @@ module DragonflyLibvips
         output_options = options.fetch("output_options", {})
         if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
           output_options.delete("profile")
-        else
+        elsif DragonflyLibvips.auto_profile
           output_options["profile"] ||= input_options.fetch("profile", EPROFILE_PATH)
         end
         output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
@@ -31,6 +31,15 @@ module DragonflyLibvips
         img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
         img = img.extract_area(x, y, width, height)
 
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
           img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
           "name" => "temp.#{format}",

data/lib/dragonfly_libvips/processors/rotate.rb

@@ -22,7 +22,7 @@ module DragonflyLibvips
         output_options = options.fetch("output_options", {})
         if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
           output_options.delete("profile")
-        else
+        elsif DragonflyLibvips.auto_profile
           output_options["profile"] ||= input_options.fetch("profile", EPROFILE_PATH)
         end
         output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
@@ -31,6 +31,15 @@ module DragonflyLibvips
         img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
         img = img.rot("d#{rotate}")
 
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
           img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
           "name" => "temp.#{format}",

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -34,7 +34,7 @@ module DragonflyLibvips
         output_options = options.fetch("output_options", {})
         if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
           output_options.delete("profile")
-        else
+        elsif DragonflyLibvips.auto_profile
           output_options["profile"] ||= input_options.fetch("profile", EPROFILE_PATH)
         end
         output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
@@ -67,6 +67,15 @@ module DragonflyLibvips
         thumbnail_options = thumbnail_options.transform_keys { |k| k.to_sym } # symbolize
         thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, **DragonflyLibvips.symbolize_keys(thumbnail_options))
 
+        if output_options.include?("profile")
+          thumb = thumb.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
           thumb.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
           "name" => "temp.#{format}",

data/lib/dragonfly_libvips/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DragonflyLibvips
-  VERSION = "2.5.1"
+  VERSION = "2.6.1"
 end

data/lib/dragonfly_libvips.rb

@@ -54,6 +54,13 @@ module DragonflyLibvips
     webp
   ]
 
+  class << self
+    # Controls whether output images automatically get an ICC profile attached
+    attr_accessor :auto_profile
+  end
+
+  self.auto_profile ||= true
+
   private
     def self.stringify_keys(hash = {})
       hash.transform_keys { |k| k.to_s }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Tomas Celizna
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -44,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.16
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +183,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - tomas.celizna@gmail.com
 executables: []
@@ -218,7 +230,6 @@ homepage: https://github.com/tomasc/dragonfly_libvips
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -233,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Dragonfly analysers and processors for libvips image processing library.
 test_files: []