rmagick 7.1.7 → 7.2.0

data/ext/RMagick/rmutil.cpp

@@ -307,16 +307,17 @@ rm_check_ary_type(VALUE ary)
 
 
 /**
- * Raise an error if the image has been destroyed.
+ * Raise an error if the image has been destroyed or an offloaded call is changing it.
  *
  * No Ruby usage (internal function)
  *
  * @param obj the image
  * @return the C image structure for the image
  * @throw DestroyedImageError
+ * @throw RuntimeError if an offloaded call is changing the image
  */
 Image *
-rm_check_destroyed(VALUE obj)
+rm_check_readable(VALUE obj)
 {
     Image *image;
 
@@ -325,13 +326,33 @@ rm_check_destroyed(VALUE obj)
     {
         rb_raise(Class_DestroyedImageError, "destroyed image");
     }
+    rm_gvl_check_readable(image);
 
     return image;
 }
 
 
 /**
- * Raise an error if the image has been destroyed or is frozen.
+ * Raise an error if the image has been destroyed or an offloaded call is using it.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param obj the image
+ * @return the C image structure for the image
+ * @throw DestroyedImageError
+ * @throw RuntimeError if an offloaded call is using the image
+ */
+Image *
+rm_check_writable(VALUE obj)
+{
+    Image *image = rm_check_readable(obj);
+    rm_gvl_check_writable(image);
+    return image;
+}
+
+
+/**
+ * Raise an error if the image has been destroyed, is frozen or an offloaded call is using it.
  *
  * No Ruby usage (internal function)
  *
@@ -341,8 +362,15 @@ rm_check_destroyed(VALUE obj)
 Image *
 rm_check_frozen(VALUE obj)
 {
-    Image *image = rm_check_destroyed(obj);
+    Image *image;
+
+    TypedData_Get_Struct(obj, Image, &rm_image_data_type, image);
+    if (!image)
+    {
+        rb_raise(Class_DestroyedImageError, "destroyed image");
+    }
     rb_check_frozen(obj);
+    rm_gvl_check_writable(image);
     return image;
 }
 
@@ -598,7 +626,8 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 
 /**
  * Convert an application-supplied number to a Quantum. If the object is a Float,
- * truncate it before converting.
+ * truncate it before converting. A value outside 0 to QuantumRange is clamped
+ * as ClampToQuantum does, so it is kept as is with HDRI.
  *
  * No Ruby usage (internal function)
  *
@@ -615,13 +644,32 @@ Quantum
 rm_app2quantum(VALUE obj)
 {
     VALUE v = obj;
+    MagickRealType value;
 
     if (TYPE(obj) == T_FLOAT)
     {
         v = rb_Integer(obj);
     }
+    v = rb_to_int(v);
+
+    if (RTEST(rb_funcall(v, rb_intern("negative?"), 0)))
+    {
+#if MAGICKCORE_QUANTUM_DEPTH == 64
+        value = (MagickRealType) NUM2LL(v);
+#else
+        value = (MagickRealType) NUM2INT(v);
+#endif
+    }
+    else
+    {
+#if MAGICKCORE_QUANTUM_DEPTH == 64
+        value = (MagickRealType) NUM2ULL(v);
+#else
+        value = (MagickRealType) NUM2UINT(v);
+#endif
+    }
 
-    return NUM2QUANTUM(v);
+    return ClampToQuantum(value);
 }
 
 
@@ -1136,13 +1184,13 @@ void rm_sync_image_options(Image *image, Info *info)
     {
 #if defined(IMAGEMAGICK_7)
         exception = AcquireExceptionInfo();
-        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        DECLARE_GVL_CALL(call, TransformImageColorspace, image, info->colorspace, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
 #else
-        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        DECLARE_GVL_CALL(call, TransformImageColorspace, image, info->colorspace);
+        call.keep_thread().run<void>();
         rm_check_image_exception(image, RetainOnError);
 #endif
     }
@@ -1561,8 +1609,8 @@ rm_clone_image(Image *image)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(CloneImage) args = { image, 0, 0, MagickTrue, exception };
-    clone = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CloneImage), &args);
+    DECLARE_GVL_CALL(call, CloneImage, image, 0, 0, MagickTrue, exception);
+    clone = call.keep_thread().run<Image *>();
     if (!clone)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '7.1.7'
+  VERSION = '7.2.0'
   MIN_RUBY_VERSION = '3.2.0'
   MIN_IM6_VERSION = '6.9.0'
   MIN_IM7_VERSION = '7.1.0'

data/lib/rmagick_internal.rb

@@ -1845,14 +1845,25 @@ module Magick
 
     # accepts Pixel object or color name
     def highlight_color=(color)
-      color = @img.to_color(color) if color.respond_to?(:to_color)
-      @img.define('highlight-color', color)
+      define_compare_color('highlight-color', color)
     end
 
     # accepts Pixel object or color name
     def lowlight_color=(color)
-      color = @img.to_color(color) if color.respond_to?(:to_color)
-      @img.define('lowlight-color', color)
+      define_compare_color('lowlight-color', color)
+    end
+
+    private
+
+    def define_compare_color(name, color)
+      color = if color.is_a?(Magick::Pixel)
+                color.to_color(Magick::AllCompliance, true)
+              else
+                String.try_convert(color) || raise(TypeError, "argument must be color name or pixel (#{color.class} given)")
+              end
+      @img.define("compare:#{name}", color)
+      # ImageMagick 6.9.6-0 and older read the name without the "compare:" prefix.
+      @img.define(name, color)
     end
   end
 

data/lib/rvg/rvg.rb

@@ -36,7 +36,7 @@ module Magick
     # else, combine it with the background_fill_opacity.
     def bgfill
       if @background_fill.nil?
-        color = Magick::Pixel.new(0, 0, 0, Magick::OpaqueAlpha)
+        color = Magick::Pixel.from_color('none')
       else
         color = @background_fill
         color.alpha = @background_fill_opacity * Magick::OpaqueAlpha

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.2.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -58,7 +58,9 @@ files:
 - ext/RMagick/extconf.rb
 - ext/RMagick/rmagick.cpp
 - ext/RMagick/rmagick.h
+- ext/RMagick/rmagick_gvl.cpp
 - ext/RMagick/rmagick_gvl.h
+- ext/RMagick/rmagick_gvl.hpp
 - ext/RMagick/rmdraw.cpp
 - ext/RMagick/rmenum.cpp
 - ext/RMagick/rmfill.cpp