rmagick 4.1.2 → 4.2.3

data/ext/RMagick/rmstruct.c

@@ -285,7 +285,7 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
         ci->color.green = (MagickRealType) pixel.green;
         ci->color.blue = (MagickRealType) pixel.blue;
 #if defined(IMAGEMAGICK_7)
-        ci->color.alpha = (MagickRealType) OpaqueAlpha;
+        rm_set_pixelinfo_alpha(&ci->color, (MagickRealType) OpaqueAlpha);
 #else
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
 #endif
@@ -760,7 +760,7 @@ Import_SegmentInfo(SegmentInfo *segment)
     RB_GC_GUARD(y1);
     RB_GC_GUARD(x2);
     RB_GC_GUARD(y2);
-    
+
     return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 

data/ext/RMagick/rmutil.c

@@ -12,6 +12,11 @@
 
 #include "rmagick.h"
 #include <errno.h>
+#if defined(_WIN32)
+#include <Windows.h>
+#else
+#include <pthread.h>
+#endif
 
 static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
@@ -853,6 +858,25 @@ rm_magick_error(const char *msg)
     RB_GC_GUARD(mesg);
 }
 
+#if defined(IMAGEMAGICK_7)
+/**
+ * Sets the alpha channel of a pixel color
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param pixel the Pixel
+ * @param value the value
+ */
+void
+rm_set_pixelinfo_alpha(PixelInfo *pixel, const MagickRealType value)
+{
+    pixel->alpha = value;
+    if (value != (MagickRealType) OpaqueAlpha)
+    {
+        pixel->alpha_trait = BlendPixelTrait;
+    }
+}
+#endif
 
 /**
  * Initialize a new ImageMagickError object - store the "loc" string in the
@@ -1000,7 +1024,16 @@ rm_get_optional_arguments(VALUE img)
         optional_method_arguments = rb_const_get_from(Module_Magick, rb_intern("OptionalMethodArguments"));
         argv[0] = img;
         opt_args = rb_class_new_instance(1, argv, optional_method_arguments);
-        rb_obj_instance_eval(0, NULL, opt_args);
+
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, opt_args);
+        }
+        else
+        {
+            rb_yield(opt_args);
+        }
     }
 
     RB_GC_GUARD(optional_method_arguments);
@@ -1530,14 +1563,15 @@ rm_progress_monitor(
     VALUE rval;
     VALUE method, offset, span;
 
-// Default Ruby minimum stack size
-#define RUBY_VM_THREAD_MACHINE_STACK_SIZE_MIN (  16 * 1024 * sizeof(VALUE)) /*   64 KB or  128 KB */
-
-    // Check stack length manually instead of ruby_stack_check() for old Ruby.
-    if (ruby_stack_length(NULL) > RUBY_VM_THREAD_MACHINE_STACK_SIZE_MIN)
+    // Check running thread.
+    if (rm_current_thread_id() != rm_main_thread_id)
     {
-        // If there is not enough stack or the using stack size shows an abnormal value in Ruby,
-        // skip the callback and continue ImageMagick process.
+        // ImageMagick might call back in a different thread than Ruby is running in.
+        // If it is a different thread, it would not have a Ruby GVL and
+        // it could not retrieve properly Ruby stack.
+
+        // Unfortunately, there is no API available to check if the current thread has a GVL,
+        // so the thread id was checked in here.
         return MagickTrue;
     }
 
@@ -1868,3 +1902,19 @@ rm_raise_exception(ExceptionInfo *exception)
     rm_magick_error(msg);
 }
 
+/**
+ * Get current thread id.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @return thread id
+ */
+unsigned long long
+rm_current_thread_id()
+{
+#if defined(_WIN32)
+    return (unsigned long long)GetCurrentThreadId();
+#else
+    return (unsigned long long)pthread_self();
+#endif
+}

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '4.1.2'
+  VERSION = '4.2.3'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/lib/rvg/rvg.rb

@@ -85,7 +85,7 @@ module Magick
                      @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
                        bg_image = @background_image.resize(new_cols, new_rows)
                        if bg_image.columns != width || bg_image.rows != height
-                         bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
+                         bg = Magick::Image.new(width, height) { |options| options.background_color = bgcolor }
                          bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
                        end
                        bg_image
@@ -96,7 +96,7 @@ module Magick
                  end
       else
         bgcolor = bgfill
-        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
+        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { |options| options.background_color = bgcolor }
       end
       canvas[:desc] = @desc if @desc
       canvas[:title] = @title if @title

data/rmagick.gemspec

@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
   if RUBY_PLATFORM !~ /mswin|mingw/
-    s.add_development_dependency 'rubocop', '~> 0.68.0'
-    s.add_development_dependency 'rubocop-rspec', '~> 1.37.0'
+    s.add_development_dependency 'rubocop', '~> 0.81.0'
+    s.add_development_dependency 'rubocop-rspec', '~> 1.38.1'
+    s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
   end
   s.add_development_dependency 'simplecov', '~> 0.16.1'
   s.add_development_dependency 'yard', '~> 0.9.24'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2021-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -75,28 +75,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.7.7 or later
-rubygems_version: 3.0.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick