rmagick 6.1.2 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96745ee737289beea230f6938180f10253f9690f28c21a03b07ea7df164e5846
-  data.tar.gz: 8351b6da6dda4c130f02dbb277d51eb3fe7ba36bd79b01808fd01c35a2c94fc0
+  metadata.gz: 869808111e9ff5a238c87513cf287fccf958b962a0d0a11cef7d7f2e4d66f1a4
+  data.tar.gz: 781eeaca5f13d2544c41a26faa9c7a7d7a08c8a8615d8982e6ae8ebfef73fee0
 SHA512:
-  metadata.gz: aaa120df0f261f860032f3246e6545e3bbe410dfe9af5ed4b9f134d0ac486f4fb39f7c1e5dcb0812b18fdd1ac58a4ebb19607165cdf9d4accbeae652adbc08b9
-  data.tar.gz: d93e71faffdbf46febc6f26701fac9fa87e2f48ab683aab3333455388a17bc7ebe8da23875cf37844e53b38530b5d6429e489cf392bb12b773184857f3e4fcf2
+  metadata.gz: 1e587419ce08959d886d52e1a21648444ef3054f385b8f4aa78cbcd66d37467730555d8ff7e4ba1db753fc98918f65b64b075906dae5a26daf15bdd792a8a589
+  data.tar.gz: 006f8c9ab91b011cc1a53c588ad4e7e85ecd015efbb3984f154dddff2de030d64209e97a69ce921d053938ffd758351636d42357197076a9be3e19c3d45795ef

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-25"
+      "IMAGEMAGICK_VERSION": "6.9.13-27"
     }
   },
   "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.1-47"
+      "IMAGEMAGICK_VERSION": "7.1.2-1"
     }
   },
   "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@v4
+    - uses: actions/checkout@v5
     - 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@v4
+    - uses: actions/checkout@v5
     - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@master
       with:
@@ -46,6 +46,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: ['3.0']
         imagemagick-version:
@@ -54,7 +55,7 @@ jobs:
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -79,15 +80,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 6.9.13-25, major-minor: '6.9' }
-          - { full: 7.1.1-47, major-minor: '7.1' }
+          - { full: 6.9.13-27, major-minor: '6.9' }
+          - { full: 7.1.2-1, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -112,15 +114,16 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 6.9.13-25, major-minor: '6.9' }
-          - { full: 7.1.1-47, major-minor: '7.1' }
+          - { full: 6.9.13-27, major-minor: '6.9' }
+          - { full: 7.1.2-1, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -144,26 +147,27 @@ jobs:
     runs-on: ${{ matrix.os.target }}
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: ['3.4']
         imagemagick-version:
-          - { full: 6.9.13-25, major-minor: '6.9' }
-          - { full: 7.1.1-47, major-minor: '7.1' }
+          - { full: 6.9.13-27, major-minor: '6.9' }
+          - { full: 7.1.2-1, 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-25, major-minor: '6.9' }
+          - imagemagick-version: { full: 6.9.13-27, 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.1-Q16-HDRI' || 'C:\Program Files (x86)\ImageMagick-7.1.1-Q16-HDRI' }}
+      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
 
     name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - 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: |

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.1.4
+
+Improvements
+
+- Improve check whether C++ compiler exists (#1708)
+
+## RMagick 6.1.3
+
+Bug Fixes
+
+- Fixed an error with ImageMagick 7.1.2 on Windows when saving images using file descriptor (#1699)
+
 ## RMagick 6.1.2
 
 Improvements

data/ext/RMagick/extconf.rb

@@ -226,9 +226,12 @@ module RMagick
     def assert_can_compile!
       assert_has_dev_libs!
 
-      # Check for compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
-      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX'] || 'g++').split.first
-      exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cxx)
+      # Check for C++ compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
+      # Ref. https://bugs.ruby-lang.org/issues/21111
+      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX']).split.first
+      return if cxx != "false" && find_executable(cxx)
+
+      exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details."
     end
 
     def assert_has_dev_libs!
@@ -289,6 +292,7 @@ module RMagick
       $defs.push('-DIMAGEMAGICK_7=1') if im_version_at_least?('7.0.0')
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8=1') if im_version_at_least?('7.0.8')
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10=1') if im_version_at_least?('7.0.10')
+      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2=1') if im_version_at_least?('7.1.2')
 
       create_header
     end

data/ext/RMagick/rmilist.cpp

@@ -1204,7 +1204,7 @@ ImageList_write(VALUE self, VALUE file)
         rb_io_check_writable(fptr);
 
         add_format_prefix(info, rm_io_path(file));
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2)
         SetImageInfoFile(info, NULL);
 #else
         SetImageInfoFile(info, rb_io_stdio_file(fptr));

data/ext/RMagick/rmimage.cpp

@@ -15949,7 +15949,7 @@ Image_write(VALUE self, VALUE file)
         rb_io_check_writable(fptr);
 
         add_format_prefix(info, rm_io_path(file));
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2)
         SetImageInfoFile(info, NULL);
 #else
         SetImageInfoFile(info, rb_io_stdio_file(fptr));

data/lib/rmagick/version.rb

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

data/lib/rmagick_internal.rb

@@ -224,7 +224,7 @@ module Magick
 
     def enquote(str)
       str = to_string(str)
-      if str.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(str)
+      if str.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(str)
         str
       else
         '"' + str + '"'
@@ -619,7 +619,7 @@ module Magick
     def text(x, y, text)
       text = to_string(text)
       Kernel.raise ArgumentError, 'missing text argument' if text.empty?
-      if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
+      if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
       # text already quoted
       elsif !text['\'']
         text = '\'' + text + '\''
@@ -1236,6 +1236,7 @@ module Magick
   class ImageList
     include Comparable
     include Enumerable
+
     attr_reader :scene
 
     private

data/lib/rvg/misc.rb

@@ -74,7 +74,7 @@ module Magick
         end
 
         def enquote(text)
-          return text if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
+          return text if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
 
           if !text['\'']
             text = '\'' + text + '\''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.4
 platform: ruby
 authors:
 - Tim Hunter