rmagick 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb35ff56e69891085d8751cc08d6f6d4f1e70791afe76012ea869b6922551ab6
-  data.tar.gz: 0b64498e6b29eca46efa64f1011045728c9708d098868f0de0ffdc0d103cfc02
+  metadata.gz: 260708d7b56c2e75a8a67393fc27c96897fd58c473f46c57c1febec5816200e9
+  data.tar.gz: b5b17d6e606f44be1d09986e58988eaad715f2879570a3c16016ff6261cb5bd5
 SHA512:
-  metadata.gz: 8d9ff646c80d9ee524c001e5da165e5b0712fd8cf662d5a37bcfb28a5453d49ce3859f8b0c1b5324974203deb3b720d0c1ace2a405efae8b1e5e491b30d0a031
-  data.tar.gz: 3e75993a946eb0547d69ef8fa0c66eee8226e72658bc609eba07f405bd6ac22ac4794de5891a21a9466994f1e0254cb7770974666f47d37eba6500ab1962b47a
+  metadata.gz: 1809116920cca2eb49f10412879badd216e2e00819796f4f7fb7d1ebd04792a206363f70d42893d2277260ec2fda028c66c7e33027c4ec6d5591c8826e6114b8
+  data.tar.gz: 9e0edf4cc0afd66eeba825feb37a233e02365daec3737561ab8f101fe7b781953e9bfbe811a88823b66974db6e9a9d1bd1f70175b581b1ddc9691167e2c23a16

data/.github/workflows/ci.yml

@@ -3,10 +3,10 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   lint:
@@ -17,14 +17,7 @@ jobs:
     - name: Set up Ruby 2.3
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: 2.3
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-linux-2.3-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-linux-2.3-${{ hashFiles('rmagick.gemspec') }}
+        ruby-version: '2.3'
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -35,23 +28,16 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
+          - { full: 6.9.11-58, major-minor: '6.9' }
+          - { full: 7.0.10-58, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
-    - name: Cache ImageMagick
-      uses: actions/cache@v1
-      with:
-        path: ./build-ImageMagick
-        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
-        restore-keys: |
-          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -60,13 +46,6 @@ jobs:
       run: |
         export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
         ./before_install_linux.sh
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-linux-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-linux-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -74,23 +53,17 @@ jobs:
 
   test-macos:
     runs-on: macos-latest
+    timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7]
+        ruby-version: ['2.6', '2.7', '3.0']
         imagemagick-version:
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
+          - { full: 6.9.11-58, major-minor: '6.9' }
+          - { full: 7.0.10-58, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
-    - name: Cache ImageMagick
-      uses: actions/cache@v1
-      with:
-        path: ./build-ImageMagick
-        key: v1-macos-imagemagick-${{ matrix.imagemagick-version.full }}
-        restore-keys: |
-          v1-macos-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -98,13 +71,6 @@ jobs:
     - name: Update/Install packages
       run: |
         IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_osx.sh
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-macos-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-macos-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -115,11 +81,11 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
         imagemagick-version:
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
+          - { full: 6.9.11-29, major-minor: '6.9' } # seems that binary file mirroring have stopped.
+          - { full: 7.0.10-29, major-minor: '7.0' } # seems that binary file mirroring have stopped.
     name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
@@ -133,7 +99,8 @@ jobs:
         $imagemagick_version_without_patch = $imagemagick_version.split("-")[0]
         $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
         $url = "https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/$($installer_name)"
-        choco install wget ghostscript
+        choco install wget
+        choco install ghostscript -Version 9.50
         wget $url --progress=dot
         cmd.exe /D /S /C "$($installer_name) /DIR=D:\ImageMagick /VERYSILENT /TASKS=install_Devel"
     - name: Build and test with Rake

data/.rubocop_todo.yml

@@ -1,11 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-02-09 10:55:21 -0800 using RuboCop version 0.68.1.
+# on 2020-10-10 21:34:21 +0900 using RuboCop version 0.81.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: 1
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'rmagick.gemspec'
+
 # Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: Categories, ExpectedOrder.
@@ -49,16 +57,20 @@ Layout/MultilineMethodArgumentLineBreaks:
     - 'lib/rmagick_internal.rb'
 
 # Offense count: 1
-Lint/EmptyWhen:
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
   Exclude:
-    - 'lib/rvg/misc.rb'
+    - 'rmagick.gemspec'
 
-# Offense count: 2
-Lint/HandleExceptions:
+# Offense count: 1
+Lint/EmptyWhen:
   Exclude:
-    - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/misc.rb'
 
 # Offense count: 94
+# Cop supports --auto-correct.
 Lint/NumberConversion:
   Exclude:
     - 'doc/ex/get_pixels.rb'
@@ -74,21 +86,34 @@ Lint/NumberConversion:
     - 'spec/rmagick/enum/to_i_spec.rb'
     - 'spec/rmagick/image/export_pixels_spec.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantStringCoercion:
+  Exclude:
+    - 'spec/rmagick/font/initialize_spec.rb'
+
 # Offense count: 1
 Lint/RescueException:
   Exclude:
     - 'lib/rmagick_internal.rb'
 
+# Offense count: 1
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/rmagick_internal.rb'
+
 # Offense count: 1
 Lint/UselessComparison:
   Exclude:
     - 'spec/rmagick/enum/case_equality_spec.rb'
 
-# Offense count: 44
+# Offense count: 45
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 537
 
-# Offense count: 75
+# Offense count: 77
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
@@ -102,13 +127,14 @@ Metrics/BlockNesting:
 # Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 467
+  Max: 460
 
 # Offense count: 21
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 42
 
-# Offense count: 57
+# Offense count: 55
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 146
@@ -119,6 +145,7 @@ Metrics/ParameterLists:
   Max: 8
 
 # Offense count: 15
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 40
 
@@ -169,62 +196,29 @@ Naming/FileName:
     - 'doc/ex/quantize-m.rb'
 
 # Offense count: 4
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
     - 'lib/rvg/misc.rb'
     - 'lib/rvg/transformable.rb'
 
-# Offense count: 224
+# Offense count: 222
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
   Enabled: false
 
-# Offense count: 439
+# Offense count: 421
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 556
+# Offense count: 539
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 72
 
-# Offense count: 5
-RSpec/Pending:
-  Exclude:
-    - 'spec/rmagick/draw/marshal_dump_spec.rb'
-    - 'spec/rmagick/image/changed_predicate_spec.rb'
-    - 'spec/rmagick/image/liquid_rescale_spec.rb'
-    - 'spec/rmagick/image/read_spec.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/Date:
-  Exclude:
-    - 'doc/ex/polaroid.rb'
-    - 'rmagick.gemspec'
-
-# Offense count: 7
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
-Rails/Output:
-  Exclude:
-    - 'lib/rvg/deep_equal.rb'
-    - 'lib/rvg/rvg.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'Rakefile'
-    - 'ext/RMagick/extconf.rb'
-
 # Offense count: 4
 Security/MarshalLoad:
   Exclude:
@@ -249,62 +243,105 @@ Style/CaseEquality:
 Style/CommentedKeyword:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 126
 Style/ConstantVisibility:
   Exclude:
+    - 'examples/histogram.rb'
+    - 'ext/RMagick/extconf.rb'
+    - 'lib/rmagick/version.rb'
     - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/misc.rb'
+    - 'lib/rvg/rvg.rb'
+    - 'lib/rvg/stylable.rb'
+    - 'spec/support/helpers.rb'
 
-# Offense count: 802
+# Offense count: 809
 # Cop supports --auto-correct.
 # Configuration parameters: Notice, AutocorrectNotice.
 Style/Copyright:
   Enabled: false
 
-# Offense count: 36
+# Offense count: 37
 Style/Documentation:
   Enabled: false
 
-# Offense count: 77
+# Offense count: 72
 # Configuration parameters: RequireForNonPublicMethods.
 Style/DocumentationMethod:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'Rakefile'
+    - 'doc/ex/ViewBox.rb'
+    - 'doc/ex/sparse_color.rb'
+    - 'examples/histogram.rb'
+    - 'examples/pattern_fill.rb'
+    - 'ext/RMagick/extconf.rb'
+    - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/container.rb'
+    - 'lib/rvg/deep_equal.rb'
+    - 'lib/rvg/embellishable.rb'
+    - 'lib/rvg/misc.rb'
+    - 'lib/rvg/stylable.rb'
+    - 'lib/rvg/transformable.rb'
+    - 'lib/rvg/units.rb'
 
-# Offense count: 192
+# Offense count: 208
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   Exclude:
+    - 'doc/ex/colors.rb'
+    - 'doc/ex/fonts.rb'
+    - 'doc/ex/implode.rb'
+    - 'doc/ex/stegano.rb'
     - 'examples/identify.rb'
-    - 'ext/RMagick/extconf.rb'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/pathdata.rb'
 
-# Offense count: 801
+# Offense count: 808
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 36
+# Offense count: 42
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
     - 'ext/RMagick/extconf.rb'
 
-# Offense count: 4
+# Offense count: 12
+# Cop supports --auto-correct.
+Style/HashEachMethods:
+  Exclude:
+    - 'doc/ex/preview.rb'
+    - 'spec/rmagick/image/auto_orient_spec.rb'
+    - 'spec/rmagick/image/channel_spec.rb'
+    - 'spec/rmagick/image/colorspace_spec.rb'
+    - 'spec/rmagick/image/info/colorspace_spec.rb'
+    - 'spec/rmagick/image/info/compression_spec.rb'
+    - 'spec/rmagick/image/info/dispose_spec.rb'
+    - 'spec/rmagick/image/info/gravity_spec.rb'
+    - 'spec/rmagick/image/info/image_type_spec.rb'
+    - 'spec/rmagick/image/info/interlace_spec.rb'
+    - 'spec/rmagick/image/info/orientation_spec.rb'
+    - 'spec/rmagick/image/info/units_spec.rb'
+
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
     - 'ext/RMagick/extconf.rb'
 
-# Offense count: 170
+# Offense count: 148
 Style/InlineComment:
   Enabled: false
 
-# Offense count: 4963
+# Offense count: 4804
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoreMacros, IgnoredMethods, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
+# Configuration parameters: IgnoreMacros, IgnoredMethods, IgnoredPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
 Style/MethodCallWithArgsParentheses:
   Enabled: false
@@ -343,7 +380,7 @@ Style/MixinUsage:
     - 'examples/thumbnail.rb'
     - 'examples/vignette.rb'
 
-# Offense count: 151
+# Offense count: 152
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -360,10 +397,17 @@ Style/NumericPredicate:
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/embellishable.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'examples/histogram.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/rmagick_internal.rb'
@@ -390,16 +434,16 @@ Style/StringHashKeys:
     - 'lib/rvg/misc.rb'
     - 'spec/rmagick/image/properties_spec.rb'
 
-# Offense count: 158
+# Offense count: 226
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 884
+# Offense count: 975
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 250
+Layout/LineLength:
+  Max: 217

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.2.0
+
+Improvements:
+
+- Updated error messages if runtime ImageMagick version was not matched with when installed rmagick (#1213)
+- Improve Image#resize performance with ImageMagick 7 (#1240)
+- Added new colorspaces (#1252)
+
+Bug Fixes:
+
+- Fix assertion failed in Magick::TextureFill.new with with unexpected argument (#1216)
+- Call with yield when there is a block arguments (#701)
+- Avoid crash with monitor feature on Ruby 3.0  (#1253)
+
 ## RMagick 4.1.2
 
 Bug Fixes:

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,128 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
 
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+## Our Standards
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-*This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)*
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+robert@boon.gl. All complaints will be reviewed and investigated promptly and
+fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

data/README.md

@@ -30,19 +30,27 @@ ImageMagick image processing library.
 Prerequisites
 -------------
 
-These prerequisites are required for the latest DEVELOPMENT version of RMagick.
-To see prerequisites for the latest RELEASED version of the gem, switch to the
-master branch.
+These prerequisites are required for the latest version of RMagick.
 
-**O/S** Linux, \*BSD, OS X, Windows 2000, XP, Vista, other \*nix-like systems.
+**OS**
+- Linux
+- \*BSD
+- macOS
+- Windows
+- Other \*nix-like systems
 
-**Ruby** 2.3 or later. You can get Ruby from <https://www.ruby-lang.org>.
+**Ruby**
+- Version 2.3 or later.
+
+You can get Ruby from <https://www.ruby-lang.org>.
 
 Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
 
-**ImageMagick** Version 6.7.7 or later (6.x.x). Version 7 has beta support in
-version 4.1.0.rc2 (#256). You can get ImageMagick from
-<https://imagemagick.org>.
+**ImageMagick**
+- Version 6.7.7 or later (6.x.x).
+- Version 7.0.8 or later (7.x.x). Require RMagick 4.1.0 or later.
+
+You can get ImageMagick from <https://imagemagick.org>.
 
 ### Linux
 #### Ubuntu

data/before_install_linux.sh

@@ -24,7 +24,7 @@ sudo apt-get autoremove -y imagemagick* libmagick* --purge
 # install build tools, ImageMagick delegates
 sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
   liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev \
-  libtiff5-dev libwebp-dev vim gsfonts ghostscript ccache
+  libtiff5-dev libwebp-dev liblqr-1-0-dev vim gsfonts ghostscript ccache
 
 if [ ! -d /usr/include/freetype ]; then
   # If `/usr/include/freetype` is not existed, ImageMagick 6.7 configuration fails about Freetype.

data/before_install_osx.sh

@@ -16,9 +16,9 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
 fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
-brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff libtool libxml2 zlib webp
+brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool libxml2 zlib webp
 
-export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/li"
+export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/lib"
 export CPPFLAGS="-I/usr/local/opt/libxml2/include/libxml2 -I/usr/local/opt/zlib/include"
 
 project_dir=$(pwd)

data/ext/RMagick/extconf.rb

@@ -343,7 +343,10 @@ module RMagick
 
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9=1') if im_version_at_least?('6.8.9')
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0=1') if im_version_at_least?('6.9.0')
+      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_10=1') if im_version_at_least?('6.9.10')
       $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')
 
       create_header
     end
@@ -355,7 +358,7 @@ module RMagick
       $defs = []
 
       # Force re-compilation if the generated Makefile changed.
-      $config_h = 'Makefile rmagick.h'
+      $config_h = 'Makefile'
 
       create_makefile('RMagick2')
       print_summary

data/ext/RMagick/rmagick.h

@@ -411,6 +411,8 @@ EXTERN ID rm_ID_push;              /**< "push" */
 EXTERN ID rm_ID_values;            /**< "values" */
 EXTERN ID rm_ID_width;             /**< "width" */
 
+EXTERN unsigned long long rm_main_thread_id;
+
 #if !defined(min)
 #define min(a, b) ((a)<(b)?(a):(b)) /**< min of two values */
 #endif
@@ -1197,6 +1199,7 @@ extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
 extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
 extern void   rm_raise_exception(ExceptionInfo *);
+extern unsigned long long rm_current_thread_id();
 #if defined(IMAGEMAGICK_6)
 extern void   rm_check_image_exception(Image *, ErrorRetention);
 #endif

data/ext/RMagick/rmdraw.c

@@ -853,7 +853,16 @@ VALUE Draw_annotate(
     // allowing the app a chance to modify the object's attributes
     if (rb_block_given_p())
     {
-        rb_obj_instance_eval(0, NULL, self);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
 
     // Translate & store in Draw structure
@@ -1385,8 +1394,16 @@ DrawOptions_initialize(VALUE self)
 
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        rb_obj_instance_eval(0, NULL, self);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
 
     return self;
@@ -1449,9 +1466,18 @@ PolaroidOptions_initialize(VALUE self)
 
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        rb_obj_instance_eval(0, NULL, self);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
+
     return self;
 }
 

data/ext/RMagick/rmfill.c

@@ -667,7 +667,10 @@ free_TextureFill(void *fill_obj)
     rm_TextureFill *fill = (rm_TextureFill *)fill_obj;
 
     // Do not trace destruction
-    DestroyImage(fill->texture);
+    if (fill->texture)
+    {
+        DestroyImage(fill->texture);
+    }
     xfree(fill);
 }
 

data/ext/RMagick/rmilist.c

@@ -446,7 +446,15 @@ ImageList_montage(VALUE self)
     {
         // Run the block in the instance's context, allowing the app to modify the
         // object's attributes.
-        rb_obj_instance_eval(0, NULL, montage_obj);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, montage_obj);
+        }
+        else
+        {
+            rb_yield(montage_obj);
+        }
     }
 
     Data_Get_Struct(montage_obj, Montage, montage);

data/ext/RMagick/rmimage.c

@@ -11660,9 +11660,12 @@ resize(int bang, int argc, VALUE *argv, VALUE self)
 
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
-    Image *preprocess = blurred_image(image, blur);
+    Image *preprocess = (argc == 4) ? blurred_image(image, blur) : image;
     new_image = ResizeImage(preprocess, columns, rows, filter, exception);
-    DestroyImage(preprocess);
+    if (argc == 4)
+    {
+        DestroyImage(preprocess);
+    }
 #else
     new_image = ResizeImage(image, columns, rows, filter, blur, exception);
 #endif

data/ext/RMagick/rminfo.c

@@ -2414,8 +2414,16 @@ Info_initialize(VALUE self)
 {
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        rb_obj_instance_eval(0, NULL, self);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
     return self;
 }

data/ext/RMagick/rmmain.c

@@ -242,6 +242,8 @@ Init_RMagick2(void)
 
     test_Magick_version();
 
+    rm_main_thread_id = rm_current_thread_id();
+
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
@@ -1130,6 +1132,16 @@ Init_RMagick2(void)
         ENUMERATOR(HCLpColorspace)
         ENUMERATOR(YDbDrColorspace)
         ENUMERATORV(XyYColorspace, xyYColorspace)
+#endif
+#if defined(IMAGEMAGICK_7)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8)
+        ENUMERATOR(LinearGRAYColorspace)
+#endif
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10)
+        ENUMERATOR(JzazbzColorspace)
+#endif
+#elif defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_10)
+        ENUMERATOR(LinearGRAYColorspace)
 #endif
     END_ENUM
 
@@ -1870,7 +1882,8 @@ test_Magick_version(void)
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This installation of RMagick was configured with %s %s but %.*s is in use.\n" ,
+                 "This installation of RMagick was configured with %s %s but %.*s is in use.\n"
+                 "Please re-install RMagick to correct the issue.\n",
                  MagickPackageName, MagickLibVersionText, x, version_str);
     }
 

data/ext/RMagick/rmutil.c

@@ -1000,7 +1000,16 @@ rm_get_optional_arguments(VALUE img)
         optional_method_arguments = rb_const_get_from(Module_Magick, rb_intern("OptionalMethodArguments"));
         argv[0] = img;
         opt_args = rb_class_new_instance(1, argv, optional_method_arguments);
-        rb_obj_instance_eval(0, NULL, opt_args);
+
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, opt_args);
+        }
+        else
+        {
+            rb_yield(opt_args);
+        }
     }
 
     RB_GC_GUARD(optional_method_arguments);
@@ -1530,14 +1539,15 @@ rm_progress_monitor(
     VALUE rval;
     VALUE method, offset, span;
 
-// Default Ruby minimum stack size
-#define RUBY_VM_THREAD_MACHINE_STACK_SIZE_MIN (  16 * 1024 * sizeof(VALUE)) /*   64 KB or  128 KB */
-
-    // Check stack length manually instead of ruby_stack_check() for old Ruby.
-    if (ruby_stack_length(NULL) > RUBY_VM_THREAD_MACHINE_STACK_SIZE_MIN)
+    // Check running thread.
+    if (rm_current_thread_id() != rm_main_thread_id)
     {
-        // If there is not enough stack or the using stack size shows an abnormal value in Ruby,
-        // skip the callback and continue ImageMagick process.
+        // ImageMagick might call back in a different thread than Ruby is running in.
+        // If it is a different thread, it would not have a Ruby GVL and
+        // it could not retrieve properly Ruby stack.
+
+        // Unfortunately, there is no API available to check if the current thread has a GVL,
+        // so the thread id was checked in here.
         return MagickTrue;
     }
 
@@ -1868,3 +1878,21 @@ rm_raise_exception(ExceptionInfo *exception)
     rm_magick_error(msg);
 }
 
+/**
+ * Get current thread id.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @return thread id
+ */
+unsigned long long
+rm_current_thread_id()
+{
+#if defined(_WIN32)
+#include <Windows.h>
+    return (unsigned long long)GetCurrentThreadId();
+#else
+#include <pthread.h>
+    return (unsigned long long)pthread_self();
+#endif
+}

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '4.1.2'
+  VERSION = '4.2.0'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/rmagick.gemspec

@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
   if RUBY_PLATFORM !~ /mswin|mingw/
-    s.add_development_dependency 'rubocop', '~> 0.68.0'
-    s.add_development_dependency 'rubocop-rspec', '~> 1.37.0'
+    s.add_development_dependency 'rubocop', '~> 0.81.0'
+    s.add_development_dependency 'rubocop-rspec', '~> 1.38.1'
+    s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
   end
   s.add_development_dependency 'simplecov', '~> 0.16.1'
   s.add_development_dependency 'yard', '~> 0.9.24'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -75,28 +75,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.7.7 or later
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick