rmagick 5.2.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63297d93ba6355721cf93286469d8f1d278d553ca80b1c85fa5cefbc50f4217f
-  data.tar.gz: 7d416384fa378aa68c2f16c980e41c63d932a805e488c7cb2bc987c974262736
+  metadata.gz: bbc981dbe87ea60366b54e23cbf158b40abe7c17db2f506cad561c851728bbcc
+  data.tar.gz: 3ed1649aad11bd5d092288ad20e5c4d50d9b3d44e129c0b168f94cfdf423693a
 SHA512:
-  metadata.gz: 2f03de2614b1b8321b6a26a01e47cbf625455c4bfc5e88c9ae3354bf933d66a63fee9b9205c8a7d72893672e15bb8933bcb2cb8915074e702d74876c4c1c742f
-  data.tar.gz: f9fa937f718148d007962a0b6e2f6588cc157d9a4998fccd942a5c8ac3066ca04bf8e60b79067abe5ee0c2402621cdb571287dca72ecdc6bc45625303ec71dfc
+  metadata.gz: f3bb53278c117cb808987e70bd8b09cb5ac89dd185e51684b745cf71880e876c0b0da304b24b30169c3eb53698503630d550ab3e449ce9b8a02bcbd26a3f5ca1
+  data.tar.gz: ff0beeeb2c91ad2e284d14f05617938bf5c7b96ef72d31fcbe9b3a5f96a217d084f60dee7fd52573be36a18689d77788951f410b2bcad6976032917e9828706b

data/.devcontainer/ImageMagick6/devcontainer.json

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

data/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.1.2",
-      "IMAGEMAGICK_VERSION": "7.1.0-55"
+      "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:
@@ -30,17 +30,29 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        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-70, major-minor: '6.9' }
+          - { full: 6.9.13-4, major-minor: '6.9' }
           - { full: 7.0.11-14, major-minor: '7.0' }
-          - { full: 7.1.0-55, major-minor: '7.1' }
+          - { 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:
@@ -59,15 +71,21 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         imagemagick-version:
-          - { full: 6.9.12-70, major-minor: '6.9' }
-          - { full: 7.0.11-14, major-minor: '7.0' }
-          - { full: 7.1.0-55, major-minor: '7.1' }
+          - { 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:
@@ -79,3 +97,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,9 @@ tmp
 *.o
 *.a
 *.log
+*.def
 Makefile
 extconf.h
 build-ImageMagick/
+doc/node_modules/
+doc/package-lock.json

data/.yardopts

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

data/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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

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)
 
@@ -105,7 +104,7 @@ brew install 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

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 liblqr-1-0-dev vim gsfonts ghostscript ccache
+  libtiff5-dev libwebp-dev liblqr-1-0-dev vim gsfonts ghostscript
 
 if [ ! -d /usr/include/freetype ]; then
   # If `/usr/include/freetype` is not existed, ImageMagick 6.7 configuration fails about Freetype.
@@ -52,7 +52,7 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr "${options}"
+  ./configure --prefix=/usr "${options}"
   make -j
 }
 

data/before_install_osx.sh

@@ -17,10 +17,10 @@ fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
 brew uninstall --force imagemagick imagemagick@6
-brew install wget ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool zlib webp
+brew install wget ghostscript freetype jpeg little-cms2 openexr libomp libpng libtiff liblqr libtool zlib webp
 
-export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/lib"
-export CPPFLAGS="-I/usr/local/opt/libxml2/include -I/usr/local/opt/zlib/include"
+export LDFLAGS="-L$(brew --prefix libxml2)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix glib)/lib -L$(brew --prefix openexr)/lib"
+export CPPFLAGS="-I$(brew --prefix libxml2)/include -I$(brew --prefix zlib)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include -I$(brew --prefix openexr)/include/OpenEXR"
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -43,7 +43,7 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}" --without-raw
+  ./configure --prefix=/usr/local "${options}" --without-raw --without-jxl
   make -j
 }
 

data/ext/RMagick/extconf.rb

@@ -4,6 +4,12 @@ require 'rubygems'
 require 'mkmf'
 require 'pkg-config'
 
+module MakeMakefile
+  # Use the C++ compiler to retrieve the information needed to create a Makefile.
+  remove_const(:CONFTEST_C)
+  CONFTEST_C = "#{CONFTEST}.cpp"
+end
+
 module RMagick
   class Extconf
     require 'rmagick/version'
@@ -77,7 +83,7 @@ module RMagick
     end
 
     def configure_headers
-      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h]
+      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h ruby.h ruby/io.h]
 
       if have_header('MagickCore/MagickCore.h')
         headers << 'MagickCore/MagickCore.h'
@@ -111,6 +117,8 @@ module RMagick
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
 
+        $CPPFLAGS += ' -std=c++11 -Wno-register'
+
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
 
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
@@ -120,6 +128,8 @@ module RMagick
         $LDFLAGS += %( -L"#{dir_paths[:lib]}")
         $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
+        $CPPFLAGS += ' -std=c++11 -Wno-register'
+
         have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
 
       else # mswin
@@ -131,13 +141,11 @@ module RMagick
 
         $LOCAL_LIBS += ' ' + (im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
 
+        $CPPFLAGS += ' /std:c++11'
       end
-
-      $CPPFLAGS << if have_macro('__GNUC__')
-                     ' -std=gnu99 -Wno-void-pointer-to-int-cast -Wno-void-pointer-to-enum-cast -Wno-pointer-to-int-cast'
-                   else
-                     ' -std=c99'
-                   end
+      ruby_version = RUBY_VERSION.split('.')
+      $CPPFLAGS += " -DRUBY_VERSION_MAJOR=#{ruby_version[0]} -DRUBY_VERSION_MINOR=#{ruby_version[1]}"
+      $CPPFLAGS += ' $(optflags) $(debugflags)'
     end
 
     def exit_failure(msg)
@@ -305,10 +313,8 @@ module RMagick
       exit_failure <<~END_MINGW
         Can't install RMagick #{RMAGICK_VERS}.
         Can't find the ImageMagick library.
-        Retry with '--with-opt-dir' option.
-        Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
-        e.g.
-          gem install rmagick -- '--with-opt-dir=\"C:\\Program Files\\ImageMagick-6.9.1-Q16\"'
+
+        Please check PATH environment variable for ImageMagick installation path.
       END_MINGW
     end
 
@@ -360,7 +366,9 @@ module RMagick
 
     def create_header_file
       ruby_api = [
-        'rb_gc_adjust_memory_usage' # Ruby 2.4.0
+        'rb_gc_adjust_memory_usage', # Ruby 2.4.0
+        'rb_gc_mark_movable', # Ruby 2.7.0
+        'rb_io_path' # Ruby 3.2.0
       ]
       memory_api = %w[
         posix_memalign

data/ext/RMagick/{rmagick.c → rmagick.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmagick.c
- * @version  $Id: rmagick.c,v 1.4 2009/12/20 02:33:32 baror Exp $
+ * @file     rmagick.cpp
+ * @version  $Id: rmagick.cpp,v 1.4 2009/12/20 02:33:32 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -14,8 +14,6 @@
 
 
 
-static VALUE rm_yield_handle_exception(VALUE, VALUE) ATTRIBUTE_NORETURN;
-
 static VALUE
 rm_yield_body(VALUE object)
 {
@@ -42,7 +40,7 @@ rm_yield_handle_exception(VALUE allocated_area, VALUE exc)
  *
  */
 VALUE
-Magick_colors(VALUE class)
+Magick_colors(VALUE klass)
 {
     const ColorInfo **color_info_list;
     size_t number_colors, x;
@@ -60,10 +58,10 @@ Magick_colors(VALUE class)
     {
         for (x = 0; x < number_colors; x++)
         {
-            rb_rescue(rm_yield_body, Import_ColorInfo(color_info_list[x]), rm_yield_handle_exception, (VALUE)color_info_list);
+            rb_rescue(RESCUE_FUNC(rm_yield_body), Import_ColorInfo(color_info_list[x]), RESCUE_EXCEPTION_HANDLER_FUNC(rm_yield_handle_exception), (VALUE)color_info_list);
         }
         magick_free((void *)color_info_list);
-        return class;
+        return klass;
     }
     else
     {
@@ -93,7 +91,7 @@ Magick_colors(VALUE class)
  *
  */
 VALUE
-Magick_fonts(VALUE class)
+Magick_fonts(VALUE klass)
 {
     const TypeInfo **type_info;
     size_t number_types, x;
@@ -109,10 +107,10 @@ Magick_fonts(VALUE class)
     {
         for (x = 0; x < number_types; x++)
         {
-            rb_rescue(rm_yield_body, Import_TypeInfo((const TypeInfo *)type_info[x]), rm_yield_handle_exception, (VALUE)type_info);
+            rb_rescue(RESCUE_FUNC(rm_yield_body), Import_TypeInfo((const TypeInfo *)type_info[x]), RESCUE_EXCEPTION_HANDLER_FUNC(rm_yield_handle_exception), (VALUE)type_info);
         }
         magick_free((void *)type_info);
-        return class;
+        return klass;
     }
     else
     {
@@ -170,7 +168,7 @@ MagickInfo_to_format(const MagickInfo *magick_info)
  * @return [Hash] the formats hash.
  */
 VALUE
-Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
+Magick_init_formats(VALUE klass ATTRIBUTE_UNUSED)
 {
     const MagickInfo **magick_info;
     size_t number_formats, x;
@@ -210,11 +208,11 @@ Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
  *   Set resource limits.
  *   @param resource [String, Symbol] the type of resource
  *   @param limit [Numeric] the new limit number
- * 
+ *
  * @return [Numeric] the old limit.
  */
 VALUE
-Magick_limit_resource(int argc, VALUE *argv, VALUE class)
+Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 {
     VALUE resource, limit;
     ResourceType res = UndefinedResource;
@@ -227,7 +225,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
     switch (TYPE(resource))
     {
         case T_NIL:
-            return class;
+            return klass;
 
         case T_SYMBOL:
             id = (ID)SYM2ID(resource);
@@ -265,7 +263,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             str = StringValueCStr(resource);
             if (*str == '\0')
             {
-                return class;
+                return klass;
             }
             else if (rm_strcasecmp("area", str) == 0)
             {
@@ -321,12 +319,12 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
  * @param threshold [Numeric] the number of megabytes to set.
  */
 VALUE
-Magick_set_cache_threshold(VALUE class, VALUE threshold)
+Magick_set_cache_threshold(VALUE klass, VALUE threshold)
 {
     unsigned long thrshld = NUM2ULONG(threshold);
     SetMagickResourceLimit(MemoryResource, (MagickSizeType)thrshld);
     SetMagickResourceLimit(MapResource, (MagickSizeType)(2*thrshld));
-    return class;
+    return klass;
 }
 
 
@@ -354,7 +352,7 @@ Magick_set_cache_threshold(VALUE class, VALUE threshold)
  * @param args [String] the mask of log event.
  */
 VALUE
-Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
+Magick_set_log_event_mask(int argc, VALUE *argv, VALUE klass)
 {
     int x;
 
@@ -366,7 +364,7 @@ Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
     {
         SetLogEventMask(StringValueCStr(argv[x]));
     }
-    return class;
+    return klass;
 }
 
 /**
@@ -388,9 +386,8 @@ Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
  * @param format [String] the format to set.
  */
 VALUE
-Magick_set_log_format(VALUE class, VALUE format)
+Magick_set_log_format(VALUE klass, VALUE format)
 {
     SetLogFormat(StringValueCStr(format));
-    return class;
+    return klass;
 }
-