rmagick 4.1.0.rc1 → 4.2.0

data/ext/RMagick/rmstruct.c

@@ -82,7 +82,7 @@ Export_AffineMatrix(AffineMatrix *am, VALUE st)
 
 
 /**
- * Create a Magick::ChromaticityInfo object from a ChromaticityInfo structure.
+ * Create a {Magick::ChromaticityInfo} object from a ChromaticityInfo structure.
  *
  * No Ruby usage (internal function)
  *
@@ -107,8 +107,8 @@ ChromaticityInfo_new(ChromaticityInfo *ci)
     RB_GC_GUARD(blue_primary);
     RB_GC_GUARD(white_point);
 
-    return rb_funcall(Class_Chromaticity, rm_ID_new, 4
-                    , red_primary, green_primary, blue_primary, white_point);
+    return rb_funcall(Class_Chromaticity, rm_ID_new, 4,
+                      red_primary, green_primary, blue_primary, white_point);
 }
 
 
@@ -127,24 +127,22 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     VALUE chrom_members;
     VALUE red_primary, green_primary, blue_primary, white_point;
     VALUE entry_members, x, y;
-    ID values_id;
 
     if (CLASS_OF(chrom) != Class_Chromaticity)
     {
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(chrom)));
     }
-    values_id = rm_ID_values;
 
     // Get the struct members in an array
-    chrom_members = rb_funcall(chrom, values_id, 0);
+    chrom_members = rb_funcall(chrom, rm_ID_values, 0);
     red_primary   = rb_ary_entry(chrom_members, 0);
     green_primary = rb_ary_entry(chrom_members, 1);
     blue_primary  = rb_ary_entry(chrom_members, 2);
     white_point = rb_ary_entry(chrom_members, 3);
 
     // Get the red_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(red_primary, values_id, 0);
+    entry_members = rb_funcall(red_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // red_primary.x
     ci->red_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // red_primary.y
@@ -152,7 +150,7 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->red_primary.z = 0.0;
 
     // Get the green_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(green_primary, values_id, 0);
+    entry_members = rb_funcall(green_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // green_primary.x
     ci->green_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // green_primary.y
@@ -160,7 +158,7 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->green_primary.z = 0.0;
 
     // Get the blue_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(blue_primary, values_id, 0);
+    entry_members = rb_funcall(blue_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // blue_primary.x
     ci->blue_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // blue_primary.y
@@ -168,7 +166,7 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->blue_primary.z = 0.0;
 
     // Get the white_point PrimaryInfo members in an array
-    entry_members = rb_funcall(white_point, values_id, 0);
+    entry_members = rb_funcall(white_point, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // white_point.x
     ci->white_point.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // white_point.y
@@ -187,13 +185,9 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
 
 
 /**
- * Create a string representation of a Magick::Chromaticity.
+ * Return a string representation of a {Magick::Chromaticity} object.
  *
- * Ruby usage:
- *   - @verbatim Magick::Chromaticity#to_s @endverbatim
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 ChromaticityInfo_to_s(VALUE self)
@@ -202,7 +196,8 @@ ChromaticityInfo_to_s(VALUE self)
     char buff[200];
 
     Export_ChromaticityInfo(&ci, self);
-    sprintf(buff, "red_primary=(x=%g,y=%g) "
+    snprintf(buff, sizeof(buff),
+                  "red_primary=(x=%g,y=%g) "
                   "green_primary=(x=%g,y=%g) "
                   "blue_primary=(x=%g,y=%g) "
                   "white_point=(x=%g,y=%g) ",
@@ -240,8 +235,8 @@ Import_ColorInfo(const ColorInfo *ci)
     RB_GC_GUARD(compliance);
     RB_GC_GUARD(color);
 
-    return rb_funcall(Class_Color, rm_ID_new, 3
-                    , name, compliance, color);
+    return rb_funcall(Class_Color, rm_ID_new, 3,
+                      name, compliance, color);
 }
 
 
@@ -272,7 +267,7 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ci->name), StringValuePtr(m));
+        CloneString((char **)&(ci->name), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
@@ -351,13 +346,9 @@ destroy_ColorInfo(ColorInfo *ci)
 
 
 /**
- * Return a string representation of a Magick::Color object.
- *
- * Ruby usage:
- *   - @verbatim Color#to_s @endverbatim
+ * Return a string representation of a {Magick::Color} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 Color_to_s(VALUE self)
@@ -367,7 +358,8 @@ Color_to_s(VALUE self)
 
     Export_ColorInfo(&ci, self);
 
-    sprintf(buff, "name=%s, compliance=%s, "
+    snprintf(buff, sizeof(buff),
+                  "name=%s, compliance=%s, "
 #if (MAGICKCORE_QUANTUM_DEPTH  == 32 || MAGICKCORE_QUANTUM_DEPTH  == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
                   "color.red=%Lg, color.green=%Lg, color.blue=%Lg, color.alpha=%Lg ",
 #else
@@ -421,9 +413,9 @@ Import_TypeInfo(const TypeInfo *ti)
     RB_GC_GUARD(foundry);
     RB_GC_GUARD(format);
 
-    return rb_funcall(Class_Font, rm_ID_new, 9
-                    , name, description, family, style
-                    , stretch, weight, encoding, foundry, format);
+    return rb_funcall(Class_Font, rm_ID_new, 9,
+                      name, description, family, style,
+                      stretch, weight, encoding, foundry, format);
 }
 
 
@@ -452,17 +444,17 @@ Export_TypeInfo(TypeInfo *ti, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->name), StringValuePtr(m));
+        CloneString((char **)&(ti->name), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->description), StringValuePtr(m));
+        CloneString((char **)&(ti->description), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 2);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->family), StringValuePtr(m));
+        CloneString((char **)&(ti->family), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
     m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
@@ -470,13 +462,13 @@ Export_TypeInfo(TypeInfo *ti, VALUE st)
 
     m = rb_ary_entry(members, 6);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->encoding), StringValuePtr(m));
+        CloneString((char **)&(ti->encoding), StringValueCStr(m));
     m = rb_ary_entry(members, 7);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->foundry), StringValuePtr(m));
+        CloneString((char **)&(ti->foundry), StringValueCStr(m));
     m = rb_ary_entry(members, 8);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->format), StringValuePtr(m));
+        CloneString((char **)&(ti->format), StringValueCStr(m));
 
     RB_GC_GUARD(members);
     RB_GC_GUARD(m);
@@ -510,12 +502,9 @@ destroy_TypeInfo(TypeInfo *ti)
 
 
 /**
- * Implement the Font#to_s method.
- *
- * No Ruby usage (internal function)
+ * Return a string representation of a {Magick::Font} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 Font_to_s(VALUE self)
@@ -535,11 +524,12 @@ Font_to_s(VALUE self)
             strcpy(weight, "BoldWeight");
             break;
         default:
-            sprintf(weight, "%lu", ti.weight);
+            snprintf(weight, sizeof(weight), "%"RMIuSIZE"", ti.weight);
             break;
     }
 
-    sprintf(buff, "name=%s, description=%s, "
+    snprintf(buff, sizeof(buff),
+                  "name=%s, description=%s, "
                   "family=%s, style=%s, stretch=%s, weight=%s, "
                   "encoding=%s, foundry=%s, format=%s",
                   ti.name,
@@ -569,8 +559,8 @@ Font_to_s(VALUE self)
 VALUE
 Import_PointInfo(PointInfo *p)
 {
-    return rb_funcall(Class_Point, rm_ID_new, 2
-                    , INT2FIX(p->x), INT2FIX(p->y));
+    return rb_funcall(Class_Point, rm_ID_new, 2,
+                      INT2FIX(p->x), INT2FIX(p->y));
 }
 
 
@@ -614,8 +604,8 @@ Export_PointInfo(PointInfo *pi, VALUE sp)
 VALUE
 Import_PrimaryInfo(PrimaryInfo *p)
 {
-    return rb_funcall(Class_Primary, rm_ID_new, 3
-                    , INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
+    return rb_funcall(Class_Primary, rm_ID_new, 3,
+                      INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
 }
 
 
@@ -651,13 +641,9 @@ Export_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
 
 
 /**
- * Create a string representation of a Magick::PrimaryInfo.
+ * Return a string representation of a {Magick::PrimaryInfo} object.
  *
- * Ruby usage:
- *   - @verbatim Magick::PrimaryInfo#to_s @endverbatim
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 PrimaryInfo_to_s(VALUE self)
@@ -666,7 +652,7 @@ PrimaryInfo_to_s(VALUE self)
     char buff[100];
 
     Export_PrimaryInfo(&pi, self);
-    sprintf(buff, "x=%g, y=%g, z=%g", pi.x, pi.y, pi.z);
+    snprintf(buff, sizeof(buff), "x=%g, y=%g, z=%g", pi.x, pi.y, pi.z);
     return rb_str_new2(buff);
 }
 
@@ -696,8 +682,8 @@ Import_RectangleInfo(RectangleInfo *rect)
     RB_GC_GUARD(x);
     RB_GC_GUARD(y);
 
-    return rb_funcall(Class_Rectangle, rm_ID_new, 4
-                    , width, height, x, y);
+    return rb_funcall(Class_Rectangle, rm_ID_new, 4,
+                      width, height, x, y);
 }
 
 
@@ -735,13 +721,9 @@ Export_RectangleInfo(RectangleInfo *rect, VALUE sr)
 
 
 /**
- * Create a string representation of a Magick::Rectangle.
- *
- * Ruby usage:
- *   - @verbatim Magick::Rectangle#to_s @endverbatim
+ * Return a string representation of a {Magick::Rectangle} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 RectangleInfo_to_s(VALUE self)
@@ -750,8 +732,8 @@ RectangleInfo_to_s(VALUE self)
     char buff[100];
 
     Export_RectangleInfo(&rect, self);
-    sprintf(buff, "width=%lu, height=%lu, x=%ld, y=%ld"
-          , rect.width, rect.height, rect.x, rect.y);
+    snprintf(buff, sizeof(buff), "width=%"RMIuSIZE", height=%"RMIuSIZE", x=%"RMIdSIZE", y=%"RMIdSIZE"",
+             rect.width, rect.height, rect.x, rect.y);
     return rb_str_new2(buff);
 }
 
@@ -818,13 +800,9 @@ Export_SegmentInfo(SegmentInfo *segment, VALUE s)
 
 
 /**
- * Create a string representation of a Magick::Segment.
+ * Return a string representation of a {Magick::Segment} object.
  *
- * Ruby usage:
- *   - @verbatim Magick::SegmentInfo#to_s @endverbatim
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 SegmentInfo_to_s(VALUE self)
@@ -833,8 +811,8 @@ SegmentInfo_to_s(VALUE self)
     char buff[100];
 
     Export_SegmentInfo(&segment, self);
-    sprintf(buff, "x1=%g, y1=%g, x2=%g, y2=%g"
-          , segment.x1, segment.y1, segment.x2, segment.y2);
+    snprintf(buff, sizeof(buff), "x1=%g, y1=%g, x2=%g, y2=%g",
+             segment.x1, segment.y1, segment.x2, segment.y2);
     return rb_str_new2(buff);
 }
 
@@ -875,10 +853,10 @@ Import_TypeMetric(TypeMetric *tm)
     RB_GC_GUARD(underline_position);
     RB_GC_GUARD(underline_thickness);
 
-    return rb_funcall(Class_TypeMetric, rm_ID_new, 9
-                    , pixels_per_em, ascent, descent, width
-                    , height, max_advance, bounds
-                    , underline_position, underline_thickness);
+    return rb_funcall(Class_TypeMetric, rm_ID_new, 9,
+                      pixels_per_em, ascent, descent, width,
+                      height, max_advance, bounds,
+                      underline_position, underline_thickness);
 }
 
 
@@ -932,13 +910,9 @@ Export_TypeMetric(TypeMetric *tm, VALUE st)
 
 
 /**
- * Create a string representation of a Magick::TypeMetric.
- *
- * Ruby usage:
- *   - @verbatim Magick::TypeMetric#to_s @endverbatim
+ * Return a string representation of a {Magick::TypeMetric} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 TypeMetric_to_s(VALUE self)
@@ -950,17 +924,17 @@ TypeMetric_to_s(VALUE self)
 
     Export_TypeMetric(&tm, self);
 
-    len = sprintf(temp, "pixels_per_em=(x=%g,y=%g) ", tm.pixels_per_em.x, tm.pixels_per_em.y);
+    len = snprintf(temp, sizeof(temp), "pixels_per_em=(x=%g,y=%g) ", tm.pixels_per_em.x, tm.pixels_per_em.y);
     str = rb_str_new(temp, len);
-    len = sprintf(temp, "ascent=%g descent=%g ",tm.ascent, tm.descent);
+    len = snprintf(temp, sizeof(temp), "ascent=%g descent=%g ",tm.ascent, tm.descent);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "width=%g height=%g max_advance=%g ", tm.width, tm.height, tm.max_advance);
+    len = snprintf(temp, sizeof(temp), "width=%g height=%g max_advance=%g ", tm.width, tm.height, tm.max_advance);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "bounds.x1=%g bounds.y1=%g ", tm.bounds.x1, tm.bounds.y1);
+    len = snprintf(temp, sizeof(temp), "bounds.x1=%g bounds.y1=%g ", tm.bounds.x1, tm.bounds.y1);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "bounds.x2=%g bounds.y2=%g ", tm.bounds.x2, tm.bounds.y2);
+    len = snprintf(temp, sizeof(temp), "bounds.x2=%g bounds.y2=%g ", tm.bounds.x2, tm.bounds.y2);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "underline_position=%g underline_thickness=%g", tm.underline_position, tm.underline_thickness);
+    len = snprintf(temp, sizeof(temp), "underline_position=%g underline_thickness=%g", tm.underline_position, tm.underline_thickness);
     rb_str_cat(str, temp, len);
 
     RB_GC_GUARD(str);

data/ext/RMagick/rmutil.c

@@ -13,6 +13,7 @@
 #include "rmagick.h"
 #include <errno.h>
 
+static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 
 
@@ -78,7 +79,7 @@ magick_malloc(const size_t size)
 void
 magick_free(void *ptr)
 {
-    (void) RelinquishMagickMemory(ptr);
+    RelinquishMagickMemory(ptr);
 }
 
 
@@ -112,28 +113,6 @@ magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
 }
 
 
-/**
- * ImageMagick version of realloc.
- *
- * No Ruby usage (internal function)
- *
- * @param ptr pointer to the existing block of memory
- * @param size the new size of memory to allocate
- * @return pointer to a block of memory
- */
-void *
-magick_realloc(void *ptr, const size_t size)
-{
-    void *v;
-    v = ResizeMagickMemory(ptr, size);
-    if (!v)
-    {
-        rb_raise(rb_eNoMemError, "not enough memory to continue");
-    }
-    return v;
-}
-
-
 /**
  * Make a copy of a string in malloc'd memory.
  *
@@ -149,7 +128,7 @@ magick_realloc(void *ptr, const size_t size)
 void
  magick_clone_string(char **new_str, const char *str)
 {
-    (void) CloneString(new_str, str);
+    CloneString(new_str, str);
 }
 
 
@@ -208,6 +187,28 @@ rm_strncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 
+/**
+ * Get string length.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param str the string
+ * @param strsz the maximum number of characters
+ * @return same as strnlen_s()
+ */
+size_t
+rm_strnlen_s(const char *str, size_t strsz)
+{
+    size_t length = 0;
+    while(*str && length < strsz)
+    {
+        str++;
+        length++;
+    }
+    return length;
+}
+
+
 /**
  * Raise exception if array too short.
  *
@@ -243,7 +244,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 %"PRIsVALUE" 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;
 }
@@ -295,35 +296,12 @@ rm_check_frozen(VALUE obj)
  *
  * No Ruby usage (internal function)
  *
- * @param obj the object of the class to override
- * @return 0
- * @throw TypeError
+ * @raise [TypeError]
  */
 VALUE
 rm_no_freeze(VALUE obj)
 {
     rb_raise(rb_eTypeError, "can't freeze %s", rb_class2name(CLASS_OF(obj)));
-    return (VALUE)0;
-}
-
-
-/**
- * Return obj.to_s, or obj if obj is already a string.
- *
- * No Ruby usage (internal function)
- *
- * @param obj a Ruby object
- * @return a String representation of obj
- */
-VALUE
-rm_to_s(VALUE obj)
-{
-
-    if (TYPE(obj) != T_STRING)
-    {
-        return rb_funcall(obj, rm_ID_to_s, 0);
-    }
-    return obj;
 }
 
 
@@ -348,21 +326,6 @@ rm_str2cstr(VALUE str, long *len)
 }
 
 
-/**
- * Try to convert the argument to a double, raise an exception if fail.
- *
- * No Ruby usage (internal function)
- *
- * @param arg the argument
- * @return arg
- */
-static VALUE
-arg_is_number(VALUE arg)
-{
-    return DBL2NUM(NUM2DBL(arg));
-}
-
-
 /**
  * Called when `rb_str_to_str' raises an exception.
  *
@@ -373,11 +336,10 @@ arg_is_number(VALUE arg)
  * @throw TypeError
  */
 static VALUE
-rescue_not_str(VALUE arg)
+rescue_not_str(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
 {
     rb_raise(rb_eTypeError, "argument must be a number or a string in the form 'NN%%' (%s given)",
             rb_class2name(CLASS_OF(arg)));
-    return (VALUE)0;
 }
 
 
@@ -396,17 +358,15 @@ double
 rm_percentage(VALUE arg, double max)
 {
     double pct;
-    long pct_long;
-    char *pct_str, *end;
-    int not_num;
-
-    // Try to convert the argument to a number. If failure, sets not_num to non-zero.
-    (void) rb_protect(arg_is_number, arg, &not_num);
+    char *end;
 
-    if (not_num)
+    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 = StringValuePtr(arg);
+        pct_str = StringValueCStr(arg);
         errno = 0;
         pct_long = strtol(pct_str, &end, 10);
         if (errno == ERANGE)
@@ -455,7 +415,7 @@ rm_percentage(VALUE arg, double max)
 static VALUE
 check_num2dbl(VALUE obj)
 {
-    (void) rb_num2dbl(obj);
+    rb_num2dbl(obj);
     return INT2FIX(1);
 }
 
@@ -469,7 +429,7 @@ check_num2dbl(VALUE obj)
  * @return 0
  */
 static VALUE
-rescue_not_dbl(VALUE ignored ATTRIBUTE_UNUSED)
+rescue_not_dbl(VALUE ignored ATTRIBUTE_UNUSED, VALUE raised_exc ATTRIBUTE_UNUSED)
 {
     return INT2FIX(0);
 }
@@ -505,7 +465,7 @@ rm_str_to_pct(VALUE str)
     char *pct_str, *end;
 
     str = rb_rescue(rb_str_to_str, str, rescue_not_str, str);
-    pct_str = StringValuePtr(str);
+    pct_str = StringValueCStr(str);
     errno = 0;
     pct = strtol(pct_str, &end, 10);
 
@@ -541,17 +501,15 @@ double
 rm_fuzz_to_dbl(VALUE fuzz_arg)
 {
     double fuzz;
-    char *fuzz_str, *end;
-    int not_num;
+    char *end;
 
-    // Try to convert the argument to a number. If failure, sets not_num to non-zero.
-    (void) rb_protect(arg_is_number, fuzz_arg, &not_num);
-
-    if (not_num)
+    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 = StringValuePtr(fuzz_arg);
+        fuzz_str = StringValueCStr(fuzz_arg);
         errno = 0;
         fuzz = strtod(fuzz_str, &end);
         if (errno == ERANGE)
@@ -606,11 +564,9 @@ rm_app2quantum(VALUE obj)
 
     if (TYPE(obj) == T_FLOAT)
     {
-        v = rb_funcall(obj, rm_ID_to_i, 0);
+        v = rb_Integer(obj);
     }
 
-    RB_GC_GUARD(v);
-
     return NUM2QUANTUM(v);
 }
 
@@ -632,8 +588,8 @@ rm_acquire_image(ImageInfo *info)
 
     exception = AcquireExceptionInfo();
     new_image = AcquireImage(info, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
     return new_image;
 #else
     return AcquireImage(info);
@@ -683,9 +639,9 @@ rm_pixelcolor_to_color_name(Image *image, PixelColor *color)
     pp.colorspace = image->colorspace;
 #endif
 
-    (void) QueryColorname(image, &pp, X11Compliance, name, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    QueryColorname(image, &pp, X11Compliance, name, exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
     return rb_str_new2(name);
 }
@@ -726,7 +682,7 @@ rm_pixelcolor_to_color_name_info(Info *info, PixelColor *color)
 #endif
 
     color_name = rm_pixelcolor_to_color_name(image, color);
-    (void) DestroyImage(image);
+    DestroyImage(image);
 
     return color_name;
 }
@@ -765,13 +721,13 @@ rm_set_magickpixel(MagickPixel *pp, const char *color)
     exception = AcquireExceptionInfo();
 
 #if defined(IMAGEMAGICK_7)
-    (void) QueryColorCompliance(color, AllCompliance, pp, exception);
+    QueryColorCompliance(color, AllCompliance, pp, exception);
 #else
-    (void) QueryMagickColor(color, pp, exception);
+    QueryMagickColor(color, pp, exception);
 #endif
     // This exception is ignored because the color comes from places where we control
     // the value and it is very unlikely that an exception will be thrown.
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 }
 
 /**
@@ -785,10 +741,11 @@ rm_set_magickpixel(MagickPixel *pp, const char *color)
  *
  * @param image the image
  * @param temp_name the temporary name to use
+ * @param temp_name_l the length of temp_name
  * @return the "filename" of the registered image
  */
 void
-rm_write_temp_image(Image *image, char *temp_name)
+rm_write_temp_image(Image *image, char *temp_name, size_t temp_name_l)
 {
 
 #define TMPNAM_CLASS_VAR "@@_tmpnam_"
@@ -815,11 +772,11 @@ rm_write_temp_image(Image *image, char *temp_name)
 
     id += 1;
     rb_cv_set(Module_Magick, TMPNAM_CLASS_VAR, INT2FIX(id));
-    sprintf(temp_name, "mpri:%d", id);
+    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);
-    CHECK_EXCEPTION()
+    CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
     if (!okay)
     {
@@ -890,7 +847,7 @@ rm_magick_error(const char *msg)
     mesg = rb_str_new2(msg);
 
     exc = rb_funcall(Class_ImageMagickError, rm_ID_new, 2, mesg, Qnil);
-    (void) rb_funcall(rb_cObject, rb_intern("raise"), 1, exc);
+    rb_funcall(rb_cObject, rb_intern("raise"), 1, exc);
 
     RB_GC_GUARD(exc);
     RB_GC_GUARD(mesg);
@@ -899,19 +856,12 @@ rm_magick_error(const char *msg)
 
 /**
  * Initialize a new ImageMagickError object - store the "loc" string in the
- * \@magick_location instance variable.
- *
- * Ruby usage:
- *   - @verbatim ImageMagickError#initialize(msg) @endverbatim
- *   - @verbatim ImageMagickError#initialize(msg, loc) @endverbatim
+ * magick_location instance variable.
  *
- * Notes:
- *   - Default loc is nil
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ * @overload initialize(msg, loc = nil)
+ *   @param msg [String] the exception message
+ *   @param loc [String] the location stored in the magick_location instance variable
+ *   @return [Magick::ImageMagickError] self
  */
 VALUE
 ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
@@ -933,8 +883,8 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 2)", argc);
     }
 
-    (void) rb_call_super(super_argc, (const VALUE *)super_argv);
-    (void) rb_iv_set(self, "@"MAGICK_LOC, extra);
+    rb_call_super(super_argc, (const VALUE *)super_argv);
+    rb_iv_set(self, "@"MAGICK_LOC, extra);
 
     RB_GC_GUARD(extra);
 
@@ -960,8 +910,8 @@ rm_get_property(const Image *img, const char *property)
 
     exception = AcquireExceptionInfo();
     result = GetImageProperty(img, property, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
     return result;
 #else
     return GetImageProperty(img, property);
@@ -975,7 +925,7 @@ rm_get_property(const Image *img, const char *property)
  * No Ruby usage (internal function)
  *
  * @param image the image
- * @param property the property name 
+ * @param property the property name
  * @param value the property value
  * @return true if successful, otherwise false
  */
@@ -988,8 +938,8 @@ rm_set_property(Image *image, const char *property, const char *value)
 
     exception = AcquireExceptionInfo();
     okay = SetImageProperty(image, property, value, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
     return okay;
 #else
     return SetImageProperty(image, property, value);
@@ -1008,16 +958,17 @@ rm_set_property(Image *image, const char *property, const char *value)
  */
 void rm_set_user_artifact(Image *images, Info *info)
 {
-    Image *image;
     const char *value;
 
     value = GetImageOption(info, "user");
     if (value)
     {
+        Image *image;
+
         image = GetFirstImageInList(images);
         while (image)
         {
-            (void) SetImageArtifact(image, "user", value);
+            SetImageArtifact(image, "user", value);
             image = GetNextImageInList(image);
         }
     }
@@ -1049,7 +1000,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);
-        (void) 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);
@@ -1070,17 +1030,18 @@ rm_get_optional_arguments(VALUE img)
 static void copy_options(Image *image, Info *info)
 {
     char property[MaxTextExtent];
-    const char *value, *option;
+    const char *option;
 
     ResetImageOptionIterator(info);
     for (option = GetNextImageOption(info); option; option = GetNextImageOption(info))
     {
-        value = GetImageOption(info,option);
+        const char *value;
+
+        value = GetImageOption(info, option);
         if (value)
         {
-            strncpy(property, value, MaxTextExtent);
-            property[MaxTextExtent-1] = '\0';
-            (void) SetImageArtifact(image, property, value);
+            strlcpy(property, value, sizeof(property));
+            SetImageArtifact(image, property, value);
         }
     }
 }
@@ -1106,13 +1067,13 @@ void rm_sync_image_options(Image *image, Info *info)
 
     // The option strings will be set only when their attribute values were
     // set in the optional argument block.
-    option = GetImageOption(info,"background");
+    option = GetImageOption(info, "background");
     if (option)
     {
         image->background_color = info->background_color;
     }
 
-    option = GetImageOption(info,"bordercolor");
+    option = GetImageOption(info, "bordercolor");
     if (option)
     {
         image->border_color = info->border_color;
@@ -1126,7 +1087,7 @@ void rm_sync_image_options(Image *image, Info *info)
         // 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.
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 #else
         SetImageColorspace(image, info->colorspace);
 #endif
@@ -1195,7 +1156,7 @@ void rm_sync_image_options(Image *image, Info *info)
         image->interlace = info->interlace;
     }
 
-    option = GetImageOption(info,"mattecolor");
+    option = GetImageOption(info, "mattecolor");
     if (option)
     {
         image->matte_color = info->matte_color;
@@ -1208,7 +1169,7 @@ void rm_sync_image_options(Image *image, Info *info)
 
     if (info->page)
     {
-        (void)ParseAbsoluteGeometry(info->page, &image->page);
+        ParseAbsoluteGeometry(info->page, &image->page);
     }
 
     if (info->quality != 0UL)
@@ -1225,7 +1186,7 @@ void rm_sync_image_options(Image *image, Info *info)
     option = GetImageOption(info, "tile-offset");
     if (option)
     {
-        (void)ParseAbsoluteGeometry(option, &image->tile_offset);
+        ParseAbsoluteGeometry(option, &image->tile_offset);
     }
 
     option = GetImageOption(info, "transparent");
@@ -1308,10 +1269,10 @@ rm_exif_by_entry(Image *image)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    (void) GetImageProperty(image, "exif:*", exception);
-    CHECK_EXCEPTION()
+    GetImageProperty(image, "exif:*", exception);
+    CHECK_EXCEPTION();
 #else
-    (void) GetImageProperty(image, "exif:*");
+    GetImageProperty(image, "exif:*");
 #endif
 
     ResetImagePropertyIterator(image);
@@ -1321,7 +1282,7 @@ rm_exif_by_entry(Image *image)
     while (property)
     {
         // ignore properties that don't start with "exif:"
-        property_l = strlen(property);
+        property_l = rm_strnlen_s(property, MaxTextExtent);
         if (property_l > 5 && rm_strncasecmp(property, "exif:", 5) == 0)
         {
             if (len > 0)
@@ -1331,14 +1292,14 @@ rm_exif_by_entry(Image *image)
             len += property_l - 5;
 #if defined(IMAGEMAGICK_7)
             value = GetImageProperty(image, property, exception);
-            CHECK_EXCEPTION()
+            CHECK_EXCEPTION();
 #else
             value = GetImageProperty(image, property);
 #endif
             if (value)
             {
                 // add 1 for the = between property and value
-                len += 1 + strlen(value);
+                len += 1 + rm_strnlen_s(value, MaxTextExtent);
             }
         }
         property = GetNextImageProperty(image);
@@ -1347,7 +1308,7 @@ rm_exif_by_entry(Image *image)
     if (len == 0)
     {
 #if defined(IMAGEMAGICK_7)
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 #endif
         return Qnil;
     }
@@ -1361,7 +1322,7 @@ rm_exif_by_entry(Image *image)
 
     while (property)
     {
-        property_l = strlen(property);
+        property_l = rm_strnlen_s(property, MaxTextExtent);
         if (property_l > 5 && rm_strncasecmp(property, "exif:", 5) == 0)
         {
             if (len > 0)
@@ -1382,7 +1343,7 @@ rm_exif_by_entry(Image *image)
 #endif
             if (value)
             {
-                value_l = strlen(value);
+                value_l = rm_strnlen_s(value, MaxTextExtent);
                 str[len++] = '=';
                 memcpy(str+len, value, value_l);
                 len += value_l;
@@ -1392,7 +1353,7 @@ rm_exif_by_entry(Image *image)
     }
 
 #if defined(IMAGEMAGICK_7)
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #endif
 
     v = rb_str_new(str, len);
@@ -1427,10 +1388,10 @@ rm_exif_by_number(Image *image)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    (void) GetImageProperty(image, "exif:!", exception);
-    CHECK_EXCEPTION()
+    GetImageProperty(image, "exif:!", exception);
+    CHECK_EXCEPTION();
 #else
-    (void) GetImageProperty(image, "exif:!");
+    GetImageProperty(image, "exif:!");
 #endif
     ResetImagePropertyIterator(image);
     property = GetNextImageProperty(image);
@@ -1439,7 +1400,7 @@ rm_exif_by_number(Image *image)
     while (property)
     {
         // ignore properties that don't start with "#"
-        property_l = strlen(property);
+        property_l = rm_strnlen_s(property, MaxTextExtent);
         if (property_l > 1 && property[0] == '#')
         {
             if (len > 0)
@@ -1449,14 +1410,14 @@ rm_exif_by_number(Image *image)
             len += property_l;
 #if defined(IMAGEMAGICK_7)
             value = GetImageProperty(image, property, exception);
-            CHECK_EXCEPTION()
+            CHECK_EXCEPTION();
 #else
             value = GetImageProperty(image, property);
 #endif
             if (value)
             {
                 // add 1 for the = between property and value
-                len += 1 + strlen(value);
+                len += 1 + rm_strnlen_s(value, MaxTextExtent);
             }
         }
         property = GetNextImageProperty(image);
@@ -1465,7 +1426,7 @@ rm_exif_by_number(Image *image)
     if (len == 0)
     {
 #if defined(IMAGEMAGICK_7)
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 #endif
         return Qnil;
     }
@@ -1479,7 +1440,7 @@ rm_exif_by_number(Image *image)
 
     while (property)
     {
-        property_l = strlen(property);
+        property_l = rm_strnlen_s(property, MaxTextExtent);
         if (property_l > 1 && property[0] == '#')
         {
             if (len > 0)
@@ -1500,7 +1461,7 @@ rm_exif_by_number(Image *image)
 #endif
             if (value)
             {
-                value_l = strlen(value);
+                value_l = rm_strnlen_s(value, MaxTextExtent);
                 str[len++] = '=';
                 memcpy(str+len, value, value_l);
                 len += value_l;
@@ -1510,7 +1471,7 @@ rm_exif_by_number(Image *image)
     }
 
 #if defined(IMAGEMAGICK_7)
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #endif
 
     v = rb_str_new(str, len);
@@ -1522,66 +1483,6 @@ rm_exif_by_number(Image *image)
 }
 
 
-/**
- * Get the values from a Geometry object and return them in C variables.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - No return value: modifies x, y, width, height, and flag
- *
- * @param geom the Geometry object
- * @param x pointer to the x position of the start of the rectangle
- * @param y pointer to the y position of the start of the rectangle
- * @param width pointer to the width of the rectangle
- * @param height pointer to the height of the rectangle
- * @param flag pointer to the Geometry's flag
- */
-void
-rm_get_geometry(
-    VALUE geom,
-    long *x,
-    long *y,
-    unsigned long *width,
-    unsigned long *height,
-    int *flag)
-{
-    VALUE v;
-
-    v = rb_funcall(geom, rm_ID_x, 0);
-    *x = NUM2LONG(v);
-    v = rb_funcall(geom, rm_ID_y, 0);
-    *y = NUM2LONG(v);
-    v = rb_funcall(geom, rm_ID_width, 0);
-    *width = NUM2ULONG(v);
-    v = rb_funcall(geom, rm_ID_height, 0);
-    *height = NUM2ULONG(v);
-
-    // Getting the flag field is a bit more difficult since it's
-    // supposed to be an instance of the GeometryValue Enum class. We
-    // may not know the VALUE for the GeometryValue class, and we
-    // need to check that the flag field is an instance of that class.
-    if (flag)
-    {
-        MagickEnum *magick_enum;
-
-        v = rb_funcall(geom, rm_ID_flag, 0);
-        if (!Class_GeometryValue)
-        {
-            Class_GeometryValue = rb_const_get(Module_Magick, rm_ID_GeometryValue);
-        }
-        if (CLASS_OF(v) != Class_GeometryValue)
-        {
-            rb_raise(rb_eTypeError, "wrong enumeration type - expected %s, got %s"
-                        , rb_class2name(Class_GeometryValue),rb_class2name(CLASS_OF(v)));
-        }
-        Data_Get_Struct(v, MagickEnum, magick_enum);
-        *flag = magick_enum->val;
-    }
-
-}
-
-
 /**
  * Clone an image, handle errors.
  *
@@ -1607,7 +1508,7 @@ rm_clone_image(Image *image)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
     rm_check_exception(exception, clone, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     return clone;
 }
@@ -1638,14 +1539,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;
     }
 
@@ -1690,7 +1592,7 @@ rm_split(Image *image)
     }
     while (image)
     {
-        (void) RemoveFirstImageFromList(&image);
+        RemoveFirstImageFromList(&image);
     }
 }
 
@@ -1743,7 +1645,7 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
         rm_check_exception(exception, imglist, retention);
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 }
 #endif
 
@@ -1763,7 +1665,7 @@ static void
 format_exception(const ExceptionType severity, const char *reason, const char *description, char *msg)
 {
     int len;
-    memset(msg, 0, sizeof(ERROR_MSG_SIZE));
+    memset(msg, 0, ERROR_MSG_SIZE);
 
     len = snprintf(msg, ERROR_MSG_SIZE, "%s%s%s",
         GetLocaleExceptionMessage(severity, reason),
@@ -1892,7 +1794,7 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
     {
         if (retention == DestroyOnError)
         {
-            (void) DestroyImageList(imglist);
+            DestroyImageList(imglist);
             imglist = NULL;
         }
         else
@@ -1903,7 +1805,7 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
 
     format_exception(exception->severity, exception->reason, exception->description, msg);
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     rm_magick_error(msg);
 }
@@ -1947,7 +1849,7 @@ rm_should_raise_exception(ExceptionInfo *exception, const ExceptionRetention ret
 
         if (retention == DestroyExceptionRetention)
         {
-            (void) DestroyExceptionInfo(exception);
+            DestroyExceptionInfo(exception);
         }
 
         return MagickFalse;
@@ -1971,8 +1873,26 @@ rm_raise_exception(ExceptionInfo *exception)
 
     format_exception(exception->severity, exception->reason, exception->description, msg);
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(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)
+#include <Windows.h>
+    return (unsigned long long)GetCurrentThreadId();
+#else
+#include <pthread.h>
+    return (unsigned long long)pthread_self();
+#endif
+}