rmagick 4.2.4 → 4.2.5
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rmagick might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +4 -4
- data/CHANGELOG.md +7 -0
- data/ext/RMagick/extconf.rb +9 -1
- data/ext/RMagick/rmagick.h +2 -2
- data/ext/RMagick/rmimage.c +9 -1
- data/ext/RMagick/rmstruct.c +4 -4
- data/lib/rmagick/version.rb +1 -1
- data/rmagick.gemspec +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 19f12f1fe15653484cfee177ac21d5174d912918ef9bdf874b74b940a91cf5ba
|
4
|
+
data.tar.gz: 9a187a8e989d9b0f984716a1bb5e8239e4e0d428de76f52cbbf56cbfb7c7e55a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d04c9a98d1004623c27fedda53f7f3d5de1ae7a9f938da386a803e6191d224e92bf71831bfc57ac946d45f4f2a820d1441fd3d19a8d78442d0046d7927819a13
|
7
|
+
data.tar.gz: b05b1c15617eb186b65edc55b97c6c8b4f58f25249f1295378efaf1e40f7242f82c46e20389eecd914e62d3e5c7233e3dc0b0308897a3f5825dda0c1cbaec796
|
data/.github/workflows/ci.yml
CHANGED
@@ -31,8 +31,8 @@ jobs:
|
|
31
31
|
imagemagick-version:
|
32
32
|
- { full: 6.7.7-10, major-minor: '6.7' }
|
33
33
|
- { full: 6.8.9-10, major-minor: '6.8' }
|
34
|
-
- { full: 6.9.12-
|
35
|
-
- { full: 7.1.0-
|
34
|
+
- { full: 6.9.12-37, major-minor: '6.9' }
|
35
|
+
- { full: 7.1.0-22, major-minor: '7.0' }
|
36
36
|
|
37
37
|
name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
|
38
38
|
steps:
|
@@ -57,8 +57,8 @@ jobs:
|
|
57
57
|
matrix:
|
58
58
|
ruby-version: ['2.6', '2.7', '3.0', '3.1']
|
59
59
|
imagemagick-version:
|
60
|
-
- { full: 6.9.12-
|
61
|
-
- { full: 7.1.0-
|
60
|
+
- { full: 6.9.12-37, major-minor: '6.9' }
|
61
|
+
- { full: 7.1.0-22, major-minor: '7.0' }
|
62
62
|
|
63
63
|
name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
|
64
64
|
steps:
|
data/CHANGELOG.md
CHANGED
@@ -3,6 +3,13 @@
|
|
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 4.2.5
|
7
|
+
|
8
|
+
Bug Fixes
|
9
|
+
|
10
|
+
- Specify rpath linker option to fix dynamic lib lookup failure on Linux (#1325)
|
11
|
+
- Fix Image#profile! that can't delete exif data (#1326)
|
12
|
+
|
6
13
|
## RMagick 4.2.4
|
7
14
|
|
8
15
|
Improvements
|
data/ext/RMagick/extconf.rb
CHANGED
@@ -67,10 +67,18 @@ module RMagick
|
|
67
67
|
check_multiple_imagemagick_versions
|
68
68
|
check_partial_imagemagick_versions
|
69
69
|
|
70
|
+
libdir = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
|
71
|
+
ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
|
72
|
+
|
70
73
|
# Save flags
|
71
74
|
$CPPFLAGS = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
|
72
|
-
$LDFLAGS = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
|
73
75
|
$LOCAL_LIBS = "#{ENV['LIBS']} " + `pkg-config --libs #{$magick_package}`.chomp
|
76
|
+
$LDFLAGS = "#{ldflags} -Wl,-rpath,#{libdir}"
|
77
|
+
|
78
|
+
unless try_link("int main() { }")
|
79
|
+
# if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
|
80
|
+
$LDFLAGS = ldflags
|
81
|
+
end
|
74
82
|
|
75
83
|
configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
|
76
84
|
|
data/ext/RMagick/rmagick.h
CHANGED
@@ -434,9 +434,9 @@ EXTERN unsigned long long rm_main_thread_id;
|
|
434
434
|
#define R_boolean_to_C_boolean(attr) RTEST(attr) /**< C boolean <- Ruby boolean */
|
435
435
|
#define C_int_to_R_int(attr) INT2FIX(attr) /**< C int -> Ruby int */
|
436
436
|
#define R_int_to_C_int(attr) NUM2INT(attr) /**< C int <- Ruby int */
|
437
|
-
#define C_long_to_R_long(attr)
|
437
|
+
#define C_long_to_R_long(attr) LONG2NUM(attr) /**< C long -> Ruby long */
|
438
438
|
#define R_long_to_C_long(attr) NUM2LONG(attr) /**< C long <- Ruby long */
|
439
|
-
#define C_ulong_to_R_ulong(attr)
|
439
|
+
#define C_ulong_to_R_ulong(attr) ULONG2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
|
440
440
|
#define R_ulong_to_C_ulong(attr) NUM2ULONG(attr) /**< C unsigned long <- Ruby unsigned long */
|
441
441
|
#define C_str_to_R_str(attr) attr ? rb_str_new2(attr) : Qnil /**< C string -> Ruby string */
|
442
442
|
#define C_dbl_to_R_dbl(attr) rb_float_new(attr) /**< C double -> Ruby double */
|
data/ext/RMagick/rmimage.c
CHANGED
@@ -5039,8 +5039,16 @@ VALUE
|
|
5039
5039
|
Image_delete_profile(VALUE self, VALUE name)
|
5040
5040
|
{
|
5041
5041
|
Image *image = rm_check_frozen(self);
|
5042
|
-
DeleteImageProfile(image, StringValueCStr(name));
|
5043
5042
|
|
5043
|
+
#if defined(IMAGEMAGICK_7)
|
5044
|
+
ExceptionInfo *exception = AcquireExceptionInfo();
|
5045
|
+
|
5046
|
+
ProfileImage(image, StringValueCStr(name), NULL, 0, exception);
|
5047
|
+
CHECK_EXCEPTION();
|
5048
|
+
DestroyExceptionInfo(exception);
|
5049
|
+
#else
|
5050
|
+
ProfileImage(image, StringValueCStr(name), NULL, 0, MagickTrue);
|
5051
|
+
#endif
|
5044
5052
|
return self;
|
5045
5053
|
}
|
5046
5054
|
|
data/ext/RMagick/rmstruct.c
CHANGED
@@ -672,10 +672,10 @@ Import_RectangleInfo(RectangleInfo *rect)
|
|
672
672
|
VALUE height;
|
673
673
|
VALUE x, y;
|
674
674
|
|
675
|
-
width =
|
676
|
-
height =
|
677
|
-
x =
|
678
|
-
y =
|
675
|
+
width = ULONG2NUM(rect->width);
|
676
|
+
height = ULONG2NUM(rect->height);
|
677
|
+
x = LONG2NUM(rect->x);
|
678
|
+
y = LONG2NUM(rect->y);
|
679
679
|
|
680
680
|
RB_GC_GUARD(width);
|
681
681
|
RB_GC_GUARD(height);
|
data/lib/rmagick/version.rb
CHANGED
data/rmagick.gemspec
CHANGED
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
26
26
|
s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
|
27
27
|
s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
|
28
28
|
|
29
|
-
s.add_development_dependency 'pry', '~> 0.
|
29
|
+
s.add_development_dependency 'pry', '~> 0.14'
|
30
30
|
s.add_development_dependency 'rake-compiler', '~> 1.0'
|
31
31
|
s.add_development_dependency 'rspec', '~> 3.8'
|
32
32
|
s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
|
metadata
CHANGED
@@ -1,17 +1,17 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rmagick
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.2.
|
4
|
+
version: 4.2.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tim Hunter
|
8
8
|
- Omer Bar-or
|
9
9
|
- Benjamin Thomas
|
10
10
|
- Moncef Maiza
|
11
|
-
autorequire:
|
11
|
+
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date:
|
14
|
+
date: 2022-04-05 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: pry
|
@@ -19,14 +19,14 @@ dependencies:
|
|
19
19
|
requirements:
|
20
20
|
- - "~>"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 0.
|
22
|
+
version: '0.14'
|
23
23
|
type: :development
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - "~>"
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.
|
29
|
+
version: '0.14'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: rake-compiler
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -202,7 +202,7 @@ homepage: https://github.com/rmagick/rmagick
|
|
202
202
|
licenses:
|
203
203
|
- MIT
|
204
204
|
metadata: {}
|
205
|
-
post_install_message:
|
205
|
+
post_install_message:
|
206
206
|
rdoc_options: []
|
207
207
|
require_paths:
|
208
208
|
- lib
|
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
221
221
|
requirements:
|
222
222
|
- ImageMagick 6.7.7 or later
|
223
223
|
rubygems_version: 3.2.32
|
224
|
-
signing_key:
|
224
|
+
signing_key:
|
225
225
|
specification_version: 4
|
226
226
|
summary: Ruby binding to ImageMagick
|
227
227
|
test_files: []
|