rmagick 4.2.2 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c383bce80132c17b4d8a6afab0085b2f4d5d23f582473d9405b5f6dcb3d6283f
-  data.tar.gz: 0f5f7afe6df7a1c5095860ca5341d0b72a4960b8ead6a2779bd8209a92078f95
+  metadata.gz: 6fd768daa5bf84d7e835a4c300d57f6826b3fd86820dd3048a12d73db62ec89f
+  data.tar.gz: b7afe50d7396365282e6d5e8ff7b8a6c2b0e91e7f1e2d9562d1078dd26bda7a4
 SHA512:
-  metadata.gz: 619e5ec7f5fbd0750fb5bc4807d9d7ca0e58b6ba6e3efc9726541bbe3c260a748c026446ce89ef51661254b5285f907254d9b389cb237e141bd525fa23bbf2b6
-  data.tar.gz: 50e98c64b22c0bbf9d4b5aafd6664d02abdc2d8286a703e9199aed8b5e9597c4ce1ec4abeceabed20c21b5ab6d703b0ff9d4d81637d08b2c2ba93e615b02184f
+  metadata.gz: 23b6376b8c659276107e35c4e58428bc68a4cd8d2d24830ee27c99a83dea0349516af72bf8746a9064f115d35ae3e2f8affa376c6b6ec77d8b7a89aa7ddede8c
+  data.tar.gz: 7633f97e950e07f2381f25d1a181b427408fa8e46790b0506c31d83d029f58f5098a073446d659d82a05988c20848f60a37fbfe5759340a8613da87bdbc53cae

data/.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+ARG RUBY_VERSION
+
+FROM ruby:${RUBY_VERSION}
+
+ARG IMAGEMAGICK_VERSION
+
+RUN mkdir /setup
+ADD *.sh /setup
+
+ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
+
+RUN /setup/setup-user.sh
+
+WORKDIR /workspaces/rmagick

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -0,0 +1,11 @@
+{
+  "name": "ImageMagick 6",
+  "build": {
+    "dockerfile": "../Dockerfile",
+    "args": {
+      "RUBY_VERSION": "3.1.2",
+      "IMAGEMAGICK_VERSION": "6.9.13-4"
+    }
+  },
+  "onCreateCommand": "/setup/setup-repo.sh"
+}

data/.devcontainer/devcontainer.json

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

data/.devcontainer/setup-repo.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+apt-get update
+apt-get install sudo
+
+bash /workspaces/rmagick/before_install_linux.sh
+
+cd /workspaces/rmagick
+bundle install --path=vendor/bundle --jobs 4 --retry 3

data/.devcontainer/setup-user.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+codespaces_bash="$(cat \
+<<'EOF'
+# Codespaces bash prompt theme
+__bash_prompt() {
+    local userpart='`export XIT=$? \
+        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
+        && echo -n "\[\033[0;36m\][IM ${IMAGEMAGICK_VERSION}]" \
+        && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
+    local gitbranch='`\
+        if [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
+            export BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null); \
+            if [ "${BRANCH}" != "" ]; then \
+                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
+                && if git ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
+                        echo -n " \[\033[1;33m\]✗"; \
+                fi \
+                && echo -n "\[\033[0;36m\]) "; \
+            fi; \
+        fi`'
+    local lightblue='\[\033[1;34m\]'
+    local removecolor='\[\033[0m\]'
+    PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
+    unset -f __bash_prompt
+}
+__bash_prompt
+
+__show_notice() {
+  local __message="
+\033[0;32mWelcome to Codespaces! You are using the pre-configured rmagick image.\033[0m
+
+\033[0;35mTests can be executed with:\033[0m bundle exec rake
+\033[0;35mCode style can be checked with:\033[0m STYLE_CHECKS=true bundle exec rubocop
+"
+  echo -e "$__message"
+
+  unset -f __show_notice
+}
+__show_notice
+EOF
+)"
+
+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

@@ -7,12 +7,15 @@ on:
   pull_request:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby 2.3
       uses: ruby/setup-ruby@master
       with:
@@ -24,19 +27,32 @@ jobs:
 
   test-linux:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
+        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.11-58, major-minor: '6.9' }
-          - { full: 7.0.10-58, 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@v2
+    - 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:
@@ -55,14 +71,21 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
-          - { full: 6.9.11-58, major-minor: '6.9' }
-          - { full: 7.0.10-58, 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@v2
+    - 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,31 +100,43 @@ jobs:
 
   test-windows:
     runs-on: windows-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['3.3']
         imagemagick-version:
-          - { full: 6.8.9-10, major-minor: '6.8' }
-          - { 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.
+          - { 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@v2
+    - 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 }}"
-        $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
-        choco install ghostscript -Version 9.50
-        wget $url --progress=dot
-        cmd.exe /D /S /C "$($installer_name) /DIR=D:\ImageMagick /VERYSILENT /TASKS=install_Devel"
+        $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 "SET MAKE=make & SET PATH=D:\ImageMagick;%PATH% & bundle install --path=vendor/bundle --retry 3 & bundle exec rake"
+        cmd.exe /D /S /C "bundle install --path=vendor/bundle --retry 3 & bundle exec rake"

data/.gitignore

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

data/.rubocop_todo.yml

@@ -182,7 +182,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'

data/.yardopts

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

data/CHANGELOG.md

@@ -3,6 +3,137 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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
+
+- Remove test_files to reduce gem package size (#1338)
+
+Bug Fixes
+
+- Guard against an empty rpath (#1333)
+- Call GetImageDistortion instead of IsImagesEqual to fix the issue reported in #1342 (#1343)
+
+## RMagick 4.2.5
+
+Bug Fixes
+
+- Specify rpath linker option to fix dynamic lib lookup failure on Linux (#1325)
+- Fix Image#profile! that can't delete exif data (#1326)
+
+## RMagick 4.2.4
+
+Improvements
+
+- spec_helper: drop require_relative to lib directory (#1306)
+- Fix build error with Ruby 3.1 on macOS (#1313)
+
+Bug Fixes
+
+- remove Mutex in trace_proc= (#1303)
+- channel_mean_spec: fix floating point comparison (#1307)
+- changed_predicate_spec: ensure target directory exists (#1305)
+- Doc: Fix documentation of Magick::Image#crop (#1311)
+- Magick::UndefinedKernel should also not be used when creating a new KernelInfo. (#1312)
+
+## RMagick 4.2.3
+
+Bug Fixes
+
+- Re-add block syntax deprecation warning and fix in RMagick source (#1279) (#1280)
+- Doc: Replace Magick::Montage with Magick::ImageList::Montage (#1281)
+- Update shadow example (#1297)
+- Escape the backslashes in windows error message (#1298)
+- Also set the alpha value of the target pixel (#1299)
+- Set alpha_trait to BlendPixelTrait when the alpha value of the pixel is not opaque. (#1300)
+
 ## RMagick 4.2.2
 
 Bug Fixes:

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:
@@ -197,6 +190,8 @@ export LD_LIBRARY_PATH=/usr/local/lib
 On Linux, see `ld(1)` and `ld.so(8)` for more information. On other operating
 systems, see the documentation for the dynamic loading facility.
 
+This operation might not be required when you can use 4.2.5 or later.
+
 ### Segmentation fault
 
 Default stack size of your operating system might be too small. Try removing