rmagick 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63297d93ba6355721cf93286469d8f1d278d553ca80b1c85fa5cefbc50f4217f
-  data.tar.gz: 7d416384fa378aa68c2f16c980e41c63d932a805e488c7cb2bc987c974262736
+  metadata.gz: cb6efb1cd1084ddfa7fcf81fa760b652ff8c2cf02609da08744931b71bfa5af9
+  data.tar.gz: 66a715d679ea9114f0525cdd5ee60643b8fb84f9f96548a1d82a27e8fc9d0821
 SHA512:
-  metadata.gz: 2f03de2614b1b8321b6a26a01e47cbf625455c4bfc5e88c9ae3354bf933d66a63fee9b9205c8a7d72893672e15bb8933bcb2cb8915074e702d74876c4c1c742f
-  data.tar.gz: f9fa937f718148d007962a0b6e2f6588cc157d9a4998fccd942a5c8ac3066ca04bf8e60b79067abe5ee0c2402621cdb571287dca72ecdc6bc45625303ec71dfc
+  metadata.gz: '057860ced79ea3612eaae3df6840c57833da74b4eb25ddca45da7d40bf6577cbc6288b1a807dc9c9f8aeb6b0a652f3fe13007166fac2094ec9e75b59e170adf4'
+  data.tar.gz: df562bbda78354a5b595c2494ce6971b6a51c068df580cebd22c9accfb99c73f12ecaf55ab8c9b4f7f25a2cd05530a9b53af77fc29791ee9825bd6ef6b82320a

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.12-85"
     }
   },
   "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-7"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.github/workflows/ci.yml

@@ -34,13 +34,20 @@ jobs:
         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.12-85, 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-7, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v3
+    - name: Cache ImageMagick built objects
+      uses: actions/cache@v3
+      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:
@@ -61,13 +68,20 @@ jobs:
       matrix:
         ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
         imagemagick-version:
-          - { full: 6.9.12-70, major-minor: '6.9' }
+          - { full: 6.9.12-85, 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-7, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v3
+    - name: Cache ImageMagick built objects
+      uses: actions/cache@v3
+      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 +93,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.2']
+        imagemagick-version:
+          - { full: 6.9.12-85, major-minor: '6.9' }
+          - { full: 7.1.1-7, 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@v3
+    - 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

@@ -23,3 +23,5 @@ tmp
 Makefile
 extconf.h
 build-ImageMagick/
+doc/node_modules/
+doc/package-lock.json

data/CHANGELOG.md

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

data/ext/RMagick/extconf.rb

@@ -360,7 +360,8 @@ 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
       ]
       memory_api = %w[
         posix_memalign

data/ext/RMagick/rmdraw.c

@@ -13,6 +13,9 @@
 #include "rmagick.h"
 #include "float.h"
 
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+static void Draw_compact(void *drawptr);
+#endif
 static void Draw_mark(void *);
 static void Draw_destroy(void *);
 static size_t Draw_memsize(const void *);
@@ -21,7 +24,14 @@ static VALUE get_type_metrics(int, VALUE *, VALUE, gvl_function_t);
 
 const rb_data_type_t rm_draw_data_type = {
     "Magick::Draw",
-    { Draw_mark, Draw_destroy, Draw_memsize, },
+    {
+        Draw_mark,
+        Draw_destroy,
+        Draw_memsize,
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+        Draw_compact,
+#endif
+    },
     0, 0,
     RUBY_TYPED_FROZEN_SHAREABLE,
 };
@@ -1267,6 +1277,25 @@ Draw_primitive(VALUE self, VALUE primitive)
     return self;
 }
 
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+/**
+ * Compact the objects.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param drawptr pointer to a Draw object
+ */
+static void
+Draw_compact(void *drawptr)
+{
+    Draw *draw = (Draw *)drawptr;
+
+    if (draw->primitives != (VALUE)0)
+    {
+        draw->primitives = rb_gc_location(draw->primitives);
+    }
+}
+#endif
 
 /**
  * Mark referenced objects.
@@ -1282,7 +1311,11 @@ Draw_mark(void *drawptr)
 
     if (draw->primitives != (VALUE)0)
     {
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+        rb_gc_mark_movable(draw->primitives);
+#else
         rb_gc_mark(draw->primitives);
+#endif
     }
 }
 
@@ -1387,8 +1420,6 @@ DrawOptions_initialize(VALUE self)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 
-    GetDrawInfo(NULL, draw_options->info);
-
     if (rb_block_given_p())
     {
         rb_yield(self);

data/ext/RMagick/rmilist.c

@@ -1193,8 +1193,8 @@ ImageList_write(VALUE self, VALUE file)
 
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
-#if defined(_WIN32)
         add_format_prefix(info, fptr->pathv);
+#if defined(_WIN32)
         SetImageInfoFile(info, NULL);
 #else
         SetImageInfoFile(info, rb_io_stdio_file(fptr));
@@ -1229,7 +1229,7 @@ ImageList_write(VALUE self, VALUE file)
 #endif
 
     // Tell WriteImage if we want a multi-images file.
-    if (imagelist_length(self) > 1L && GetMagickAdjoin(m))
+    if (imagelist_length(self) > 1L && m && GetMagickAdjoin(m))
     {
         info->adjoin = MagickTrue;
     }

data/ext/RMagick/rmimage.c

@@ -15804,6 +15804,10 @@ void add_format_prefix(Info *info, VALUE file)
     char *p;
 
     // Convert arg to string. If an exception occurs raise an error condition.
+    if (rb_respond_to(file, rb_intern("path")))
+    {
+        FilePathStringValue(file);
+    }
     file = rb_rescue(rb_String, file, file_arg_rescue, file);
 
     filename = rm_str2cstr(file, &filename_l);
@@ -15899,21 +15903,19 @@ Image_write(VALUE self, VALUE file)
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
         rb_io_check_writable(fptr);
-#if defined(_WIN32)
         add_format_prefix(info, fptr->pathv);
-        strlcpy(image->filename, info->filename, sizeof(image->filename));
+#if defined(_WIN32)
         SetImageInfoFile(info, NULL);
 #else
         SetImageInfoFile(info, rb_io_stdio_file(fptr));
-        memset(image->filename, 0, sizeof(image->filename));
 #endif
     }
     else
     {
         add_format_prefix(info, file);
-        strlcpy(image->filename, info->filename, sizeof(image->filename));
         SetImageInfoFile(info, NULL);
     }
+    strlcpy(image->filename, info->filename, sizeof(image->filename));
 
     rm_sync_image_options(image, info);
 

data/ext/RMagick/rmmain.c

@@ -1924,8 +1924,7 @@ version_constants(void)
             "This is %s ($Date: 2009/12/20 02:33:33 $) Copyright (C) 2009 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
-            "Web page: http://rmagick.rubyforge.org\n"
-            "Email: rmagick@rubyforge.org\n",
+            "Web page: https://rmagick.github.io/\n",
             Q(RMAGICK_VERSION_STRING), mgk_version, Q(RUBY_VERSION_STRING));
 
     str = rb_str_new2(long_version);

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '5.2.0'
+  VERSION = '5.3.0'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/lib/rmagick_internal.rb

@@ -14,7 +14,7 @@ if RUBY_PLATFORM =~ /mingw/i
   begin
     require 'ruby_installer'
     ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
-      RubyInstaller::Runtime.add_dll_directory(path)
+      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
     end
   rescue LoadError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -160,7 +160,6 @@ extensions:
 - ext/RMagick/extconf.rb
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".devcontainer/Dockerfile"
 - ".devcontainer/ImageMagick6/devcontainer.json"
 - ".devcontainer/devcontainer.json"
@@ -238,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.7.7 or later
-rubygems_version: 3.4.2
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick

data/.codeclimate.yml

@@ -1,63 +0,0 @@
-engines:
-  cppcheck:
-    enabled: true
-    checks:
-      variableScope:
-        enabled: false
-      toomanyconfigs:
-        enabled: false
-      invalidPrintfArgType_sint:
-        enabled: false
-      redundantAssignment:
-        enabled: false
-      selfAssignment:
-        enabled: false
-      unreachableCode:
-        enabled: false
-      unsignedLessThanZero:
-        enabled: false
-      toomanyconfigs:
-        enabled: false
-      complex-definition:
-        enabled: false
-
-  markdownlint:
-    enabled: true
-    checks:
-      # Line length
-      MD013:
-        enabled: false
-      # Emphasis used instead of a header
-      MD036:
-        enabled: false
-      # Hard tabs
-      MD010:
-        enabled: false
-      # Dollar signs used before commands without showing output
-      MD014:
-        enabled: false
-      # Headers should be surrounded by blank lines
-      MD022:
-        enabled: false
-      # Multiple consecutive blank lines
-      MD012:
-        enabled: false
-      # Bare URL used
-      MD034:
-        enabled: false
-      # Ordered list item prefix
-      MD029:
-        enabled: false
-      # Lists should be surrounded by blank lines
-      MD032:
-        enabled: false
-      # Code block style
-      MD046:
-        enabled: false
-      # Header style
-      MD003:
-        enabled: false
-      # Spaces after list markers
-      MD030:
-        enabled: false
-