rmagick 5.4.4 → 6.0.0

data/CHANGELOG.md

@@ -3,6 +3,83 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.0.0
+
+Improvements
+
+- Improve compatibility of Image#pixel_color value for ImageMagick 6 and 7 (#1591)
+- Add missing constants (#1580)
+- Loosen ImageMagick version check between compiled and runtime (#1526)
+
+Bug Fixes
+
+- Transform image according to Info#colorspace (#1594)
+- Sync Image::Info attributes to image object (#1593)
+- Fix install error on Windows MINGW environment (#1588)
+- Fix header checks in order to use aligned_malloc expectedly (#1579)
+
+Breaking Changes
+
+- Change method that returns a color name to return a hex string (#1592)
+  - The following methods return RGBA hex string as color name. The hex string length is according to color depth.
+    - `Image#background_color`
+    - `Image#border_color`
+    - `Image#colormap`
+    - `Image#matte_color`
+    - `Image#transparent_color`
+    - `Info#background_color`
+    - `Info#border_color`
+    - `Info#matte_color`
+    - `Info#transparent_color`
+  - Change default value of argument
+    - The hex argument of `Pixel#to_color` has `true` by default.
+- Drop ruby-mswin environment support on Windows (#1587)
+- Drop Ruby 2.x support (#1540)
+- Drop ImageMagick 6.7 support (#1539)
+
+## 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

data/Gemfile

@@ -2,3 +2,17 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rmagick.gemspec
 gemspec
+
+gem 'pry', '~> 0.14'
+gem 'rake-compiler', '~> 1.2'
+gem 'rspec', '~> 3.13'
+gem 'rspec_junit_formatter', '~> 0.6.0'
+gem 'simplecov', '~> 0.22.0'
+gem 'yard', '~> 0.9.36'
+
+gem 'rubocop', '~> 1.63'
+gem 'rubocop-performance', '~> 1.21'
+gem 'rubocop-rspec', '~> 2.29'
+
+gem 'rbs', '~> 3.4'
+gem 'steep', '~> 1.6'

data/README.md

@@ -42,14 +42,14 @@ These prerequisites are required for the latest version of RMagick.
 - RMagick 5.4.0 or later requires a C++ compiler.
 
 **Ruby**
-- Version 2.3 or later.
+- Version 3.0 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 6.8.9 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>.
@@ -138,7 +138,7 @@ gem install rmagick
 ### Versioning
 
 RMagick is versioned according to Semantic Versioning. For stable version
-compatible with Ruby 1.8+, use `~> 2.0`. Versions >= 3 work on Ruby >= 2.x
+compatible with Ruby 3.0+, use `~> 3.0`. Versions >= 6 work on Ruby >= 3.x
 only.
 
 Using RMagick

data/Rakefile

@@ -71,7 +71,7 @@ namespace :website do
     now = now.strftime('%m/%d/%y')
 
     lines.each do |line|
-      line.gsub!(/0\.0\.0/, Magick::VERSION)
+      line.gsub!("0.0.0", Magick::VERSION)
       line.gsub!(%r{YY/MM/DD}, now)
     end
     lines
@@ -143,6 +143,17 @@ namespace :website do
   end
 end
 
+namespace :rbs do
+  desc 'Validate RBS definitions'
+  task :validate do
+    all_sigs = Dir.glob('sig').map { |dir| "-I #{dir}" }.join(' ')
+    sh("bundle exec rbs #{all_sigs} validate") do |ok, _|
+      abort('one or more rbs validate failed') unless ok
+    end
+  end
+end
+
+require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

data/before_install_linux.sh

@@ -2,8 +2,6 @@
 
 set -euox pipefail
 
-gem install bundler -v 2.3.26 # Bundler 2.4.x has dropped support for Ruby 2.3
-
 if [ -v STYLE_CHECKS ]; then
   set +ux
   exit 0
@@ -15,22 +13,14 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
   exit 1
 fi
 
-sudo apt-get clean
-sudo apt-get update
-
 # remove all existing imagemagick related packages
 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 \
+  liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev \
   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.
-  sudo ln -sf /usr/include/freetype2 /usr/include/freetype
-fi
-
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
 if [ -v CONFIGURE_OPTIONS ]; then

data/before_install_osx.sh

@@ -2,8 +2,6 @@
 
 set -euox pipefail
 
-gem install bundler -v 2.3.26 # Bundler 2.4.x has dropped support for Ruby 2.3
-
 if [ -v STYLE_CHECKS ]; then
   set +ux
   exit 0
@@ -17,10 +15,10 @@ fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
 brew uninstall --force imagemagick imagemagick@6
-brew install wget ghostscript freetype jpeg little-cms2 openexr libomp libpng libtiff liblqr libtool zlib webp
+brew install wget ghostscript freetype libtool jpeg little-cms2 openexr libomp libpng libtiff liblqr zlib webp zstd
 
-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"
+export LDFLAGS="-L$(brew --prefix jpeg)/lib -L$(brew --prefix little-cms2)/lib -L$(brew --prefix openexr)/lib -L$(brew --prefix libomp)/lib -L$(brew --prefix libpng)/lib -L$(brew --prefix libtiff)/lib -L$(brew --prefix liblqr)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix webp)/lib -L$(brew --prefix zstd)/lib"
+export CPPFLAGS="-I$(brew --prefix jpeg)/include -I$(brew --prefix openexr)/include/OpenEXR -I$(brew --prefix libtiff)/include -I$(brew --prefix zlib)/include -I$(brew --prefix zstd)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include"
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -43,7 +41,7 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}" --without-raw --without-jxl
+  ./configure --prefix=/usr/local "${options}" --without-raw
   make -j
 }
 
@@ -52,7 +50,7 @@ if [ ! -d "${build_dir}" ]; then
 fi
 
 cd "${build_dir}"
-make install -j
+sudo make install -j
 cd "${project_dir}"
 
 set +ux

data/ext/RMagick/extconf.rb

@@ -4,21 +4,12 @@ require 'rubygems'
 require 'mkmf'
 require 'pkg-config'
 
-module MakeMakefile
-  # Use the C++ compiler to retrieve the information needed to create a Makefile for mswin environment.
-  remove_const(:CONFTEST_C)
-  CONFTEST_C = "#{CONFTEST}.cpp"
-end
-
 module RMagick
   class Extconf
     require 'rmagick/version'
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
 
-    # ImageMagick 6.7 package
-    IM6_7_PACKAGES = ['ImageMagick'].freeze
-
     # ImageMagick 6.8+ packages
     IM6_PACKAGES = %w[
       ImageMagick-6.Q64HDRI
@@ -48,6 +39,8 @@ module RMagick
     def initialize
       @stdout = $stdout.dup
 
+      exit_failure("No longer support MSWIN environment.") if RUBY_PLATFORM.include?('mswin')
+
       setup_pkg_config_path
       assert_can_compile!
       configure_compile_options
@@ -55,19 +48,20 @@ module RMagick
     end
 
     def setup_pkg_config_path
-      return if RUBY_PLATFORM =~ /mswin|mingw/
+      return if RUBY_PLATFORM.include?('mingw')
 
       if find_executable('brew')
-        pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
+        append_pkg_config_path("#{`brew --prefix imagemagick`.strip}/lib/pkgconfig")
+        append_pkg_config_path("#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig")
       elsif find_executable('pacman')
-        pkg_config_path = '/usr/lib/imagemagick6/pkgconfig'
-      else
-        return
+        append_pkg_config_path('/usr/lib/imagemagick6/pkgconfig')
       end
+    end
 
+    def append_pkg_config_path(path)
       pkg_config_paths = ENV['PKG_CONFIG_PATH'].to_s.split(':')
-      if File.exist?(pkg_config_path) && !pkg_config_paths.include?(pkg_config_path)
-        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], pkg_config_path].compact.join(':')
+      if File.exist?(path) && !pkg_config_paths.include?(path)
+        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], path].compact.join(':')
       end
     end
 
@@ -92,11 +86,25 @@ module RMagick
       else
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find magick/MagickCore.h."
       end
+
+      if have_header('malloc.h')
+        headers << 'malloc.h'
+      elsif have_header('malloc/malloc.h')
+        headers << 'malloc/malloc.h'
+      end
     end
 
     def configure_compile_options
       # Magick-config is not available on Windows
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      if RUBY_PLATFORM.include?('mingw') # mingw
+
+        dir_paths = search_paths_for_windows
+        $CPPFLAGS += %( -I"#{dir_paths[:include]}")
+        $CPPFLAGS += ' -x c++ -std=c++11 -Wno-register'
+        $LDFLAGS += %( -L"#{dir_paths[:root]}" -lucrt)
+        $LDFLAGS += (im_version_at_least?('7.0.0') ? ' -lCORE_RL_MagickCore_' : ' -lCORE_RL_magick_')
+
+      else
 
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
@@ -118,31 +126,9 @@ module RMagick
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
 
-        configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
-
-      elsif RUBY_PLATFORM =~ /mingw/ # mingw
-
-        dir_paths = search_paths_for_library_for_windows
-        $CPPFLAGS += %( -I"#{dir_paths[:include]}")
-        $CPPFLAGS += ' -x c++ -std=c++11 -Wno-register'
-        $LDFLAGS += %( -L"#{dir_paths[:lib]}")
-        $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-
-        have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
-
-      else # mswin
+        configure_archflags_for_osx($magick_package) if RUBY_PLATFORM.include?('darwin') # osx
 
-        dir_paths = search_paths_for_library_for_windows
-        $CPPFLAGS << %( -I"#{dir_paths[:include]}")
-        $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
-        $LDFLAGS << ' -libpath:ucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-
-        $LOCAL_LIBS += ' ' + (im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
-
-        $CPPFLAGS += ' /std:c++11'
       end
-      ruby_version = RUBY_VERSION.split('.')
-      $CPPFLAGS += " -DRUBY_VERSION_MAJOR=#{ruby_version[0]} -DRUBY_VERSION_MINOR=#{ruby_version[1]}"
       $CPPFLAGS += ' $(optflags) $(debugflags)'
     end
 
@@ -180,11 +166,6 @@ module RMagick
     def determine_imagemagick_package
       packages = [installed_im7_packages, installed_im6_packages].flatten
 
-      if packages.empty?
-        # ImageMagick 6.7 does not have package file like ImageMagick-6.Q16.pc
-        packages = detect_imagemagick_packages(IM6_7_PACKAGES)
-      end
-
       if packages.empty?
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
       end
@@ -268,10 +249,10 @@ module RMagick
     # issue #169
     # set ARCHFLAGS appropriately for OSX
     def configure_archflags_for_osx(magick_package)
-      return unless PKGConfig.libs_only_L(magick_package).match(%r{-L(.+)/lib})
+      return unless PKGConfig.libs_only_L(magick_package) =~ %r{-L(.+)/lib}
 
       imagemagick_dir = Regexp.last_match(1)
-      command = Dir.glob(File.join(imagemagick_dir, "bin/*")).select { |file| File.executable? file }.first
+      command = Dir.glob(File.join(imagemagick_dir, "bin/*")).find { |file| File.executable? file }
       fileinfo = `file #{command}`
 
       # default ARCHFLAGS
@@ -285,28 +266,27 @@ module RMagick
       $ARCH_FLAG = archflags.join(' ') unless archflags.empty?
     end
 
-    def search_paths_for_library_for_windows
+    def search_paths_for_windows
       msg = 'searching PATH for the ImageMagick library...'
       Logging.message msg
       message msg + "\n"
 
-      found_lib = false
+      found = false
       dir_paths = {}
 
       paths = ENV['PATH'].split(File::PATH_SEPARATOR)
       paths.each do |dir|
-        lib = File.join(dir, 'lib')
-        lib_file = File.join(lib, im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
-        next unless File.exist?(lib_file)
+        dll = File.join(dir, im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.dll' : 'CORE_RL_magick_.dll')
+        next unless File.exist?(dll)
 
         dir_paths[:include] = File.join(dir, 'include')
-        dir_paths[:lib] = lib
+        dir_paths[:root] = dir
 
-        found_lib = true
+        found = true
         break
       end
 
-      return dir_paths if found_lib
+      return dir_paths if found
 
       exit_failure <<~END_MINGW
         Can't install RMagick #{RMAGICK_VERS}.
@@ -321,7 +301,7 @@ module RMagick
       assert_has_dev_libs!
 
       # Check for compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
-      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX'] || 'g++').split(' ').first
+      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX'] || 'g++').split.first
       exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cxx)
     end
 
@@ -340,17 +320,17 @@ module RMagick
         Check the mkmf.log file for more detailed information.
       END_FAILURE
 
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      if RUBY_PLATFORM.include?('mingw')
+        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        $magick_version = Regexp.last_match(1)
+        exit_failure failure_message unless $magick_version
+      else
         unless PKGConfig.libs('MagickCore')[/\bl\s*(MagickCore|Magick)6?\b/]
           exit_failure failure_message
         end
 
         $magick_package = determine_imagemagick_package
         $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
-      else
-        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
-        $magick_version = Regexp.last_match(1)
-        exit_failure failure_message unless $magick_version
       end
 
       # Ensure minimum ImageMagick version
@@ -364,8 +344,6 @@ module RMagick
 
     def create_header_file
       ruby_api = [
-        '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[
@@ -385,15 +363,10 @@ module RMagick
         have_func(func, headers)
       end
 
-      unless have_header('malloc.h')
-        have_header('malloc/malloc.h')
-      end
-
       # Miscellaneous constants
       $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
       $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
 
-      $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')
@@ -413,6 +386,22 @@ module RMagick
       print_summary
     end
 
+    def create_compile_flags_txt
+      cppflags = $CPPFLAGS.split
+      include_flags = cppflags.select { |flag| flag.start_with?('-I') }
+      define_flags = cppflags.select { |flag| flag.start_with?('-D') } + $defs
+
+      File.open('compile_flags.txt', 'w') do |f|
+        include_flags.each { |flag| f.puts(flag) }
+        f.puts "-I#{Dir.pwd}"
+        f.puts "-I#{RbConfig::CONFIG['rubyhdrdir']}"
+        f.puts "-I#{RbConfig::CONFIG['rubyhdrdir']}/ruby/backward"
+        f.puts "-I#{RbConfig::CONFIG['rubyarchhdrdir']}"
+        f.puts "-std=c++11"
+        define_flags.each { |flag| f.puts(flag) }
+      end
+    end
+
     def magick_command
       @magick_command ||= if find_executable('magick')
                             'magick'
@@ -451,3 +440,4 @@ at_exit do
   message msg + "\n"
 end
 extconf.create_makefile_file
+extconf.create_compile_flags_txt

data/ext/RMagick/rmagick.h

@@ -310,10 +310,8 @@ typedef enum _QuantumExpressionOperator
     AbsQuantumOperator, /**< abs */
     ExponentialQuantumOperator, /**< exponential */
     MedianQuantumOperator, /**< median */
-    SumQuantumOperator /**< sum */
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
-    , RootMeanSquareQuantumOperator /** root mean square */
-#endif
+    SumQuantumOperator, /**< sum */
+    RootMeanSquareQuantumOperator /** root mean square */
 } QuantumExpressionOperator ;
 
 
@@ -333,6 +331,7 @@ typedef enum _QuantumExpressionOperator
 *   RMagick Module and Class VALUEs
 */
 EXTERN VALUE Module_Magick;
+EXTERN VALUE Module_DrawAttribute;
 EXTERN VALUE Class_ImageList;
 EXTERN VALUE Class_Info;
 EXTERN VALUE Class_KernelInfo;
@@ -1173,7 +1172,8 @@ extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
 extern Quantum rm_app2quantum(VALUE);
 extern double rm_percentage(VALUE, double);
-extern double rm_str_to_pct(VALUE);
+extern double rm_percentage2(VALUE, double, bool);
+extern double rm_str_to_pct(VALUE, bool);
 extern VALUE  rm_define_enum_type(const char *);
 extern void   rm_write_temp_image(Image *, char *, size_t);
 extern void   rm_delete_temp_image(char *);
@@ -1225,13 +1225,8 @@ MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
 MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
 #endif
 
-#if (RUBY_VERSION_MAJOR == 2 && RUBY_VERSION_MINOR < 7)
-    #define RESCUE_FUNC(func)                   (VALUE (*)(ANYARGS))(func)
-    #define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE (*)(ANYARGS))(func)
-#else
-    #define RESCUE_FUNC(func)                   (VALUE(*)(VALUE))(func)
-    #define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE(*)(VALUE, VALUE))(func)
-#endif
+#define RESCUE_FUNC(func)                   (VALUE(*)(VALUE))(func)
+#define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE(*)(VALUE, VALUE))(func)
 
 } // extern "C"
 

data/ext/RMagick/rmdraw.cpp

@@ -13,9 +13,7 @@
 #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 *);
@@ -28,9 +26,7 @@ const rb_data_type_t rm_draw_data_type = {
         Draw_mark,
         Draw_destroy,
         Draw_memsize,
-#ifdef HAVE_RB_GC_MARK_MOVABLE
         Draw_compact,
-#endif
     },
     0, 0,
     RUBY_TYPED_FROZEN_SHAREABLE,
@@ -950,20 +946,20 @@ Draw_clone(VALUE self)
  * Draw the image.
  *
  * @overload composite(x, y, width, height, image)
- *   @param x [Float] x position
- *   @param y [Float] y position
- *   @param width [Float] the width
- *   @param height [Float] the height
+ *   @param x [Numeric] x position
+ *   @param y [Numeric] y position
+ *   @param width [Numeric] the width
+ *   @param height [Numeric] the height
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *
  * @overload composite(x, y, width, height, image, composite_op = Magick::OverCompositeOp)
  *   - The "image" argument can be either an ImageList object or an Image
  *     argument.
- *   @param x [Float] x position
- *   @param y [Float] y position
- *   @param width [Float] the width
- *   @param height [Float] the height
+ *   @param x [Numeric] x position
+ *   @param y [Numeric] y position
+ *   @param width [Numeric] the width
+ *   @param height [Numeric] the height
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param composite_op [Magick::CompositeOperator] the operator
@@ -1277,7 +1273,6 @@ Draw_primitive(VALUE self, VALUE primitive)
     return self;
 }
 
-#ifdef HAVE_RB_GC_MARK_MOVABLE
 /**
  * Compact the objects.
  *
@@ -1295,7 +1290,6 @@ Draw_compact(void *drawptr)
         draw->primitives = rb_gc_location(draw->primitives);
     }
 }
-#endif
 
 /**
  * Mark referenced objects.
@@ -1311,11 +1305,7 @@ 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
     }
 }
 
@@ -1463,8 +1453,8 @@ PolaroidOptions_alloc(VALUE klass)
 /**
  * Initialize a PolaroidOptions object.
  *
- * @yield [self]
- * @yieldparam self [Magick::Image::PolaroidOptions] self
+ * @yield [opt]
+ * @yieldparam opt [Magick::Image::PolaroidOptions] self
  * @return [Magick::Image::PolaroidOptions] self
  */
 VALUE

data/ext/RMagick/rmfill.cpp

@@ -634,7 +634,7 @@ h_diagonal_fill(
  * Call GradientFill with the start and stop colors specified when this fill
  * object was created.
  *
- * @param image_obj [Magick::Image] the image to fill
+ * @param image_obj [Magick::Image, Magick::ImageList] the image to fill
  * @return [Magick::GradientFill] self
  */
 VALUE
@@ -646,7 +646,7 @@ GradientFill_fill(VALUE self, VALUE image_obj)
     double x1, y1, x2, y2;          // points on the line
 
     TypedData_Get_Struct(self, rm_GradientFill, &rm_gradient_fill_data_type, fill);
-    image = rm_check_destroyed(image_obj);
+    image = rm_check_destroyed(rm_cur_image(image_obj));
 
     x1 = fill->x1;
     y1 = fill->y1;
@@ -780,7 +780,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
  * Call TextureFill with the texture specified when this fill object was
  * created.
  *
- * @param image_obj [Magick::Image] the image to fill
+ * @param image_obj [Magick::Image, Magick::ImageList] the image to fill
  * @return [Magick::TextureFill] self
  */
 VALUE
@@ -792,7 +792,7 @@ TextureFill_fill(VALUE self, VALUE image_obj)
     ExceptionInfo *exception;
 #endif
 
-    image = rm_check_destroyed(image_obj);
+    image = rm_check_destroyed(rm_cur_image(image_obj));
     TypedData_Get_Struct(self, rm_TextureFill, &rm_texture_fill_data_type, fill);
 
 #if defined(IMAGEMAGICK_7)