rmagick 6.1.2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96745ee737289beea230f6938180f10253f9690f28c21a03b07ea7df164e5846
-  data.tar.gz: 8351b6da6dda4c130f02dbb277d51eb3fe7ba36bd79b01808fd01c35a2c94fc0
+  metadata.gz: 8727d63370f3301d1003b3289cb4f7d4d51053866c665fdf209fece0ff3a2cd5
+  data.tar.gz: 42f684f58bacb86862a11b9d37cd061846860b5cec169e267a42f4a815d424d1
 SHA512:
-  metadata.gz: aaa120df0f261f860032f3246e6545e3bbe410dfe9af5ed4b9f134d0ac486f4fb39f7c1e5dcb0812b18fdd1ac58a4ebb19607165cdf9d4accbeae652adbc08b9
-  data.tar.gz: d93e71faffdbf46febc6f26701fac9fa87e2f48ab683aab3333455388a17bc7ebe8da23875cf37844e53b38530b5d6429e489cf392bb12b773184857f3e4fcf2
+  metadata.gz: 8fe89adf4ce1c080090ab6b762dd7978a73615aadcef2be75340eab407c866d3c7bd9129f037f4c3d4ccc522494e15cfed2af9f8c3cb28f64d088492949f1d32
+  data.tar.gz: ce107ad02c27ce449d81d9640028a0be798fc8e916ae638321f22c05f59b06e3073777c5b89bb73360fdc52f909fb64ddb75a5c4510cb994a69757805ae639ba

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

@@ -46,6 +46,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: ['3.0']
         imagemagick-version:
@@ -79,11 +80,12 @@ 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:
@@ -112,11 +114,12 @@ 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:
@@ -144,21 +147,22 @@ 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 }}

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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

@@ -289,6 +289,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.3'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

data/lib/rmagick_internal.rb

@@ -1236,6 +1236,7 @@ module Magick
   class ImageList
     include Comparable
     include Enumerable
+
     attr_reader :scene
 
     private

metadata

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