rmagick 6.1.2 → 6.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.devcontainer/ImageMagick6/devcontainer.json +1 -1
- data/.devcontainer/devcontainer.json +1 -1
- data/.github/workflows/ci.yml +12 -8
- data/CHANGELOG.md +6 -0
- data/ext/RMagick/extconf.rb +1 -0
- data/ext/RMagick/rmilist.cpp +1 -1
- data/ext/RMagick/rmimage.cpp +1 -1
- data/lib/rmagick/version.rb +1 -1
- data/lib/rmagick_internal.rb +1 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8727d63370f3301d1003b3289cb4f7d4d51053866c665fdf209fece0ff3a2cd5
|
|
4
|
+
data.tar.gz: 42f684f58bacb86862a11b9d37cd061846860b5cec169e267a42f4a815d424d1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8fe89adf4ce1c080090ab6b762dd7978a73615aadcef2be75340eab407c866d3c7bd9129f037f4c3d4ccc522494e15cfed2af9f8c3cb28f64d088492949f1d32
|
|
7
|
+
data.tar.gz: ce107ad02c27ce449d81d9640028a0be798fc8e916ae638321f22c05f59b06e3073777c5b89bb73360fdc52f909fb64ddb75a5c4510cb994a69757805ae639ba
|
data/.github/workflows/ci.yml
CHANGED
|
@@ -46,6 +46,7 @@ jobs:
|
|
|
46
46
|
runs-on: ubuntu-22.04
|
|
47
47
|
timeout-minutes: 20
|
|
48
48
|
strategy:
|
|
49
|
+
fail-fast: false
|
|
49
50
|
matrix:
|
|
50
51
|
ruby-version: ['3.0']
|
|
51
52
|
imagemagick-version:
|
|
@@ -79,11 +80,12 @@ jobs:
|
|
|
79
80
|
runs-on: ubuntu-latest
|
|
80
81
|
timeout-minutes: 20
|
|
81
82
|
strategy:
|
|
83
|
+
fail-fast: false
|
|
82
84
|
matrix:
|
|
83
85
|
ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
|
|
84
86
|
imagemagick-version:
|
|
85
|
-
- { full: 6.9.13-
|
|
86
|
-
- { full: 7.1.1
|
|
87
|
+
- { full: 6.9.13-27, major-minor: '6.9' }
|
|
88
|
+
- { full: 7.1.2-1, major-minor: '7.1' }
|
|
87
89
|
|
|
88
90
|
name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
|
|
89
91
|
steps:
|
|
@@ -112,11 +114,12 @@ jobs:
|
|
|
112
114
|
runs-on: macos-latest
|
|
113
115
|
timeout-minutes: 20
|
|
114
116
|
strategy:
|
|
117
|
+
fail-fast: false
|
|
115
118
|
matrix:
|
|
116
119
|
ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
|
|
117
120
|
imagemagick-version:
|
|
118
|
-
- { full: 6.9.13-
|
|
119
|
-
- { full: 7.1.1
|
|
121
|
+
- { full: 6.9.13-27, major-minor: '6.9' }
|
|
122
|
+
- { full: 7.1.2-1, major-minor: '7.1' }
|
|
120
123
|
|
|
121
124
|
name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
|
|
122
125
|
steps:
|
|
@@ -144,21 +147,22 @@ jobs:
|
|
|
144
147
|
runs-on: ${{ matrix.os.target }}
|
|
145
148
|
timeout-minutes: 20
|
|
146
149
|
strategy:
|
|
150
|
+
fail-fast: false
|
|
147
151
|
matrix:
|
|
148
152
|
ruby-version: ['3.4']
|
|
149
153
|
imagemagick-version:
|
|
150
|
-
- { full: 6.9.13-
|
|
151
|
-
- { full: 7.1.1
|
|
154
|
+
- { full: 6.9.13-27, major-minor: '6.9' }
|
|
155
|
+
- { full: 7.1.2-1, major-minor: '7.1' }
|
|
152
156
|
os:
|
|
153
157
|
- { target: windows-latest, arch: 'x64' }
|
|
154
158
|
- { target: windows-11-arm, arch: 'arm64' }
|
|
155
159
|
exclude:
|
|
156
160
|
# ImageMagick 6 has not provided ARM binary. Ref. https://legacy.imagemagick.org/archive/binaries/
|
|
157
|
-
- imagemagick-version: { full: 6.9.13-
|
|
161
|
+
- imagemagick-version: { full: 6.9.13-27, major-minor: '6.9' }
|
|
158
162
|
os: { target: windows-11-arm, arch: 'arm64' }
|
|
159
163
|
|
|
160
164
|
env:
|
|
161
|
-
bundled_im_dir: ${{ matrix.os.arch == 'x64' && 'C:\Program Files\ImageMagick-7.1.
|
|
165
|
+
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' }}
|
|
162
166
|
install_im_dir: C:\ImageMagick
|
|
163
167
|
|
|
164
168
|
name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
|
data/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project are documented in this file.
|
|
4
4
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
5
5
|
|
|
6
|
+
## RMagick 6.1.3
|
|
7
|
+
|
|
8
|
+
Bug Fixes
|
|
9
|
+
|
|
10
|
+
- Fixed an error with ImageMagick 7.1.2 on Windows when saving images using file descriptor (#1699)
|
|
11
|
+
|
|
6
12
|
## RMagick 6.1.2
|
|
7
13
|
|
|
8
14
|
Improvements
|
data/ext/RMagick/extconf.rb
CHANGED
|
@@ -289,6 +289,7 @@ module RMagick
|
|
|
289
289
|
$defs.push('-DIMAGEMAGICK_7=1') if im_version_at_least?('7.0.0')
|
|
290
290
|
$defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8=1') if im_version_at_least?('7.0.8')
|
|
291
291
|
$defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10=1') if im_version_at_least?('7.0.10')
|
|
292
|
+
$defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2=1') if im_version_at_least?('7.1.2')
|
|
292
293
|
|
|
293
294
|
create_header
|
|
294
295
|
end
|
data/ext/RMagick/rmilist.cpp
CHANGED
|
@@ -1204,7 +1204,7 @@ ImageList_write(VALUE self, VALUE file)
|
|
|
1204
1204
|
rb_io_check_writable(fptr);
|
|
1205
1205
|
|
|
1206
1206
|
add_format_prefix(info, rm_io_path(file));
|
|
1207
|
-
#if defined(_WIN32)
|
|
1207
|
+
#if defined(_WIN32) && !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2)
|
|
1208
1208
|
SetImageInfoFile(info, NULL);
|
|
1209
1209
|
#else
|
|
1210
1210
|
SetImageInfoFile(info, rb_io_stdio_file(fptr));
|
data/ext/RMagick/rmimage.cpp
CHANGED
|
@@ -15949,7 +15949,7 @@ Image_write(VALUE self, VALUE file)
|
|
|
15949
15949
|
rb_io_check_writable(fptr);
|
|
15950
15950
|
|
|
15951
15951
|
add_format_prefix(info, rm_io_path(file));
|
|
15952
|
-
#if defined(_WIN32)
|
|
15952
|
+
#if defined(_WIN32) && !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2)
|
|
15953
15953
|
SetImageInfoFile(info, NULL);
|
|
15954
15954
|
#else
|
|
15955
15955
|
SetImageInfoFile(info, rb_io_stdio_file(fptr));
|
data/lib/rmagick/version.rb
CHANGED
data/lib/rmagick_internal.rb
CHANGED