rmagick 6.1.4 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 869808111e9ff5a238c87513cf287fccf958b962a0d0a11cef7d7f2e4d66f1a4
-  data.tar.gz: 781eeaca5f13d2544c41a26faa9c7a7d7a08c8a8615d8982e6ae8ebfef73fee0
+  metadata.gz: 76f2e11d828e48371aa5ff6b599cebff2e793b3751892cc864cd22015781c324
+  data.tar.gz: 65fa64db84769aa12a954bdd57ea7e03b8fcb61c1cebab89b2f9d833e8aab0aa
 SHA512:
-  metadata.gz: 1e587419ce08959d886d52e1a21648444ef3054f385b8f4aa78cbcd66d37467730555d8ff7e4ba1db753fc98918f65b64b075906dae5a26daf15bdd792a8a589
-  data.tar.gz: 006f8c9ab91b011cc1a53c588ad4e7e85ecd015efbb3984f154dddff2de030d64209e97a69ce921d053938ffd758351636d42357197076a9be3e19c3d45795ef
+  metadata.gz: 1238aaf7239bf0ae5041682b6941fb52341283d6e8fe73c37d4c914e21c40a565d0f244fb923289647dc44d0f43bfbf2e0cd59e4a8ee99595ea32524b35bbd26
+  data.tar.gz: ba83bde0c15f3061ad9e0d656cc79a65985fc55b49ae340f7fa3fd2ef510127610d95d2d8692c2111a97b3f4673badd1a03f18d6b78abbbb169f30020bcbdd4b

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-27"
+      "IMAGEMAGICK_VERSION": "6.9.13-33"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "7.1.2-1"
+      "IMAGEMAGICK_VERSION": "7.1.2-8"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@master
       with:
@@ -30,7 +30,7 @@ jobs:
     name: RBS
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@master
       with:
@@ -55,7 +55,7 @@ jobs:
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -82,14 +82,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -116,14 +116,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -149,36 +149,69 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.4']
+        ruby-version: ['4.0']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
         os:
           - { target: windows-latest, arch: 'x64' }
           - { target: windows-11-arm, arch: 'arm64' }
         exclude:
           # ImageMagick 6 has not provided ARM binary. Ref. https://legacy.imagemagick.org/archive/binaries/
-          - imagemagick-version: { full: 6.9.13-27, major-minor: '6.9' }
+          - imagemagick-version: { full: 6.9.13-33, major-minor: '6.9' }
             os: { target: windows-11-arm, arch: 'arm64' }
 
     env:
-      bundled_im_dir: ${{ matrix.os.arch == 'x64' && 'C:\Program Files\ImageMagick-7.1.2-Q16-HDRI' || 'C:\Program Files (x86)\ImageMagick-7.1.2-Q16-HDRI' }}
       install_im_dir: C:\ImageMagick
+      install_gs_dir: C:\Ghostscript
 
     name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup environment variable
       # https://stackoverflow.com/questions/60169752/how-to-update-the-path-in-a-github-action-workflow-file-for-a-windows-latest-hos
       run: |
         Add-Content $env:GITHUB_PATH ${{ env.install_im_dir }}
+        Add-Content $env:GITHUB_PATH ${{ env.install_gs_dir }}\bin
+    - name: Install Ghostscript
+      shell: powershell
+      run: |
+        $url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10060/gs10060w64.exe"
+        $installer = "$env:TEMP\gs_installer.exe"
+
+        Write-Host "Downloading Ghostscript..."
+        Invoke-WebRequest -Uri $url -OutFile $installer
+
+        7z x $installer -o${{ env.install_gs_dir }} -y
     - name: Uninstall bundled ImageMagick
       # Bundled ImageMagick does not have C/C++ library and dll which required by rmagick.
+      shell: powershell
       run: |
-        Start-Process -FilePath "${{ env.bundled_im_dir }}\unins000.exe" -ArgumentList "/VERYSILENT /NORESTART"
-    - name: Install ghostscript
-      run: |
-        choco install ghostscript
+        $regPaths = @(
+            "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*",
+            "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
+        )
+
+        # Search for ImageMagick installation entry from registry
+        $target = Get-ItemProperty $regPaths -ErrorAction SilentlyContinue |
+                  Where-Object { $_.DisplayName -like "*ImageMagick*" } |
+                  Select-Object -First 1
+
+        if ($target) {
+            Write-Host "Found installed ImageMagick: $($target.DisplayName)"
+
+            $uninstallCommand = $target.UninstallString -replace '"', ''
+
+            if (Test-Path $uninstallCommand) {
+                Write-Host "Running uninstaller: $uninstallCommand"
+                Start-Process -FilePath $uninstallCommand -ArgumentList "/VERYSILENT", "/NORESTART" -Wait
+                Write-Host "Uninstallation completed."
+            } else {
+                Write-Error "Uninstaller file not found at: $uninstallCommand"
+            }
+        } else {
+            Write-Host "ImageMagick is not installed (Registry check). Skipping."
+        }
     - name: Install ImageMagick
       # https://github.com/rmagick/ImageMagick-binaries
       run: |
@@ -196,3 +229,36 @@ jobs:
     - name: Build and test with Rake
       run: |
         cmd.exe /D /S /C "bundle exec rake"
+
+  test-windows-pkgconfig:
+    runs-on: ${{ matrix.os.target }}
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['4.0']
+        os:
+          - { target: windows-latest, arch: 'x64' }
+          - { target: windows-11-arm, arch: 'arm64' }
+    env:
+      RMAGICK_SKIP_GHOSTSCRIPT_TEST: "true" # To avoid the tedious Ghostscript setup
+
+    name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, MSYS2 IM
+    steps:
+    - uses: actions/checkout@v6
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install ImageMagick
+      run: |
+        if ("${{ matrix.os.arch }}" -eq "arm64") {
+          $pkg = "mingw-w64-clang-aarch64-imagemagick"
+        } else {
+          $pkg = "mingw-w64-ucrt-x86_64-imagemagick"
+        }
+        ridk exec pacman -S $pkg --noconfirm
+    - name: Build and test with Rake
+      run: |
+        cmd.exe /D /S /C "bundle exec rake"

data/.rubocop_todo.yml

@@ -1,21 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-06-08 04:42:31 UTC using RuboCop version 1.76.0.
+# on 2026-01-31 06:59:04 UTC using RuboCop version 1.84.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
-# Configuration parameters: Include, IgnoredGems, OnlyFor.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+# Offense count: 13
+# Configuration parameters: IgnoredGems, OnlyFor.
 Bundler/GemComment:
   Exclude:
     - 'Gemfile'
 
 # Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'rmagick.gemspec'
@@ -79,7 +76,7 @@ Layout/MultilineMethodArgumentLineBreaks:
 Layout/RedundantLineBreak:
   Enabled: false
 
-# Offense count: 1912
+# Offense count: 1913
 # This cop supports safe autocorrection (--autocorrect).
 Layout/SingleLineBlockChain:
   Enabled: false
@@ -120,7 +117,7 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 5523
+# Offense count: 5527
 # Configuration parameters: Only, Ignore.
 Lint/ConstantResolution:
   Enabled: false
@@ -206,7 +203,7 @@ Metrics/CollectionLiteralLength:
   Exclude:
     - 'doc/ex/smile.rb'
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 44
@@ -271,8 +268,9 @@ Naming/MethodParameterName:
     - 'lib/rvg/units.rb'
 
 # Offense count: 2
-# Configuration parameters: Mode, AllowedMethods.
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
+# WaywardPredicates: nonzero?
 Naming/PredicateMethod:
   Exclude:
     - 'lib/rvg/deep_equal.rb'
@@ -308,6 +306,12 @@ RSpec/NoExpectationExample:
     - 'spec/rmagick/image/import_pixels_spec.rb'
     - 'spec/rmagick/image_list/write_spec.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/Output:
+  Exclude:
+    - 'spec/rmagick/image/liquid_rescale_spec.rb'
+
 # Offense count: 4
 Security/MarshalLoad:
   Exclude:
@@ -399,7 +403,7 @@ Style/DocumentationMethod:
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
+# Configuration parameters: AllowedVars, DefaultToNil.
 Style/FetchEnvVar:
   Exclude:
     - 'ext/RMagick/extconf.rb'
@@ -411,7 +415,7 @@ Style/FetchEnvVar:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 40
+# Offense count: 41
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
@@ -459,12 +463,12 @@ Style/InvertibleUnlessCondition:
 
 # Offense count: 4515
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
+# Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, IncludedMacroPatterns, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
 Style/MethodCallWithArgsParentheses:
   Enabled: false
 
-# Offense count: 57
+# Offense count: 58
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: if, case, both
@@ -562,7 +566,7 @@ Style/StringHashKeys:
     - 'lib/rvg/misc.rb'
     - 'spec/rmagick/image/properties_spec.rb'
 
-# Offense count: 308
+# Offense count: 309
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -584,9 +588,9 @@ Style/YodaCondition:
 Style/YodaExpression:
   Enabled: false
 
-# Offense count: 134
+# Offense count: 128
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 217

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.2.0
+
+Improvements
+
+- Support MSYS2 ImageMagick via pkg-config on Windows (#1730)
+
+## RMagick 6.1.5
+
+Bug Fixes
+
+- Fix memory leak in Image#marshal_load (#1721)
+- Fix memory leak in Image::Info#page= (#1720)
+- Fix memory leak in Image::Info#view= with ImageMagick 7 (#1719)
+- Fix memory leak in Image::Info#authenticate= with ImageMagick 7 (#1718)
+- Fix memory leak in Image#marshal_load with invalid data (#1717)
+
 ## RMagick 6.1.4
 
 Improvements

data/Gemfile

@@ -20,3 +20,5 @@ gem 'rubocop-on-rbs', '~> 1.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version
 
 gem 'rbs', '~> 3.4'
 gem 'steep', '~> 1.6'
+
+gem 'ruby_memcheck', '~> 3.0' if RUBY_PLATFORM.include?('linux')

data/README.md

@@ -120,6 +120,22 @@ If you want to install ImageMagick using [Chocolatey](https://chocolatey.org/),
 choco install imagemagick -PackageParameters InstallDevelopmentHeaders=true
 ```
 
+### Windows (via MSYS2 / RubyInstaller)
+
+If you are using RubyInstaller for Windows, you can easily install ImageMagick using MSYS2's `pacman` package manager.
+Open your command prompt and run the appropriate command for your architecture to install ImageMagick:
+
+For x64:
+
+```sh
+ridk exec pacman -S mingw-w64-ucrt-x86_64-imagemagick
+```
+For ARM64:
+
+```
+ridk exec pacman -S mingw-w64-clang-aarch64-imagemagick
+```
+
 Installing RMagick
 ------------------
 

data/Rakefile

@@ -185,6 +185,14 @@ Rake::ExtensionTask.new('RMagick2') do |ext|
   ext.ext_dir = 'ext/RMagick'
 end
 
+if RUBY_PLATFORM.include?('linux')
+  require 'ruby_memcheck'
+  require 'ruby_memcheck/rspec/rake_task'
+  namespace :spec do
+    RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile)
+  end
+end
+
 task spec: :compile
 
 if ENV['STYLE_CHECKS']

data/ext/RMagick/extconf.rb

@@ -99,7 +99,7 @@ module RMagick
 
     def configure_compile_options
       # Magick-config is not available on Windows
-      if RUBY_PLATFORM.include?('mingw') # mingw
+      if RUBY_PLATFORM.include?('mingw') && !pkgconfig_exist? # mingw without pkg-config support, likely a manual installation
 
         dir_paths = search_paths_for_windows
         $CPPFLAGS += %( -I"#{dir_paths[:include]}")
@@ -161,6 +161,11 @@ module RMagick
       @installed_im7_packages ||= detect_imagemagick_packages(IM7_PACKAGES)
     end
 
+    def pkgconfig_exist?
+      $magick_package ||= determine_imagemagick_package
+      !!$magick_package
+    end
+
     def determine_imagemagick_package
       packages = [installed_im7_packages, installed_im6_packages].flatten
       return if packages.empty?
@@ -241,16 +246,15 @@ module RMagick
         Check the mkmf.log file for more detailed information.
       END_FAILURE
 
-      if RUBY_PLATFORM.include?('mingw')
+      if pkgconfig_exist?
+        $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
+        exit_failure failure_message unless $magick_version
+      elsif RUBY_PLATFORM.include?('mingw')
         `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         $magick_version = Regexp.last_match(1)
         exit_failure failure_message unless $magick_version
       else
-        unless ($magick_package = determine_imagemagick_package)
-          exit_failure failure_message
-        end
-
-        $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
+        exit_failure failure_message
       end
 
       # Ensure minimum ImageMagick version

data/ext/RMagick/rmimage.cpp

@@ -9062,14 +9062,10 @@ Image_marshal_load(VALUE self, VALUE ary)
 {
     VALUE blob, filename;
     Info *info;
-    Image *image;
+    Image *image, *new_image;
     ExceptionInfo *exception;
 
-    info = CloneImageInfo(NULL);
-    if (!info)
-    {
-        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
-    }
+    TypedData_Get_Struct(self, Image, &rm_image_data_type, image);
 
     filename = rb_ary_shift(ary);
     blob = rb_ary_shift(ary);
@@ -9077,20 +9073,27 @@ Image_marshal_load(VALUE self, VALUE ary)
     filename = StringValue(filename);
     blob = StringValue(blob);
 
+    info = CloneImageInfo(NULL);
+    if (!info)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
+    }
+
     exception = AcquireExceptionInfo();
     if (filename != Qnil)
     {
         strlcpy(info->filename, RSTRING_PTR(filename), sizeof(info->filename));
     }
     GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(blob), (size_t)RSTRING_LEN(blob), exception };
-    image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
 
     // Destroy info before raising an exception
     DestroyImageInfo(info);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 
-    UPDATE_DATA_PTR(self, image);
+    UPDATE_DATA_PTR(self, new_image);
+    rm_image_destroy(image);
 
     return self;
 }

data/ext/RMagick/rminfo.cpp

@@ -446,7 +446,7 @@ Info_authenticate_eq(VALUE self, VALUE passwd_arg)
     }
     else
     {
-        RemoveImageOption(info, "authenticate");
+        DeleteImageOption(info, "authenticate");
     }
 #else
     if (info->authenticate)
@@ -1750,6 +1750,8 @@ Info_page_eq(VALUE self, VALUE page_arg)
         info->page = NULL;
         return page_arg;
     }
+    magick_free(info->page);
+
     info->page = geometry;
 
     RB_GC_GUARD(geom_str);
@@ -2292,7 +2294,7 @@ Info_view_eq(VALUE self, VALUE view_arg)
     }
     else
     {
-        RemoveImageOption(info, "fpx:view");
+        DeleteImageOption(info, "fpx:view");
     }
 #else
     if (info->view)

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.1.4'
+  VERSION = '6.2.0'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.2.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.8.9 or later
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []