rmagick 4.2.5 → 5.5.0

data/ext/RMagick/{rmutil.c → rmutil.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmutil.c
- * @version  $Id: rmutil.c,v 1.182 2009/12/21 10:34:58 baror Exp $
+ * @file     rmutil.cpp
+ * @version  $Id: rmutil.cpp,v 1.182 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -22,6 +22,9 @@ static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 
 
+DEFINE_GVL_STUB5(CloneImage, const Image *, const size_t, const size_t, const MagickBooleanType, ExceptionInfo *);
+
+
 /**
  * ImageMagick safe version of malloc.
  *
@@ -249,7 +252,7 @@ rm_check_ary_type(VALUE ary)
     VALUE checked = rb_check_array_type(ary);
     if (NIL_P(checked))
     {
-        rb_raise(rb_eTypeError, "wrong argument type %"RMIsVALUE" was given. (must respond to :to_ary)", rb_obj_class(ary));
+        rb_raise(rb_eTypeError, "wrong argument type %" RMIsVALUE " was given. (must respond to :to_ary)", rb_obj_class(ary));
     }
     return checked;
 }
@@ -269,7 +272,7 @@ rm_check_destroyed(VALUE obj)
 {
     Image *image;
 
-    Data_Get_Struct(obj, Image, image);
+    TypedData_Get_Struct(obj, Image, &rm_image_data_type, image);
     if (!image)
     {
         rb_raise(Class_DestroyedImageError, "destroyed image");
@@ -316,16 +319,16 @@ rm_no_freeze(VALUE obj)
  * No Ruby usage (internal function)
  *
  * @param str the Ruby string
- * @param len pointer to a long in which to store the number of characters
+ * @param len pointer to a size_t in which to store the number of characters
  * @return a C string version of str
  */
 char *
-rm_str2cstr(VALUE str, long *len)
+rm_str2cstr(VALUE str, size_t *len)
 {
     StringValue(str);
     if (len)
     {
-        *len = RSTRING_LEN(str);
+        *len = (size_t)RSTRING_LEN(str);
     }
     return RSTRING_PTR(str);
 }
@@ -357,49 +360,23 @@ 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(rb_str_to_str, arg, 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);
         }
@@ -409,6 +386,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.
  *
@@ -451,7 +446,7 @@ rescue_not_dbl(VALUE ignored ATTRIBUTE_UNUSED, VALUE raised_exc ATTRIBUTE_UNUSED
 int
 rm_check_num2dbl(VALUE obj)
 {
-    return FIX2INT(rb_rescue(check_num2dbl, obj, rescue_not_dbl, (VALUE)0));
+    return FIX2INT(rb_rescue(RESCUE_FUNC(check_num2dbl), obj, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_dbl), (VALUE)0));
 }
 
 
@@ -461,15 +456,16 @@ 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;
 
-    str = rb_rescue(rb_str_to_str, str, rescue_not_str, str);
+    str = rb_rescue(RESCUE_FUNC(rb_str_to_str), str, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), str);
     pct_str = StringValueCStr(str);
     errno = 0;
     pct = strtol(pct_str, &end, 10);
@@ -482,7 +478,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);
     }
@@ -505,45 +501,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(rb_str_to_str, fuzz_arg, 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);
 }
 
 
@@ -780,7 +738,7 @@ rm_write_temp_image(Image *image, char *temp_name, size_t temp_name_l)
     snprintf(temp_name, temp_name_l, "mpri:%d", id);
 
     // Omit "mpri:" from filename to form the key
-    okay = SetImageRegistry(ImageRegistryType, temp_name+5, image, exception);
+    okay = (MagickBooleanType)SetImageRegistry(ImageRegistryType, temp_name+5, image, exception);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
     if (!okay)
@@ -908,7 +866,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
     }
 
     rb_call_super(super_argc, (const VALUE *)super_argv);
-    rb_iv_set(self, "@"MAGICK_LOC, extra);
+    rb_iv_set(self, "@" MAGICK_LOC, extra);
 
     RB_GC_GUARD(extra);
 
@@ -1025,15 +983,7 @@ rm_get_optional_arguments(VALUE img)
         argv[0] = img;
         opt_args = rb_class_new_instance(1, argv, optional_method_arguments);
 
-        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_yield(opt_args);
     }
 
     RB_GC_GUARD(optional_method_arguments);
@@ -1267,13 +1217,18 @@ 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
 }
 
 
 /**
  * Replicate old (ImageMagick < 6.3.2) EXIF:* functionality using
  * GetImageProperty by returning the exif entries as a single string, separated
- * by \n's.  Do this so that RMagick.rb works no matter which version of
+ * by \n's.  Do this so that RMagick works no matter which version of
  * ImageMagick is in use.
  *
  * No Ruby usage (internal function)
@@ -1337,7 +1292,7 @@ rm_exif_by_entry(Image *image)
         return Qnil;
     }
 
-    str = xmalloc(len);
+    str = (char *)xmalloc(len);
     len = 0;
 
     // Copy the exif properties and values into the string.
@@ -1392,7 +1347,7 @@ rm_exif_by_entry(Image *image)
 /**
  * Replicate old (ImageMagick < 6.3.2) EXIF:! functionality using
  * GetImageProperty by returning the exif entries as a single string, separated
- * by \n's. Do this so that RMagick.rb works no matter which version of
+ * by \n's. Do this so that RMagick works no matter which version of
  * ImageMagick is in use.
  *
  * No Ruby usage (internal function)
@@ -1455,7 +1410,7 @@ rm_exif_by_number(Image *image)
         return Qnil;
     }
 
-    str = xmalloc(len);
+    str = (char *)xmalloc(len);
     len = 0;
 
     // Copy the exif properties and values into the string.
@@ -1526,7 +1481,8 @@ rm_clone_image(Image *image)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    clone = CloneImage(image, 0, 0, MagickTrue, exception);
+    GVL_STRUCT_TYPE(CloneImage) args = { image, 0, 0, MagickTrue, exception };
+    clone = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CloneImage), &args);
     if (!clone)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
@@ -1538,64 +1494,6 @@ rm_clone_image(Image *image)
 }
 
 
-/**
- * SetImage(Info)ProgressMonitor exit.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - ImageMagick's "tag" argument is unused. We pass along the method name
- *     instead.
- *
- * @param tag ImageMagick argument (unused)
- * @param of the offset type
- * @param sp the size type
- * @param client_data pointer to the progress method to call
- * @return true if calling client_data returns a non-nil value, otherwise false
- */
-MagickBooleanType
-rm_progress_monitor(
-    const char *tag ATTRIBUTE_UNUSED,
-    const MagickOffsetType of,
-    const MagickSizeType sp,
-    void *client_data)
-{
-    VALUE rval;
-    VALUE method, offset, span;
-
-    // Check running thread.
-    if (rm_current_thread_id() != rm_main_thread_id)
-    {
-        // 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;
-    }
-
-#if defined(HAVE_LONG_LONG)     // defined in Ruby's defines.h
-    offset = rb_ll2inum(of);
-    span = rb_ull2inum(sp);
-#else
-    offset = rb_int2big((long)of);
-    span = rb_uint2big((unsigned long)sp);
-#endif
-
-    method = rb_id2str(rb_frame_this_func());
-
-    rval = rb_funcall((VALUE)client_data, rm_ID_call, 3, method, offset, span);
-
-    RB_GC_GUARD(rval);
-    RB_GC_GUARD(method);
-    RB_GC_GUARD(offset);
-    RB_GC_GUARD(span);
-
-    return RTEST(rval) ? MagickTrue : MagickFalse;
-}
-
-
 /**
  * Remove the ImageMagick links between images in an scene sequence.
  *
@@ -1903,18 +1801,21 @@ rm_raise_exception(ExceptionInfo *exception)
 }
 
 /**
- * Get current thread id.
+ * Get IO path.
  *
  * No Ruby usage (internal function)
  *
- * @return thread id
+ * @param io An IO object
+ * @return string of the path
  */
-unsigned long long
-rm_current_thread_id()
+VALUE
+rm_io_path(VALUE io)
 {
-#if defined(_WIN32)
-    return (unsigned long long)GetCurrentThreadId();
+#ifdef HAVE_RB_IO_PATH
+    return rb_io_path(io);
 #else
-    return (unsigned long long)pthread_self();
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->pathv;
 #endif
 }

data/lib/rmagick/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Magick
-  VERSION = '4.2.5'
+  VERSION = '5.5.0'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/lib/rmagick.rb

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