rmagick 5.4.4 → 6.0.0

data/ext/RMagick/rmutil.cpp

@@ -21,6 +21,11 @@
 static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 
+#if defined(IMAGEMAGICK_7)
+DEFINE_GVL_STUB3(TransformImageColorspace, Image *, const ColorspaceType, ExceptionInfo *);
+#else
+DEFINE_GVL_STUB2(TransformImageColorspace, Image *, const ColorspaceType);
+#endif
 
 DEFINE_GVL_STUB5(CloneImage, const Image *, const size_t, const size_t, const MagickBooleanType, ExceptionInfo *);
 
@@ -360,49 +365,22 @@ rescue_not_str(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
  *
  * @param arg the argument
  * @param max the maximum allowed value
+ * @param only_positive Accept whether only positive numbers?
  * @return a double
  */
 double
-rm_percentage(VALUE arg, double max)
+rm_percentage2(VALUE arg, double max, bool only_positive)
 {
     double pct;
-    char *end;
 
     if (!rm_check_num2dbl(arg))
     {
-        char *pct_str;
-        long pct_long;
-
-        arg = rb_rescue(RESCUE_FUNC(rb_str_to_str), arg, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), arg);
-        pct_str = StringValueCStr(arg);
-        errno = 0;
-        pct_long = strtol(pct_str, &end, 10);
-        if (errno == ERANGE)
-        {
-            rb_raise(rb_eRangeError, "`%s' out of range", pct_str);
-        }
-        if (*end != '\0' && *end != '%')
-        {
-            rb_raise(rb_eArgError, "expected percentage, got `%s'", pct_str);
-        }
-
-        if (*end == '%' && pct_long != 0)
-        {
-            pct = (((double)pct_long) / 100.0) * max;
-        }
-        else
-        {
-            pct = (double) pct_long;
-        }
-        if (pct < 0.0)
-        {
-            rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", pct_str);
-        }
+        pct = rm_str_to_pct(arg, only_positive) * max;
     }
     else
     {
         pct = NUM2DBL(arg);
-        if (pct < 0.0)
+        if (pct < 0.0 && only_positive)
         {
             rb_raise(rb_eArgError, "percentages may not be negative (got `%g')", pct);
         }
@@ -412,6 +390,24 @@ rm_percentage(VALUE arg, double max)
 }
 
 
+/**
+ * Return a double between 0.0 and max (the second argument), inclusive. If the
+ * argument is a number convert to a Float object, otherwise it's supposed to be
+ * a string in the form * "NN%". Convert to a number and then to a Float.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param arg the argument
+ * @param max the maximum allowed value
+ * @return a double
+ */
+double
+rm_percentage(VALUE arg, double max)
+{
+    return rm_percentage2(arg, max, true);
+}
+
+
 /**
  * Return 0 if rb_num2dbl doesn't raise an exception.
  *
@@ -464,10 +460,11 @@ rm_check_num2dbl(VALUE obj)
  * No Ruby usage (internal function)
  *
  * @param str the string
+ * @param only_positive Accept whether only positive numbers?
  * @return a double
  */
 double
-rm_str_to_pct(VALUE str)
+rm_str_to_pct(VALUE str, bool only_positive)
 {
     long pct;
     char *pct_str, *end;
@@ -485,7 +482,7 @@ rm_str_to_pct(VALUE str)
     {
         rb_raise(rb_eArgError, "expected percentage, got `%s'", pct_str);
     }
-    if (pct < 0L)
+    if (pct < 0L && only_positive)
     {
         rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", pct_str);
     }
@@ -508,45 +505,7 @@ rm_str_to_pct(VALUE str)
 double
 rm_fuzz_to_dbl(VALUE fuzz_arg)
 {
-    double fuzz;
-    char *end;
-
-    if (!rm_check_num2dbl(fuzz_arg))
-    {
-        char *fuzz_str;
-
-        // Convert to string, issue error message if failure.
-        fuzz_arg = rb_rescue(RESCUE_FUNC(rb_str_to_str), fuzz_arg, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), fuzz_arg);
-        fuzz_str = StringValueCStr(fuzz_arg);
-        errno = 0;
-        fuzz = strtod(fuzz_str, &end);
-        if (errno == ERANGE)
-        {
-            rb_raise(rb_eRangeError, "`%s' out of range", fuzz_str);
-        }
-        if(*end == '%')
-        {
-            if (fuzz < 0.0)
-            {
-                rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", fuzz_str);
-            }
-            fuzz = (fuzz * QuantumRange) / 100.0;
-        }
-        else if(*end != '\0')
-        {
-            rb_raise(rb_eArgError, "expected percentage, got `%s'", fuzz_str);
-        }
-    }
-    else
-    {
-        fuzz = NUM2DBL(fuzz_arg);
-        if (fuzz < 0.0)
-        {
-            rb_raise(rb_eArgError, "fuzz may not be negative (got `%g')", fuzz);
-        }
-    }
-
-    return fuzz;
+    return rm_percentage(fuzz_arg, QuantumRange);
 }
 
 
@@ -635,23 +594,27 @@ rm_cur_image(VALUE img)
 VALUE
 rm_pixelcolor_to_color_name(Image *image, PixelColor *color)
 {
-    PixelColor pp;
-    char name[MaxTextExtent];
-    ExceptionInfo *exception;
+    MagickPixel mpp;
+    char tuple[MaxTextExtent];
 
-    exception = AcquireExceptionInfo();
-
-    pp = *color;
 #if defined(IMAGEMAGICK_7)
-    pp.depth = MAGICKCORE_QUANTUM_DEPTH;
-    pp.colorspace = image->colorspace;
+    mpp = *color;
+    mpp.alpha_trait = BlendPixelTrait;
+    mpp.colorspace = image->colorspace;
+#else
+    rm_init_magickpixel(image, &mpp);
+    mpp.red = GetPixelRed(color);
+    mpp.green = GetPixelGreen(color);
+    mpp.blue = GetPixelBlue(color);
+    mpp.opacity = GetPixelOpacity(color);
+    mpp.index   = (MagickRealType) 0.0;
+    mpp.matte = MagickTrue;
 #endif
+    mpp.depth = image->depth;
 
-    QueryColorname(image, &pp, X11Compliance, name, exception);
-    CHECK_EXCEPTION();
-    DestroyExceptionInfo(exception);
+    GetColorTuple(&mpp, MagickTrue, tuple);
 
-    return rb_str_new2(name);
+    return rb_str_new2(tuple);
 }
 
 
@@ -1102,13 +1065,14 @@ void rm_sync_image_options(Image *image, Info *info)
     {
 #if defined(IMAGEMAGICK_7)
         exception = AcquireExceptionInfo();
-        SetImageColorspace(image, info->colorspace, exception);
-        // We should not throw an exception in this method because we will
-        // leak memory in the place where this method is called. And that is
-        // why the exception is being ignored here.
+        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
 #else
-        SetImageColorspace(image, info->colorspace);
+        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        rm_check_image_exception(image, RetainOnError);
 #endif
     }
 
@@ -1262,6 +1226,11 @@ void rm_sync_image_options(Image *image, Info *info)
     }
 
     copy_options(image, info);
+
+#if defined(IMAGEMAGICK_7)
+    // The value of info->compression is referenced when saving the image in ImageMagick 7.
+    info->compression = image->compression;
+#endif
 }
 
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '5.4.4'
-  MIN_RUBY_VERSION = '2.3.0'
-  MIN_IM_VERSION = '6.7.7'
+  VERSION = '6.0.0'
+  MIN_RUBY_VERSION = '3.0.0'
+  MIN_IM_VERSION = '6.8.9'
 end

data/lib/rmagick.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'rmagick_internal.rb'
+require 'rmagick_internal'