rmagick 4.2.6 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd92f37d8a01928beb9e4b44c7f7712dab8b2307c42484253b179e474d363e47
-  data.tar.gz: 1faa1f97938450f4199f3019c7b6848efc7cf4a4e43aa06d218c81fad82e21fe
+  metadata.gz: 41d6b9634204858bad669688ff19fc54c14dc3578f011696ade0295b5e4f7e88
+  data.tar.gz: 781493a793ec5ee4b9a60063761484e8b1d44e622963c2593caefac314d7ed8a
 SHA512:
-  metadata.gz: 36585f543e7e3edb3f967524e8e6a498d0fb9059adb54e96652bb8ddf2772d51d43a183822dd32149fad24c48001de8073dfac9e7e4a3781fe1c8462c940407a
-  data.tar.gz: 19197353b30bf77c73267bf3d939149dc9e078938382d27e24cada606b0edf4c6c21fae0603d00742301a850f9a959f35fd86f1026b104ba342a990dfe887f9d
+  metadata.gz: e90299bfe4a9b5d9a6291d53707db9ec772fb2247517f4e9ca9e4633320a6a9c2067195dcc90109bc743cd9f0a12882adfd679fb4e06c6995958e8b962125e0e
+  data.tar.gz: 1e2b528111b27b48ec4f3dc8be1e65d3bf181ec8888c5e1562959b98af4762f12dd9285d4d78520eb400ffb16e09f93950e8527b27e552396487c56fd1258b95

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.1.2",
-      "IMAGEMAGICK_VERSION": "6.9.12-54"
+      "IMAGEMAGICK_VERSION": "6.9.13-4"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/{ImageMagick7/devcontainer.json → devcontainer.json}

@@ -1,10 +1,10 @@
 {
   "name": "ImageMagick 7",
   "build": {
-    "dockerfile": "../Dockerfile",
+    "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.1.2",
-      "IMAGEMAGICK_VERSION": "7.1.0-39"
+      "IMAGEMAGICK_VERSION": "7.1.1-26"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/setup-user.sh

@@ -42,4 +42,4 @@ __show_notice
 EOF
 )"
 
- echo "${codespaces_bash}" >> "/root/.bashrc"
+echo "${codespaces_bash}" >> "/root/.bashrc"

data/.editorconfig

@@ -13,5 +13,5 @@ tab_width = 2
 [{*.{rb,yml,sh,md}]
 indent_size = 2
 
-[*.c]
+[*.cpp]
 indent_size = 4

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby 2.3
       uses: ruby/setup-ruby@master
       with:
@@ -25,21 +25,49 @@ jobs:
         bundle install --path=vendor/bundle --jobs 4 --retry 3
         STYLE_CHECKS=true bundle exec rubocop
 
+  rbs:
+    runs-on: ubuntu-latest
+    name: RBS
+    timeout-minutes: 20
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby 3.0
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: '3.0'
+    - name: Validate RBS signatures
+      run: |
+        bundle install --path=vendor/bundle --jobs 4 --retry 3
+        bundle exec rake rbs:validate && bundle exec steep check
+
   test-linux:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.12-56, major-minor: '6.9' }
-          - { full: 7.1.0-41, major-minor: '7.0' }
+          - { full: 6.9.13-4, major-minor: '6.9' }
+          - { full: 7.0.11-14, major-minor: '7.0' }
+          - { full: 7.1.1-26, major-minor: '7.1' }
+        exclude:
+          # Ghostscript 9.55.0 causes error with Ruby 3.3 + ImageMagick 6.7 when run Magick::Draw tests.
+          # It disable running tests with Ruby 3.3 + ImageMagick 6.7 because it might be difficult to support old ImageMagick.
+          - ruby-version: '3.3'
+            imagemagick-version: { major-minor: '6.7' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Cache ImageMagick built objects
+      uses: actions/cache@v4
+      with:
+        path: ./build-ImageMagick
+        key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -58,14 +86,21 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
-          - { full: 6.9.12-56, major-minor: '6.9' }
-          - { full: 7.1.0-41, major-minor: '7.0' }
+          - { full: 6.9.13-4, major-minor: '6.9' }
+          - { full: 7.1.1-26, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Cache ImageMagick built objects
+      uses: actions/cache@v4
+      with:
+        path: ./build-ImageMagick
+        key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -77,3 +112,46 @@ jobs:
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
         bundle exec rake
+
+  test-windows:
+    runs-on: windows-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['3.3']
+        imagemagick-version:
+          - { full: 6.9.13-4, major-minor: '6.9' }
+          - { full: 7.1.1-26, major-minor: '7.1' }
+    env:
+      bundled_im_dir: C:\Program Files\ImageMagick-7.1.1-Q16-HDRI
+      install_im_dir: D:\ImageMagick
+
+    name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
+    steps:
+    - uses: actions/checkout@v4
+    - 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: |
+        Add-Content $env:GITHUB_PATH ${{ env.install_im_dir }}
+    - name: Uninstall bundled ImageMagick
+      # Bundled ImageMagick does not have C/C++ library and dll which required by rmagick.
+      run: |
+        Start-Process -FilePath "${{ env.bundled_im_dir }}\unins000.exe" -ArgumentList "/VERYSILENT /NORESTART"
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Install ghostscript
+      run: |
+        choco install ghostscript
+    - name: Install ImageMagick
+      # https://github.com/rmagick/ImageMagick-binaries
+      run: |
+        $imagemagick_version = "${{ matrix.imagemagick-version.full }}"
+        $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
+        $url = "https://github.com/rmagick/ImageMagick-binaries/raw/main/$($installer_name)"
+        Invoke-WebRequest -Uri $url -OutFile $installer_name
+        Start-Process -FilePath $installer_name -ArgumentList "/DIR=${{ env.install_im_dir }} /VERYSILENT /NORESTART /TASKS=install_Devel"
+    - name: Build and test with Rake
+      run: |
+        cmd.exe /D /S /C "bundle install --path=vendor/bundle --retry 3 & bundle exec rake"

data/.gitignore

@@ -20,6 +20,10 @@ tmp
 *.o
 *.a
 *.log
+*.def
 Makefile
 extconf.h
+compile_flags.txt
 build-ImageMagick/
+doc/node_modules/
+doc/package-lock.json

data/.rubocop_todo.yml

@@ -6,6 +6,21 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 9
+# Configuration parameters: Include, IgnoredGems.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/GemComment:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: TreatCommentsAsGroupSeparators, Include.
@@ -26,7 +41,6 @@ Layout/ClassStructure:
     - 'lib/rvg/misc.rb'
     - 'lib/rvg/pathdata.rb'
     - 'lib/rvg/rvg.rb'
-    - 'lib/rvg/to_c.rb'
 
 # Offense count: 2312
 # Cop supports --auto-correct.
@@ -79,7 +93,6 @@ Lint/NumberConversion:
     - 'examples/thumbnail.rb'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/misc.rb'
-    - 'lib/rvg/to_c.rb'
     - 'spec/magick_spec.rb'
     - 'spec/rmagick/align_type/class_methods/values_spec.rb'
     - 'spec/rmagick/enum/bitwise_or_spec.rb'
@@ -127,7 +140,7 @@ Metrics/BlockNesting:
 # Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 460
+  Max: 469
 
 # Offense count: 21
 # Configuration parameters: IgnoredMethods.
@@ -182,7 +195,6 @@ Naming/ConstantName:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
-    - 'deprecated/RMagick.rb'
     - 'doc/ex/InitialCoords.rb'
     - 'doc/ex/NewCoordSys.rb'
     - 'doc/ex/OrigCoordSys.rb'
@@ -227,11 +239,6 @@ Security/MarshalLoad:
     - 'spec/rmagick/image/marshal_spec.rb'
     - 'spec/rmagick/image_list/marshal_spec.rb'
 
-# Offense count: 1
-Style/AutoResourceCleanup:
-  Exclude:
-    - 'lib/rvg/to_c.rb'
-
 # Offense count: 7
 Style/CaseEquality:
   Exclude:

data/.yardopts

@@ -1,5 +1,5 @@
 --no-private
 lib/**/*.rb
-ext/**/*.c
+ext/**/*.cpp
 *.md
 LICENSE

data/CHANGELOG.md

@@ -3,6 +3,136 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 5.5.0
+
+Improvements
+
+- Add RBS signatures (#1458)
+- Remove unnecessary type check in KernelInfo#{unity_add, scale} (#1514)
+- Remove unnecessary type check in Image#{morphology, morphology_channel} (#1513)
+- Improve HatchFill.new to accept Pixel object as color (#1512)
+- Fix GraphicContext#font_weight to accept Numeric object (#1510)
+- Improve GraphicContext#font_weight to accept Symbol object (#1509)
+- Improve Stretchable#viewbox to use implicitly conversioned value (#1507)
+- Improve RVG::Transformable#rotate to convert to Float implicitly (#1506)
+- Fix Image#modulate in order to accept negative number (#1505)
+- Improve Image#modulate to accept "NN%" form string (#1504)
+- Implicit conversion to string with methods that expect a string (#1496)
+- Coerce to string instead of using #to_s (#1495)
+- Coerce to string where pass object into string interpolation (#1494)
+- Fix Draw#{fill_opacity, opacity, stroke_opacity} to correctly handle arguments (#1492)
+- Fix Draw#{interline_spacing, interword_spacing, kerning} to correctly handle arguments that can be converted to Float (#1491)
+- Remove unnecessary type check in KernelInfo methods (#1489)
+- Generate compile_flags.txt for clangd for development (#1488)
+- Fix Draw#{stroke_dasharray, stroke_miterlimit} to accept object which has #to_f method (#1486)
+- Fix Image#composite_affine to accept ImageList object (#1484)
+- Fix Image#add_compose_mask to accept ImageList object (#1483)
+- Fix incorrect number of required arguments in ArgumentError (#1482)
+- Fix ImageList#sort! that should return self (#1481)
+- Fix ImageList#eql? that should not raise exception if can't compare (#1479)
+- Fix ImageList#<=> that should return nil if can't compare (#1478)
+- Add DrawAttribute module to simplify Draw, DrawOptions and PolaroidOptions (#1477)
+- Add missing attribute writer methods in Image::{DrawOptions, PolaroidOptions} (#1476)
+- Add Image::PolaroidOptions#affine= (#1475)
+- Add Image::PolaroidOptions#tile= (#1474)
+- Attribute writer methods should return passed value (#1473)
+- Return self with ImageList if Image's method return self (#1472)
+- Fix Image#clut_channel to accept ImageList object (#1471)
+- Fix Magick::GradientFill#fill and Magick::TextureFill#fill to accept ImageList object (#1467)
+
+Bug Fixes
+
+- Fix typo in order to fix NoMethodError (#1515)
+- Sync compression value in order fix  the problem of compression being ignored by ImageMagick 7 (#1503)
+- Add PKG_CONFIG_PATH for ImageMagick 7 in order to fix installation error on macOS (#1501)
+
+## RMagick 5.4.4
+
+Bug Fixes
+
+- Fix installation error again in some environment at creatint Makefile (#1465)
+- Fix Pixel#<=> which should accept other class instance (#1463)
+
+## RMagick 5.4.3
+
+Bug Fixes
+
+- Fix installation error in some environment by using x flag to use C++ compiler in order to create Makefile (#1460)
+
+## RMagick 5.4.2
+
+Improvements
+
+- Check C++ compiler exists (#1453)
+
+## RMagick 5.4.1
+
+Bug Fixes
+
+- Fix invalid cast between different size variables (#1448)
+
+## RMagick 5.4.0
+
+Improvements
+
+- Use rb_io_path() if exist because pathv attr was marked as deprecated at Ruby 3.3 (#1409)
+- Add observer gem as dependency (#1411)
+- Add aliases of filter type (#1439)
+- Release GVL in Image#contrast (#1440)
+
+Bug Fixes
+
+- Use C++ compiler in order to fix installation error with latest ImageMagick 7 on Windows (#1433)
+
+## RMagick 5.3.0
+
+Improvements
+
+- Support GC compaction (#1388)
+
+Bug Fixes
+
+- Fix memory leak in `Magick::Draw` for recentry ImageMagick 6 by removing unnecessary `GetDrawInfo()` calling (#1406)
+- Fix crash on ImageList#write with animation gif (#1379)
+- Windows: Fix RubyInstaller::Runtime::DllDirectory::WinApiError (#1381)
+
+## RMagick 5.2.0
+
+Improvements
+
+- Add OnAlphaChannel and OffAlphaChannel to the AlphaChannelOption enumeration. (#1377)
+- Add Ruby 3.2 support (#1370)
+
+## RMagick 5.1.0
+
+Improvements
+
+- Improve multi-thread performance by releasing GVL (#1352)
+- Add Ractor support (#1349)
+- Avoid overriding compilation variables (#1365)
+- Remove pkg-config command dependency (#1366)
+
+## RMagick 5.0.0
+
+Improvements
+
+- Improve installer in order to avoid SEGV within pkg-config command (#1359)
+- Clean up the documents and comment in source code referring to something that no longer exist (#1363)
+- Remove deprecated 'tile' attribute in Draw#marshal_dump (#1364)
+- Remove deprecated #instance_eval calling when block was given with Magick::ImageList#montage, Magick::Image::Info.new and more (#1362)
+- Remove deprecated RMagick.rb file (#1361)
+- Remove deprecated Magick.trace_proc= (#1351)
+- Remove deprecated Magick::{Image, Image::Info}#monitor= (#1356)
+
+## RMagick 4.3.0
+
+Deprecates
+
+- Mark Magick.trace_proc= as deprecated (#1354)
+- Mark Magick::{Image, Image::Info}#monitor= as deprecated (#1353)
+
+These methods will be removed in RMagick 5.0 and no alternative.
+
 ## RMagick 4.2.6
 
 Improvements

data/Gemfile

@@ -2,3 +2,23 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rmagick.gemspec
 gemspec
+
+gem 'pry', '~> 0.14'
+gem 'rake-compiler', '~> 1.0'
+gem 'rspec', '~> 3.8'
+gem 'rspec_junit_formatter', '~> 0.6.0'
+gem 'simplecov', '~> 0.16.1'
+gem 'yard', '~> 0.9.24'
+
+if RUBY_PLATFORM !~ /mswin|mingw/
+  gem 'rubocop', '~> 0.81.0'
+  gem 'rubocop-rspec', '~> 1.38.1'
+  gem 'rubocop-performance', '~> 1.5.2'
+end
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+  # For CI
+  gem 'rbs', '~> 3.4'
+
+  gem 'steep', '~> 1.6'
+end

data/README.md

@@ -1,7 +1,6 @@
 RMagick
 =======
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/901780ea1a244a8584b18033b2e03866)](https://app.codacy.com/gh/rmagick/rmagick?utm_source=github.com&utm_medium=referral&utm_content=rmagick/rmagick&utm_campaign=Badge_Grade_Settings)
 [![GemVersion](https://img.shields.io/gem/v/rmagick.svg?style=flat)](https://rubygems.org/gems/rmagick)
 ![CI](https://github.com/rmagick/rmagick/workflows/CI/badge.svg)
 
@@ -39,6 +38,9 @@ These prerequisites are required for the latest version of RMagick.
 - Windows
 - Other \*nix-like systems
 
+**C++ compiler**
+- RMagick 5.4.0 or later requires a C++ compiler.
+
 **Ruby**
 - Version 2.3 or later.
 
@@ -64,40 +66,40 @@ sudo apt-get install libmagickwand-dev
 On Centos, you can run:
 
 ```sh
-sudo yum install gcc ImageMagick-devel make which
+sudo yum install ImageMagick-devel
 ```
 
 #### Arch Linux
 On Arch Linux, you can run:
 
 ```sh
-pacman -Syy pkg-config imagemagick
+pacman -Syy imagemagick
 ```
 
 #### Alpine Linux
 On Alpine Linux, you can run:
 
 ```
-apk add pkgconfig imagemagick imagemagick-dev imagemagick-libs
+apk add imagemagick imagemagick-dev imagemagick-libs
 ```
 
 or you can run if you would like to use ImageMagick 6:
 
 ```
-apk add pkgconfig imagemagick6 imagemagick6-dev imagemagick6-libs
+apk add imagemagick6 imagemagick6-dev imagemagick6-libs
 ```
 
 ### macOS
 On macOS, you can run:
 
 ```sh
-brew install pkg-config imagemagick
+brew install imagemagick
 ```
 
 or you can run if you would like to use ImageMagick 6:
 
 ```sh
-brew install pkg-config imagemagick@6
+brew install imagemagick@6
 ```
 
 ### Windows
@@ -105,7 +107,7 @@ brew install pkg-config imagemagick@6
 2. You might need to configure `PATH` environment variable to where the compiler is located.
    (Ex: `set PATH=C:\Ruby27-x64\msys64\usr\bin;C:\Ruby27-x64\msys64\mingw64\bin;%PATH%`)
 3. Download `ImageMagick-7.XXXX-Q16-x64-dll.exe` (not, `ImageMagick-7.XXXX-Q16-x64-static.exe`) binary from [Windows Binary Release](https://imagemagick.org/script/download.php#windows), or you can download ImageMagick 6 from [Windows Binary Release](https://legacy.imagemagick.org/script/download.php#windows).
-4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers and librarries for C and C++` in an installer for RMagick.
+4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers and libraries for C and C++` in an installer for RMagick.
 <img width="50%" src="https://user-images.githubusercontent.com/199156/77183472-b72cbd00-6b11-11ea-8b9a-247bc1f9d8b1.png" />
 
 Installing RMagick
@@ -164,15 +166,6 @@ subdirectory of the installation directory for any error messages. These
 messages typically contain enough additional information for you to be able to
 diagnose the problem. Also see [this FAQ][libmagick-faq].
 
-On OS X with Homebrew, try (re)installing pkg-config:
-
-```sh
-brew uninstall pkg-config
-brew install pkg-config
-brew unlink pkg-config
-brew link pkg-config
-```
-
 ### Cannot open shared object file
 
 If you get a message like this: