rmagick 5.4.4 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd768daa5bf84d7e835a4c300d57f6826b3fd86820dd3048a12d73db62ec89f
-  data.tar.gz: b7afe50d7396365282e6d5e8ff7b8a6c2b0e91e7f1e2d9562d1078dd26bda7a4
+  metadata.gz: 41d6b9634204858bad669688ff19fc54c14dc3578f011696ade0295b5e4f7e88
+  data.tar.gz: 781493a793ec5ee4b9a60063761484e8b1d44e622963c2593caefac314d7ed8a
 SHA512:
-  metadata.gz: 23b6376b8c659276107e35c4e58428bc68a4cd8d2d24830ee27c99a83dea0349516af72bf8746a9064f115d35ae3e2f8affa376c6b6ec77d8b7a89aa7ddede8c
-  data.tar.gz: 7633f97e950e07f2381f25d1a181b427408fa8e46790b0506c31d83d029f58f5098a073446d659d82a05988c20848f60a37fbfe5759340a8613da87bdbc53cae
+  metadata.gz: e90299bfe4a9b5d9a6291d53707db9ec772fb2247517f4e9ca9e4633320a6a9c2067195dcc90109bc743cd9f0a12882adfd679fb4e06c6995958e8b962125e0e
+  data.tar.gz: 1e2b528111b27b48ec4f3dc8be1e65d3bf181ec8888c5e1562959b98af4762f12dd9285d4d78520eb400ffb16e09f93950e8527b27e552396487c56fd1258b95

data/.github/workflows/ci.yml

@@ -25,6 +25,21 @@ 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

data/.gitignore

@@ -23,6 +23,7 @@ tmp
 *.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.
@@ -226,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/CHANGELOG.md

@@ -3,6 +3,49 @@
 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

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/Rakefile

@@ -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_osx.sh

@@ -43,7 +43,7 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}" --without-raw --without-jxl
+  ./configure --prefix=/usr/local "${options}" --without-raw --without-jxl --without-openjp2
   make -j
 }
 

data/ext/RMagick/extconf.rb

@@ -58,16 +58,17 @@ module RMagick
       return if RUBY_PLATFORM =~ /mswin|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
 
@@ -413,6 +414,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 +468,4 @@ at_exit do
   message msg + "\n"
 end
 extconf.create_makefile_file
+extconf.create_compile_flags_txt

data/ext/RMagick/rmagick.h

@@ -333,6 +333,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 +1174,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 *);

data/ext/RMagick/rmdraw.cpp

@@ -950,20 +950,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
@@ -1463,8 +1463,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)

data/ext/RMagick/rmilist.cpp

@@ -64,6 +64,8 @@ DEFINE_GVL_VOID_STUB2(RemoveZeroDelayLayers, Image **, ExceptionInfo *);
  *
  * @overload animate(delay)
  *   @param delay [Numeric] the length of time between each image in an animation
+ *   @yield [info]
+ *   @yieldparam info [Magick::Image::Info]
  *
  * @return [Magick::ImageList] self
  */
@@ -400,6 +402,8 @@ ImageList_deconstruct(VALUE self)
 /**
  * Display all the images to an X window screen.
  *
+ * @yield [info]
+ * @yieldparam info [Magick::Image::Info]
  * @return [Magick::ImageList] self
  */
 VALUE
@@ -469,7 +473,8 @@ ImageList_flatten_images(VALUE self)
  * @overload montage
  *   Creates {Magick::ImageList::Montage} object, yields to block
  *   if present in {Magick::ImageList::Montage} object's scope.
- *   @yield [Magick::ImageList::Montage]
+ *   @yield [opt]
+ *   @yieldparam opt [Magick::ImageList::Montage]
  *
  * @return [Magick::ImageList] a new image list
  */
@@ -1094,7 +1099,8 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
  *
  * @overload to_blob
  *   Runs an info parm block if present - the user can specify the image format and depth
- *   @yield [Magick::Image::Info]
+ *   @yield [info]
+ *   @yieldparam info [Magick::Image::Info]
  *
  * @return [String] the blob
  */
@@ -1171,6 +1177,8 @@ ImageList_to_blob(VALUE self)
  * the images will be written as a single multi-image file. Otherwise each image
  * will be written to a separate file.
  *
+ * @yield [info]
+ * @yieldparam info [Magick::Image::Info]
  * @param file [File, String] the file
  */
 VALUE