rmagick 5.3.0 → 5.4.0

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

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmimage.c
- * @version  $Id: rmimage.c,v 1.361 2010/05/03 03:34:48 baror Exp $
+ * @file     rmimage.cpp
+ * @version  $Id: rmimage.cpp,v 1.361 2010/05/03 03:34:48 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -126,6 +126,7 @@ DEFINE_GVL_STUB4(ColorizeImage, const Image *, const char *, const PixelInfo *,
 DEFINE_GVL_STUB5(CompareImages, Image *, const Image *, const MetricType, double *, ExceptionInfo *);
 DEFINE_GVL_STUB7(CompositeImage, Image *, const Image *, const CompositeOperator, const MagickBooleanType, const ssize_t, const ssize_t, ExceptionInfo *);
 DEFINE_GVL_STUB2(CompressImageColormap, Image *, ExceptionInfo *);
+DEFINE_GVL_STUB3(ContrastImage, Image *, const MagickBooleanType, ExceptionInfo *);
 DEFINE_GVL_STUB4(ContrastStretchImage, Image *, const double, const double, ExceptionInfo *);
 DEFINE_GVL_STUB3(ConvolveImage, const Image *, const KernelInfo *, ExceptionInfo *);
 DEFINE_GVL_STUB3(CycleColormapImage, Image *, const ssize_t, ExceptionInfo *);
@@ -206,6 +207,7 @@ DEFINE_GVL_STUB6(CompareImageChannels, Image *, const Image *, const ChannelType
 DEFINE_GVL_STUB5(CompositeImage, Image *, const CompositeOperator, const Image *, const ssize_t, const ssize_t);
 DEFINE_GVL_STUB6(CompositeImageChannel, Image *, const ChannelType, const CompositeOperator, const Image *, const ssize_t, const ssize_t);
 DEFINE_GVL_STUB1(CompressImageColormap, Image *);
+DEFINE_GVL_STUB2(ContrastImage, Image *, const MagickBooleanType);
 DEFINE_GVL_STUB4(ContrastStretchImageChannel, Image *, const ChannelType, const double, const double);
 DEFINE_GVL_STUB4(ConvolveImage, const Image *, const size_t, const double *, ExceptionInfo *);
 DEFINE_GVL_STUB5(ConvolveImageChannel, const Image *, const ChannelType, const size_t, const double *, ExceptionInfo *);
@@ -597,10 +599,10 @@ Image_adaptive_sharpen_channel(int argc, VALUE *argv, VALUE self)
  * local neighborhood. This allows for thresholding of an image whose global intensity histogram
  * doesn't contain distinctive peaks.
  *
- * @overload adaptive_threshold(width = 3, height = 3, offset = 0)
+ * @overload adaptive_threshold(width = 3, height = 3, bias = 0)
  *   @param width [Numeric] the width of the local neighborhood.
  *   @param height [Numeric] the height of the local neighborhood.
- *   @param offset [Numeric] the mean offset
+ *   @param bias [Numeric] the mean offset
  *   @return [Magick::Image] a new image
  */
 VALUE
@@ -608,7 +610,7 @@ Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     unsigned long width = 3, height = 3;
-    long offset = 0;
+    double bias = 0;
     ExceptionInfo *exception;
 
     image = rm_check_destroyed(self);
@@ -616,7 +618,7 @@ Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 3:
-            offset = NUM2LONG(argv[2]);
+            bias = NUM2DBL(argv[2]);
         case 2:
             height = NUM2ULONG(argv[1]);
         case 1:
@@ -628,7 +630,7 @@ Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
     }
 
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(AdaptiveThresholdImage) args = { image, width, height, offset, exception };
+    GVL_STRUCT_TYPE(AdaptiveThresholdImage) args = { image, width, height, bias, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AdaptiveThresholdImage), &args);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -757,7 +759,7 @@ Image_add_noise_channel(int argc, VALUE *argv, VALUE self)
     }
 
     VALUE_TO_ENUM(argv[0], noise_type, NoiseType);
-    channels &= ~OpacityChannel;
+    channels = (ChannelType)(channels & ~OpacityChannel);
 
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
@@ -953,7 +955,8 @@ Image_affine_transform(VALUE self, VALUE affine)
 
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(AffineTransformImage) args = { image, &matrix, exception };
-    new_image = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AffineTransformImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AffineTransformImage), &args);
+    new_image = reinterpret_cast<decltype(new_image)>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 
@@ -1098,7 +1101,8 @@ crisscross(int bang, VALUE self, gvl_function_t fp)
     exception = AcquireExceptionInfo();
 
     GVL_STRUCT_TYPE(crisscross) args = { image, exception };
-    new_image = CALL_FUNC_WITHOUT_GVL(fp, &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(fp, &args);
+    new_image = reinterpret_cast<decltype(new_image)>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 
@@ -2801,13 +2805,15 @@ Image_clut_channel(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
     BEGIN_CHANNEL_MASK(image, channels);
     GVL_STRUCT_TYPE(ClutImage) args = { image, clut, image->interpolate, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ClutImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ClutImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     END_CHANNEL_MASK(image);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(ClutImageChannel) args = { image, channels, clut };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ClutImageChannel), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ClutImageChannel), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(image, RetainOnError);
     rm_check_image_exception(clut, RetainOnError);
 #endif
@@ -2857,7 +2863,8 @@ Image_color_histogram(VALUE self)
     }
 
     GVL_STRUCT_TYPE(GetImageHistogram) args = { image, &colors, exception };
-    histogram = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetImageHistogram), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetImageHistogram), &args);
+    histogram = reinterpret_cast<decltype(histogram)>(ret);
 
     if (histogram == NULL)
     {
@@ -2927,7 +2934,7 @@ set_profile(VALUE self, const char *name, VALUE profile)
     ExceptionInfo *exception;
     char *profile_name;
     char *profile_blob;
-    long profile_length;
+    size_t profile_length;
     const StringInfo *profile_data;
 
     image = rm_check_frozen(self);
@@ -2951,7 +2958,7 @@ set_profile(VALUE self, const char *name, VALUE profile)
 
     strlcpy(info->magick, m->name, sizeof(info->magick));
 
-    GVL_STRUCT_TYPE(BlobToImage) args = { info, profile_blob, (size_t)profile_length, exception };
+    GVL_STRUCT_TYPE(BlobToImage) args = { info, profile_blob, profile_length, exception };
     profile_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
     DestroyImageInfo(info);
     CHECK_EXCEPTION();
@@ -3098,7 +3105,7 @@ Image_color_flood_fill(VALUE self, VALUE target_color, VALUE fill_color,
     y = NUM2LONG(yv);
     if ((unsigned long)x > image->columns || (unsigned long)y > image->rows)
     {
-        rb_raise(rb_eArgError, "target out of range. %lux%lu given, image is %"RMIuSIZE"x%"RMIuSIZE"",
+        rb_raise(rb_eArgError, "target out of range. %lux%lu given, image is %" RMIuSIZE "x%" RMIuSIZE "",
                  x, y, image->columns, image->rows);
     }
 
@@ -3541,7 +3548,7 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
 {
     Image *image, *new_image;
     Image *comp_image;
-    CompositeOperator operator = UndefinedCompositeOp;
+    CompositeOperator composite_op = UndefinedCompositeOp;
     GravityType gravity;
     VALUE comp;
     signed long x_offset = 0;
@@ -3570,7 +3577,7 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
     {
         case 3:                 // argv[1] is gravity, argv[2] is composite_op
             VALUE_TO_ENUM(argv[1], gravity, GravityType);
-            VALUE_TO_ENUM(argv[2], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[2], composite_op, CompositeOperator);
 
             // convert gravity to x, y offsets
             switch (gravity)
@@ -3620,14 +3627,14 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
             // argv[3] is composite_op
             x_offset = NUM2LONG(argv[1]);
             y_offset = NUM2LONG(argv[2]);
-            VALUE_TO_ENUM(argv[3], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[3], composite_op, CompositeOperator);
             break;
 
         case 5:
             VALUE_TO_ENUM(argv[1], gravity, GravityType);
             x_offset = NUM2LONG(argv[2]);
             y_offset = NUM2LONG(argv[3]);
-            VALUE_TO_ENUM(argv[4], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[4], composite_op, CompositeOperator);
 
             switch (gravity)
             {
@@ -3670,13 +3677,13 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
 #if defined(IMAGEMAGICK_7)
         exception = AcquireExceptionInfo();
         BEGIN_CHANNEL_MASK(image, channels);
-        GVL_STRUCT_TYPE(CompositeImage) args = { image, comp_image, operator, MagickTrue, x_offset, y_offset, exception };
+        GVL_STRUCT_TYPE(CompositeImage) args = { image, comp_image, composite_op, MagickTrue, x_offset, y_offset, exception };
         CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImage), &args);
         END_CHANNEL_MASK(image);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
 #else
-        GVL_STRUCT_TYPE(CompositeImageChannel) args = { image, channels, operator, comp_image, x_offset, y_offset };
+        GVL_STRUCT_TYPE(CompositeImageChannel) args = { image, channels, composite_op, comp_image, x_offset, y_offset };
         CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImageChannel), &args);
         rm_check_image_exception(image, RetainOnError);
 #endif
@@ -3690,13 +3697,13 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
 #if defined(IMAGEMAGICK_7)
         exception = AcquireExceptionInfo();
         BEGIN_CHANNEL_MASK(new_image, channels);
-        GVL_STRUCT_TYPE(CompositeImage) args = { new_image, comp_image, operator, MagickTrue, x_offset, y_offset, exception };
+        GVL_STRUCT_TYPE(CompositeImage) args = { new_image, comp_image, composite_op, MagickTrue, x_offset, y_offset, exception };
         CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImage), &args);
         END_CHANNEL_MASK(new_image);
         rm_check_exception(exception, new_image, DestroyOnError);
         DestroyExceptionInfo(exception);
 #else
-        GVL_STRUCT_TYPE(CompositeImageChannel) args = { new_image, channels, operator, comp_image, x_offset, y_offset };
+        GVL_STRUCT_TYPE(CompositeImageChannel) args = { new_image, channels, composite_op, comp_image, x_offset, y_offset };
         CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImageChannel), &args);
         rm_check_image_exception(new_image, DestroyOnError);
 #endif
@@ -4123,7 +4130,7 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
 {
     Image *image;
     Image *comp_image;
-    CompositeOperator operator = OverCompositeOp;
+    CompositeOperator composite_op = OverCompositeOp;
     long x, y;
     unsigned long columns;
     ChannelType channels;
@@ -4147,7 +4154,7 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 2:
-            VALUE_TO_ENUM(argv[1], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[1], composite_op, CompositeOperator);
         case 1:
             break;
         case 0:
@@ -4181,13 +4188,15 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
         {
 #if defined(IMAGEMAGICK_7)
             BEGIN_CHANNEL_MASK(image, channels);
-            GVL_STRUCT_TYPE(CompositeImage) args = { image, comp_image, operator, MagickTrue, x, y, exception };
-            status = (MagickStatusType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImage), &args);
+            GVL_STRUCT_TYPE(CompositeImage) args = { image, comp_image, composite_op, MagickTrue, x, y, exception };
+            void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImage), &args);
+            status = reinterpret_cast<MagickStatusType &>(ret);
             END_CHANNEL_MASK(image);
             rm_check_exception(exception, image, bang ? RetainOnError: DestroyOnError);
 #else
-            GVL_STRUCT_TYPE(CompositeImageChannel) args = { image, channels, operator, comp_image, x, y };
-            status = (MagickStatusType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImageChannel), &args);
+            GVL_STRUCT_TYPE(CompositeImageChannel) args = { image, channels, composite_op, comp_image, x, y };
+            void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeImageChannel), &args);
+            status = reinterpret_cast<MagickStatusType &>(ret);
             rm_check_image_exception(image, bang ? RetainOnError: DestroyOnError);
 #endif
         }
@@ -4301,12 +4310,14 @@ Image_compress_colormap_bang(VALUE self)
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(CompressImageColormap) args = { image, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompressImageColormap), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompressImageColormap), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(CompressImageColormap) args = { image };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompressImageColormap), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompressImageColormap), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(image, RetainOnError);
 #endif
     if (!okay)
@@ -4339,12 +4350,13 @@ Image_compress_colormap_bang(VALUE self)
  * @return [Magick::Image] a new image
  */
 VALUE
-Image_constitute(VALUE class ATTRIBUTE_UNUSED, VALUE width_arg, VALUE height_arg,
+Image_constitute(VALUE klass ATTRIBUTE_UNUSED, VALUE width_arg, VALUE height_arg,
                  VALUE map_arg, VALUE pixels_arg)
 {
     Image *new_image;
     VALUE pixel, pixel0;
-    long width, height, x, npixels, map_l;
+    long x, npixels;
+    size_t width, height, map_l;
     char *map;
     volatile union
     {
@@ -4360,14 +4372,13 @@ Image_constitute(VALUE class ATTRIBUTE_UNUSED, VALUE width_arg, VALUE height_arg
     // and raises TypeError if it can't.
     pixels_arg = rb_Array(pixels_arg);
 
-    width = NUM2LONG(width_arg);
-    height = NUM2LONG(height_arg);
-
-    if (width <= 0 || height <= 0)
+    if (NUM2LONG(width_arg) <= 0 || NUM2LONG(height_arg) <= 0)
     {
         rb_raise(rb_eArgError, "width and height must be greater than zero");
     }
 
+    width = NUM2LONG(width_arg);
+    height = NUM2LONG(height_arg);
     map = rm_str2cstr(map_arg, &map_l);
 
     npixels = width * height * map_l;
@@ -4507,7 +4518,7 @@ VALUE
 Image_contrast(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    unsigned int sharpen = 0;
+    MagickBooleanType sharpen = MagickFalse;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -4519,18 +4530,20 @@ Image_contrast(int argc, VALUE *argv, VALUE self)
     }
     else if (argc == 1)
     {
-        sharpen = RTEST(argv[0]);
+        sharpen = (MagickBooleanType)RTEST(argv[0]);
     }
 
     new_image = rm_clone_image(image);
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    ContrastImage(new_image, sharpen, exception);
+    GVL_STRUCT_TYPE(ContrastImage) args = { new_image, sharpen, exception };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ContrastImage), &args);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
-    ContrastImage(new_image, sharpen);
+    GVL_STRUCT_TYPE(ContrastImage) args = { new_image, sharpen };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ContrastImage), &args);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
 
@@ -4805,7 +4818,7 @@ VALUE
 Image_convolve(VALUE self, VALUE order_arg, VALUE kernel_arg)
 {
     Image *image, *new_image;
-    int order;
+    size_t order;
     ExceptionInfo *exception;
 #if defined(IMAGEMAGICK_7)
     KernelInfo *kernel;
@@ -4816,13 +4829,12 @@ Image_convolve(VALUE self, VALUE order_arg, VALUE kernel_arg)
 
     image = rm_check_destroyed(self);
 
-    order = NUM2INT(order_arg);
-
-    if (order <= 0)
+    if (NUM2INT(order_arg) <= 0)
     {
         rb_raise(rb_eArgError, "order must be non-zero and positive");
     }
 
+    order = NUM2INT(order_arg);
     kernel_arg = rb_Array(kernel_arg);
     rm_check_ary_len(kernel_arg, (long)(order*order));
 
@@ -4886,7 +4898,7 @@ Image_convolve_channel(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     VALUE ary;
-    int order;
+    size_t order;
     ChannelType channels;
     ExceptionInfo *exception;
 #if defined(IMAGEMAGICK_7)
@@ -4910,12 +4922,12 @@ Image_convolve_channel(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or more)", argc);
     }
 
-    order = NUM2INT(argv[0]);
-    if (order <= 0)
+    if (NUM2INT(argv[0]) <= 0)
     {
         rb_raise(rb_eArgError, "order must be non-zero and positive");
     }
 
+    order = NUM2INT(argv[0]);
     ary = rb_Array(argv[1]);
     rm_check_ary_len(ary, (long)(order*order));
 
@@ -5236,7 +5248,8 @@ Image_decipher(VALUE self, VALUE passphrase)
     new_image = rm_clone_image(image);
 
     GVL_STRUCT_TYPE(DecipherImage) args = { new_image, pf, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DecipherImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DecipherImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     if (!okay)
     {
@@ -5665,7 +5678,7 @@ Image_dispatch(int argc, VALUE *argv, VALUE self)
     VALUE pixels_ary;
     StorageType stg_type = QuantumPixel;
     char *map;
-    long mapL;
+    size_t mapL;
     MagickBooleanType okay;
     ExceptionInfo *exception;
     volatile union
@@ -5704,7 +5717,8 @@ Image_dispatch(int argc, VALUE *argv, VALUE self)
 
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(ExportImagePixels) args = { image, x, y, columns, rows, map, stg_type, (void *)pixels.v, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
 
     if (!okay)
     {
@@ -5759,7 +5773,7 @@ Image_display(VALUE self)
 
     if (image->rows == 0 || image->columns == 0)
     {
-        rb_raise(rb_eArgError, "invalid image geometry (%"RMIuSIZE"x%"RMIuSIZE")", image->rows, image->columns);
+        rb_raise(rb_eArgError, "invalid image geometry (%" RMIuSIZE "x%" RMIuSIZE ")", image->rows, image->columns);
     }
 
     info_obj = rm_info_new();
@@ -5937,7 +5951,7 @@ Image_distort(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 3:
-            bestfit = RTEST(argv[2]);
+            bestfit = (MagickBooleanType)RTEST(argv[2]);
         case 2:
             // Ensure pts is an array
             pts = rb_Array(argv[1]);
@@ -6299,7 +6313,8 @@ Image_encipher(VALUE self, VALUE passphrase)
     new_image = rm_clone_image(image);
 
     GVL_STRUCT_TYPE(EncipherImage) args = { new_image, pf, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(EncipherImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(EncipherImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     if (!okay)
     {
@@ -6649,7 +6664,8 @@ Image_export_pixels(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 
     GVL_STRUCT_TYPE(ExportImagePixels) args = { image, x_off, y_off, cols, rows, map, QuantumPixel, (void *)pixels, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     if (!okay)
     {
         xfree((void *)pixels);
@@ -6725,7 +6741,7 @@ Image_extent(int argc, VALUE *argv, VALUE self)
         }
         else
         {
-            rb_raise(rb_eArgError, "invalid extent geometry %ldx%ld+%"RMIdSIZE"+%"RMIdSIZE"",
+            rb_raise(rb_eArgError, "invalid extent geometry %ldx%ld+%" RMIdSIZE "+%" RMIdSIZE "",
                      width, height, geometry.x, geometry.y);
         }
     }
@@ -6841,7 +6857,8 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 
     GVL_STRUCT_TYPE(ExportImagePixels) args = { image, x_off, y_off, cols, rows, map, type, (void *)RSTRING_PTR(string), exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ExportImagePixels), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     if (!okay)
     {
         // Let GC have the string buffer.
@@ -6985,11 +7002,12 @@ Image_find_similar_region(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
     GVL_STRUCT_TYPE(IsEquivalentImage) args = { image, target, &x, &y, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(IsEquivalentImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(IsEquivalentImage), &args);
 #else
     GVL_STRUCT_TYPE(IsImageSimilar) args = { image, target, &x, &y, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(IsImageSimilar), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(IsImageSimilar), &args);
 #endif
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 
@@ -7261,14 +7279,14 @@ Image_frame(int argc, VALUE *argv, VALUE self)
  * @see Image#to_blob
  */
 VALUE
-Image_from_blob(VALUE class ATTRIBUTE_UNUSED, VALUE blob_arg)
+Image_from_blob(VALUE klass ATTRIBUTE_UNUSED, VALUE blob_arg)
 {
     Image *images;
     Info *info;
     VALUE info_obj;
     ExceptionInfo *exception;
     void *blob;
-    long length;
+    size_t length;
 
     blob = (void *) rm_str2cstr(blob_arg, &length);
 
@@ -7827,7 +7845,8 @@ Image_get_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg, VALUE row
     // to change the pixels but I don't want to make "pixels" const.
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(GetVirtualPixels) args = { image, x, y, columns, rows, exception };
-    pixels = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args);
+    pixels = reinterpret_cast<decltype(pixels)>(ret);
     CHECK_EXCEPTION();
 
     DestroyExceptionInfo(exception);
@@ -8040,7 +8059,7 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
     long x_off, y_off;
     unsigned long cols, rows;
     unsigned long n, npixels;
-    long buffer_l;
+    size_t buffer_l;
     char *map;
     VALUE pixel_arg, pixel_ary;
     StorageType stg_type = CharPixel;
@@ -8120,7 +8139,7 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
         }
         if ((unsigned long)(buffer_l / type_sz) < npixels)
         {
-            rb_raise(rb_eArgError, "pixel buffer too small (need %lu channel values, got %"RMIuSIZE")",
+            rb_raise(rb_eArgError, "pixel buffer too small (need %lu channel values, got %" RMIuSIZE ")",
                      npixels, buffer_l/type_sz);
         }
     }
@@ -8189,7 +8208,8 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
 #else
     GVL_STRUCT_TYPE(ImportImagePixels) args = { image, x_off, y_off, cols, rows, map, stg_type, buffer };
 #endif
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImportImagePixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImportImagePixels), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
 
     // Free pixel array before checking for errors.
     if (pixels)
@@ -8253,7 +8273,7 @@ build_inspect_string(Image *image, char *buffer, size_t len)
     // Print scene number.
     if ((GetPreviousImageInList(image) != NULL) && (GetNextImageInList(image) != NULL) && image->scene > 0)
     {
-        x += snprintf(buffer+x, len-x, "[%"RMIuSIZE"]", image->scene);
+        x += snprintf(buffer+x, len-x, "[%" RMIuSIZE "]", image->scene);
     }
     // Print format
     x += snprintf(buffer+x, len-x, " %s ", image->magick);
@@ -8263,17 +8283,17 @@ build_inspect_string(Image *image, char *buffer, size_t len)
     {
         if (image->magick_columns != image->columns || image->magick_rows != image->rows)
         {
-            x += snprintf(buffer+x, len-x, "%"RMIuSIZE"x%"RMIuSIZE"=>", image->magick_columns, image->magick_rows);
+            x += snprintf(buffer+x, len-x, "%" RMIuSIZE "x%" RMIuSIZE "=>", image->magick_columns, image->magick_rows);
         }
     }
 
-    x += snprintf(buffer+x, len-x, "%"RMIuSIZE"x%"RMIuSIZE" ", image->columns, image->rows);
+    x += snprintf(buffer+x, len-x, "%" RMIuSIZE "x%" RMIuSIZE " ", image->columns, image->rows);
 
     // Print current columnsXrows
     if (   image->page.width != 0 || image->page.height != 0
            || image->page.x != 0     || image->page.y != 0)
     {
-        x += snprintf(buffer+x, len-x, "%"RMIuSIZE"x%"RMIuSIZE"+%"RMIdSIZE"+%"RMIdSIZE" ",
+        x += snprintf(buffer+x, len-x, "%" RMIuSIZE "x%" RMIuSIZE "+%" RMIdSIZE "+%" RMIdSIZE " ",
                       image->page.width, image->page.height,
                       image->page.x, image->page.y);
     }
@@ -8285,17 +8305,17 @@ build_inspect_string(Image *image, char *buffer, size_t len)
         {
             if (image->total_colors >= (unsigned long)(1 << 24))
             {
-                x += snprintf(buffer+x, len-x, "%"RMIuSIZE"mc ", image->total_colors/1024/1024);
+                x += snprintf(buffer+x, len-x, "%" RMIuSIZE "mc ", image->total_colors/1024/1024);
             }
             else
             {
                 if (image->total_colors >= (unsigned long)(1 << 16))
                 {
-                    x += snprintf(buffer+x, len-x, "%"RMIuSIZE"kc ", image->total_colors/1024);
+                    x += snprintf(buffer+x, len-x, "%" RMIuSIZE "kc ", image->total_colors/1024);
                 }
                 else
                 {
-                    x += snprintf(buffer+x, len-x, "%"RMIuSIZE"c ", image->total_colors);
+                    x += snprintf(buffer+x, len-x, "%" RMIuSIZE "c ", image->total_colors);
                 }
             }
         }
@@ -8310,7 +8330,7 @@ build_inspect_string(Image *image, char *buffer, size_t len)
         }
         else
         {
-            x += snprintf(buffer+x, len-x, "PseudoClass %"RMIuSIZE"=>%"RMIuSIZE"c ", image->total_colors, image->colors);
+            x += snprintf(buffer+x, len-x, "PseudoClass %" RMIuSIZE "=>%" RMIuSIZE "c ", image->total_colors, image->colors);
             if (image->error.mean_error_per_pixel != 0.0)
             {
                 x += snprintf(buffer+x, len-x, "%ld/%.6f/%.6fdb ",
@@ -8632,7 +8652,7 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
     MagickPixel black_color, white_color;
     ChannelType channels;
     MagickBooleanType invert = MagickTrue;
-    MagickBooleanType status;
+    MagickBooleanType okay;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -8647,7 +8667,7 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 3:
-            invert = RTEST(argv[2]);
+            invert = (MagickBooleanType)RTEST(argv[2]);
 
         case 2:
             Color_to_MagickPixel(image, &white_color, argv[1]);
@@ -8675,16 +8695,18 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
     BEGIN_CHANNEL_MASK(new_image, channels);
     GVL_STRUCT_TYPE(LevelImageColors) args = { new_image, &black_color, &white_color, invert, exception };
-    status = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelImageColors), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelImageColors), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     END_CHANNEL_MASK(new_image);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(LevelColorsImageChannel) args = { new_image, channels, &black_color, &white_color, invert };
-    status = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelColorsImageChannel), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelColorsImageChannel), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
-    if (!status)
+    if (!okay)
     {
         rb_raise(rb_eRuntimeError, "LevelImageColors failed for unknown reason.");
     }
@@ -8717,7 +8739,7 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
     ChannelType channels;
     double black_point, white_point;
     double gamma = 1.0;
-    MagickBooleanType status;
+    MagickBooleanType okay;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -8752,17 +8774,19 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
     BEGIN_CHANNEL_MASK(new_image, channels);
     GVL_STRUCT_TYPE(LevelizeImage) args = { new_image, black_point, white_point, gamma, exception };
-    status = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelizeImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelizeImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     END_CHANNEL_MASK(new_image);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(LevelizeImageChannel) args = { new_image, channels, black_point, white_point, gamma };
-    status = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelizeImageChannel), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(LevelizeImageChannel), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
 
-    if (!status)
+    if (!okay)
     {
         rb_raise(rb_eRuntimeError, "LevelizeImageChannel failed for unknown reason.");
     }
@@ -8868,14 +8892,14 @@ Image_liquid_rescale(int argc, VALUE *argv, VALUE self)
  * @see Image#_dump
  */
 VALUE
-Image__load(VALUE class ATTRIBUTE_UNUSED, VALUE str)
+Image__load(VALUE klass ATTRIBUTE_UNUSED, VALUE str)
 {
     Image *image;
     ImageInfo *info;
     DumpedImage mi;
     ExceptionInfo *exception;
     char *blob;
-    long length;
+    size_t length;
 
     blob = rm_str2cstr(str, &length);
 
@@ -8906,7 +8930,7 @@ Image__load(VALUE class ATTRIBUTE_UNUSED, VALUE str)
     mi.len = ((DumpedImage *)blob)->len;
 
     // Must be bigger than the header
-    if (length <= (long)(mi.len+sizeof(DumpedImage)-MaxTextExtent))
+    if (length <= (mi.len + sizeof(DumpedImage) - MaxTextExtent))
     {
         rb_raise(rb_eTypeError, "image is invalid or corrupted (too short)");
     }
@@ -9075,7 +9099,7 @@ Image_marshal_load(VALUE self, VALUE ary)
     {
         strlcpy(info->filename, RSTRING_PTR(filename), sizeof(info->filename));
     }
-    GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(blob), RSTRING_LEN(blob), exception };
+    GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(blob), (size_t)RSTRING_LEN(blob), exception };
     image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
 
     // Destroy info before raising an exception
@@ -9377,7 +9401,7 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
     y = NUM2LONG(argv[2]);
     if ((unsigned long)x > image->columns || (unsigned long)y > image->rows)
     {
-        rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %"RMIuSIZE"x%"RMIuSIZE"",
+        rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %" RMIuSIZE "x%" RMIuSIZE "",
                  x, y, image->columns, image->rows);
     }
 
@@ -9728,7 +9752,7 @@ VALUE
 Image_negate(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    unsigned int grayscale = MagickFalse;
+    MagickBooleanType grayscale = MagickFalse;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -9736,7 +9760,7 @@ Image_negate(int argc, VALUE *argv, VALUE self)
     image = rm_check_destroyed(self);
     if (argc == 1)
     {
-        grayscale = RTEST(argv[0]);
+        grayscale = (MagickBooleanType)RTEST(argv[0]);
     }
     else if (argc > 1)
     {
@@ -9783,7 +9807,7 @@ Image_negate_channel(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     ChannelType channels;
-    unsigned int grayscale = MagickFalse;
+    MagickBooleanType grayscale = MagickFalse;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -9798,7 +9822,7 @@ Image_negate_channel(int argc, VALUE *argv, VALUE self)
     }
     else if (argc == 1)
     {
-        grayscale = RTEST(argv[0]);
+        grayscale = (MagickBooleanType)RTEST(argv[0]);
     }
 
     new_image = rm_clone_image(image);
@@ -9827,11 +9851,11 @@ Image_negate_channel(int argc, VALUE *argv, VALUE self)
  * @return [Magick::Image] a newly allocated image
  */
 VALUE
-Image_alloc(VALUE class)
+Image_alloc(VALUE klass)
 {
     VALUE image_obj;
 
-    image_obj = TypedData_Wrap_Struct(class, &rm_image_data_type, NULL);
+    image_obj = TypedData_Wrap_Struct(klass, &rm_image_data_type, NULL);
 
     RB_GC_GUARD(image_obj);
 
@@ -10177,12 +10201,14 @@ Image_opaque(VALUE self, VALUE target, VALUE fill)
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(OpaquePaintImage) args = { new_image, &target_pp, &fill_pp, MagickFalse, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(OpaquePaintImageChannel) args = { new_image, DefaultChannels, &target_pp, &fill_pp, MagickFalse };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImageChannel), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImageChannel), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
 
@@ -10250,7 +10276,7 @@ Image_opaque_channel(int argc, VALUE *argv, VALUE self)
                 rb_raise(rb_eArgError, "fuzz must be >= 0.0 (%g given)", fuzz);
             }
         case 3:
-            invert = RTEST(argv[2]);
+            invert = (MagickBooleanType)RTEST(argv[2]);
         case 2:
             // Allow color name or Pixel
             Color_to_MagickPixel(image, &fill_pp, argv[1]);
@@ -10269,14 +10295,16 @@ Image_opaque_channel(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
     BEGIN_CHANNEL_MASK(new_image, channels);
     GVL_STRUCT_TYPE(OpaquePaintImage) args = { new_image, &target_pp, &fill_pp, invert, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     END_CHANNEL_MASK(new_image);
     new_image->fuzz = keep;
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     GVL_STRUCT_TYPE(OpaquePaintImageChannel) args = { new_image, channels, &target_pp, &fill_pp, invert };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImageChannel), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OpaquePaintImageChannel), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
 
     new_image->fuzz = keep;
     rm_check_image_exception(new_image, DestroyOnError);
@@ -10478,11 +10506,11 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
         case 3:
             if (TYPE(argv[argc - 1]) == T_HASH)
             {
-                invert = RTEST(argv[1]);
+                invert = (MagickBooleanType)RTEST(argv[1]);
             }
             else
             {
-                invert = RTEST(argv[2]);
+                invert = (MagickBooleanType)RTEST(argv[2]);
             }
         case 2:
             alpha = get_named_alpha_value(argv[argc - 1]);
@@ -10503,13 +10531,15 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, (const MagickPixel *)&color, alpha, invert, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     new_image->fuzz = keep;
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
-    GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, (const MagickPixel *)&color, QuantumRange - alpha, invert };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, (const MagickPixel *)&color, (Quantum)(QuantumRange - alpha), invert };
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     new_image->fuzz = keep;
 
     // Is it possible for TransparentPaintImage to silently fail?
@@ -10550,9 +10580,9 @@ Image_palette_q(VALUE self)
  * @see Image#read
  */
 VALUE
-Image_ping(VALUE class, VALUE file_arg)
+Image_ping(VALUE klass, VALUE file_arg)
 {
-    return rd_image(class, file_arg, GVL_FUNC(PingImage));
+    return rd_image(klass, file_arg, GVL_FUNC(PingImage));
 }
 
 
@@ -10619,7 +10649,8 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     {
         exception = AcquireExceptionInfo();
         GVL_STRUCT_TYPE(GetVirtualPixels) args = { image, x, y, 1, 1, exception };
-        old_pixel = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args);
+        void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args);
+        old_pixel = reinterpret_cast<decltype(old_pixel)>(ret);
         CHECK_EXCEPTION();
 
         DestroyExceptionInfo(exception);
@@ -10672,7 +10703,8 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     {
 #if defined(IMAGEMAGICK_7)
         GVL_STRUCT_TYPE(SetImageStorageClass) args = { image, DirectClass, exception };
-        okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+        void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+        okay = reinterpret_cast<MagickBooleanType &>(ret);
         CHECK_EXCEPTION();
         if (!okay)
         {
@@ -10681,7 +10713,8 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
         }
 #else
         GVL_STRUCT_TYPE(SetImageStorageClass) args = { image, DirectClass };
-        okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+        void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+        okay = reinterpret_cast<MagickBooleanType &>(ret);
         rm_check_image_exception(image, RetainOnError);
         if (!okay)
         {
@@ -10695,7 +10728,8 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
 #endif
 
     GVL_STRUCT_TYPE(GetAuthenticPixels) args = { image, x, y, 1, 1, exception };
-    pixel = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetAuthenticPixels), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetAuthenticPixels), &args);
+    pixel = reinterpret_cast<decltype(pixel)>(ret);
     CHECK_EXCEPTION();
 
     if (pixel)
@@ -10989,13 +11023,13 @@ Image_quantum_depth(VALUE self)
  * quantum_operator will be faster, especially for large numbers of pixels, since it does not need
  * to convert the pixels from C to Ruby.
  *
- * @overload quantum_operator(operator, rvalue, channel = Magick::AllChannels)
- *   @param operator [Magick::QuantumExpressionOperator] the operator
+ * @overload quantum_operator(quantum_expression_op, rvalue, channel = Magick::AllChannels)
+ *   @param quantum_expression_op [Magick::QuantumExpressionOperator] the operator
  *   @param rvalue [Float] the operation rvalue.
  *   @param channel [Magick::ChannelType] a ChannelType arguments.
  *
- * @overload quantum_operator(operator, rvalue, *channels)
- *   @param operator [Magick::QuantumExpressionOperator] the operator
+ * @overload quantum_operator(quantum_expression_op, rvalue, *channels)
+ *   @param quantum_expression_op [Magick::QuantumExpressionOperator] the operator
  *   @param rvalue [Float] the operation rvalue.
  *   @param *channels [Magick::ChannelType] one or more ChannelType arguments.
  *
@@ -11005,7 +11039,7 @@ VALUE
 Image_quantum_operator(int argc, VALUE *argv, VALUE self)
 {
     Image *image;
-    QuantumExpressionOperator operator;
+    QuantumExpressionOperator quantum_expression_op;
     MagickEvaluateOperator qop;
     double rvalue;
     ChannelType channel;
@@ -11028,7 +11062,7 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
             /* Fall through */
         case 2:
             rvalue = NUM2DBL(argv[1]);
-            VALUE_TO_ENUM(argv[0], operator, QuantumExpressionOperator);
+            VALUE_TO_ENUM(argv[0], quantum_expression_op, QuantumExpressionOperator);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
@@ -11036,7 +11070,7 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
     }
 
     // Map QuantumExpressionOperator to MagickEvaluateOperator
-    switch (operator)
+    switch (quantum_expression_op)
     {
         default:
         case UndefinedQuantumOperator:
@@ -11201,7 +11235,7 @@ Image_quantize(int argc, VALUE *argv, VALUE self)
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
 #if defined(IMAGEMAGICK_6)
-                quantize_info.dither = quantize_info.dither_method != NoDitherMethod;
+                quantize_info.dither = (MagickBooleanType)(quantize_info.dither_method != NoDitherMethod);
 #endif
             }
             else
@@ -11259,10 +11293,12 @@ Image_radial_blur(VALUE self, VALUE angle_obj)
 
 #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
     GVL_STRUCT_TYPE(RotationalBlurImage) args = { image, angle, exception };
-    new_image = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RotationalBlurImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RotationalBlurImage), &args);
+    new_image = reinterpret_cast<decltype(new_image)>(ret);
 #else
     GVL_STRUCT_TYPE(RadialBlurImage) args = { image, angle, exception };
-    new_image = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RadialBlurImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RadialBlurImage), &args);
+    new_image = reinterpret_cast<decltype(new_image)>(ret);
 #endif
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -11414,7 +11450,7 @@ Image_raise(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     RectangleInfo rect;
-    int raised = MagickTrue;      // default
+    MagickBooleanType raised = MagickTrue;      // default
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -11427,7 +11463,7 @@ Image_raise(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 3:
-            raised = RTEST(argv[2]);
+            raised = (MagickBooleanType)RTEST(argv[2]);
         case 2:
             rect.height = NUM2ULONG(argv[1]);
         case 1:
@@ -11464,9 +11500,9 @@ Image_raise(int argc, VALUE *argv, VALUE self)
  * @return [Array<Magick::Image>] an array of 1 or more new image objects
  */
 VALUE
-Image_read(VALUE class, VALUE file_arg)
+Image_read(VALUE klass, VALUE file_arg)
 {
-    return rd_image(class, file_arg, GVL_FUNC(ReadImage));
+    return rd_image(klass, file_arg, GVL_FUNC(ReadImage));
 }
 
 
@@ -11498,7 +11534,7 @@ typedef GVL_STRUCT_TYPE(PingImage) GVL_STRUCT_TYPE(rd_image);
  *   - Yields to a block to get Image::Info attributes before calling
  *     Read/PingImage
  *
- * @param class the Ruby class for an Image
+ * @param klass the Ruby class for an Image
  * @param file the file containing image data
  * @param reader which image reader to use (ReadImage or PingImage)
  * @return an array of 1 or more new image objects
@@ -11514,10 +11550,10 @@ void sig_handler(int sig ATTRIBUTE_UNUSED)
 #endif
 
 static VALUE
-rd_image(VALUE class ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
+rd_image(VALUE klass ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
 {
     char *filename;
-    long filename_l;
+    size_t filename_l;
     Info *info;
     VALUE info_obj;
     Image *images;
@@ -11539,7 +11575,7 @@ rd_image(VALUE class ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
     else
     {
         // Convert arg to string. If an exception occurs raise an error condition.
-        file = rb_rescue(rb_String, file, file_arg_rescue, file);
+        file = rb_rescue(RESCUE_FUNC(rb_String), file, RESCUE_EXCEPTION_HANDLER_FUNC(file_arg_rescue), file);
 
         filename = rm_str2cstr(file, &filename_l);
         filename_l = min(filename_l, MaxTextExtent-1);
@@ -11677,7 +11713,7 @@ Image_read_inline(VALUE self ATTRIBUTE_UNUSED, VALUE content)
     Image *images;
     ImageInfo *info;
     char *image_data;
-    long x, image_data_l;
+    size_t x, image_data_l;
     unsigned char *blob;
     size_t blob_l;
     ExceptionInfo *exception;
@@ -12252,7 +12288,7 @@ rotate(int bang, int argc, VALUE *argv, VALUE self)
     Image *image, *new_image;
     double degrees;
     char *arrow;
-    long arrow_l;
+    size_t arrow_l;
     ExceptionInfo *exception;
 
     TypedData_Get_Struct(self, Image, &rm_image_data_type, image);
@@ -12668,7 +12704,7 @@ VALUE
 Image_separate(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_images;
-    ChannelType channels = 0;
+    ChannelType channels = UndefinedChannel;
     ExceptionInfo *exception;
 
     image = rm_check_destroyed(self);
@@ -12757,8 +12793,8 @@ VALUE
 Image_segment(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    int colorspace              = RGBColorspace;    // These are the Magick++ defaults
-    unsigned int verbose        = MagickFalse;
+    ColorspaceType colorspace   = RGBColorspace;    // These are the Magick++ defaults
+    MagickBooleanType verbose   = MagickFalse;
     double cluster_threshold    = 1.0;
     double smoothing_threshold  = 1.5;
 #if defined(IMAGEMAGICK_7)
@@ -12769,7 +12805,7 @@ Image_segment(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 4:
-            verbose = RTEST(argv[3]);
+            verbose = (MagickBooleanType)RTEST(argv[3]);
         case 3:
             smoothing_threshold = NUM2DBL(argv[2]);
         case 2:
@@ -12909,7 +12945,7 @@ Image_shade(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     double azimuth = 30.0, elevation = 30.0;
-    unsigned int shading = MagickFalse;
+    MagickBooleanType shading = MagickFalse;
     ExceptionInfo *exception;
 
     image = rm_check_destroyed(self);
@@ -12920,7 +12956,7 @@ Image_shade(int argc, VALUE *argv, VALUE self)
         case 2:
             azimuth = NUM2DBL(argv[1]);
         case 1:
-            shading = RTEST(argv[0]);
+            shading = (MagickBooleanType)RTEST(argv[0]);
         case 0:
             break;
         default:
@@ -13888,7 +13924,8 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg,
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(SetImageStorageClass) args = { image, DirectClass, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     CHECK_EXCEPTION();
     if (!okay)
     {
@@ -13897,7 +13934,8 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg,
     }
 #else
     GVL_STRUCT_TYPE(SetImageStorageClass) args = { image, DirectClass };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageStorageClass), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(image, RetainOnError);
     if (!okay)
     {
@@ -13910,7 +13948,8 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg,
     // from the pixels argument.
     {
         GVL_STRUCT_TYPE(GetAuthenticPixels) args = { image, x, y, cols, rows, exception };
-        pixels = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetAuthenticPixels), &args);
+        void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetAuthenticPixels), &args);
+        pixels = reinterpret_cast<decltype(pixels)>(ret);
         CHECK_EXCEPTION();
 
         if (pixels)
@@ -14063,7 +14102,7 @@ Image_texture_flood_fill(VALUE self, VALUE color_obj, VALUE texture_obj,
 
     if ((unsigned long)x > image->columns || (unsigned long)y > image->rows)
     {
-        rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %"RMIuSIZE"x%"RMIuSIZE"",
+        rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %" RMIuSIZE "x%" RMIuSIZE "",
                  x, y, image->columns, image->rows);
     }
 
@@ -14530,7 +14569,7 @@ Image_to_blob(VALUE self)
                || !rm_strcasecmp(magick_info->name, "JPG"))
               && (image->rows == 0 || image->columns == 0))
         {
-            rb_raise(rb_eRuntimeError, "Can't convert %"RMIuSIZE"x%"RMIuSIZE" %.4s image to a blob",
+            rb_raise(rb_eRuntimeError, "Can't convert %" RMIuSIZE "x%" RMIuSIZE " %.4s image to a blob",
                      image->columns, image->rows, magick_info->name);
         }
     }
@@ -14548,7 +14587,7 @@ Image_to_blob(VALUE self)
         return Qnil;
     }
 
-    blob_str = rb_str_new(blob, length);
+    blob_str = rb_str_new((const char *)blob, length);
 
     magick_free((void*)blob);
 
@@ -14685,12 +14724,14 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, &color, alpha, MagickFalse, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
-    GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, &color, QuantumRange - alpha, MagickFalse };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    GVL_STRUCT_TYPE(TransparentPaintImage) args = { new_image, &color, (Quantum)(QuantumRange - alpha), MagickFalse };
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImage), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
     if (!okay)
@@ -14739,11 +14780,11 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
         case 4:
             if (TYPE(argv[argc - 1]) == T_HASH)
             {
-                invert = RTEST(argv[3]);
+                invert = (MagickBooleanType)RTEST(argv[3]);
             }
             else
             {
-                invert = RTEST(argv[2]);
+                invert = (MagickBooleanType)RTEST(argv[2]);
             }
         case 3:
             alpha = get_named_alpha_value(argv[argc - 1]);
@@ -14761,12 +14802,14 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(TransparentPaintImageChroma) args = { new_image, &low, &high, alpha, invert, exception };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImageChroma), &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImageChroma), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
-    GVL_STRUCT_TYPE(TransparentPaintImageChroma) args = { new_image, &low, &high, QuantumRange - alpha, invert };
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImageChroma), &args);
+    GVL_STRUCT_TYPE(TransparentPaintImageChroma) args = { new_image, &low, &high, (Quantum)(QuantumRange - alpha), invert };
+    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransparentPaintImageChroma), &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
     rm_check_image_exception(new_image, DestroyOnError);
 #endif
     if (!okay)
@@ -15711,7 +15754,8 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
 #endif
 
         GVL_STRUCT_TYPE(GetVirtualPixels) args_GetVirtualPixels = { reflection, 0, y, image->columns, 1, exception };
-        p = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args_GetVirtualPixels);
+        void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(GetVirtualPixels), &args_GetVirtualPixels);
+        p = reinterpret_cast<decltype(p)>(ret);
         rm_check_exception(exception, reflection, DestroyOnError);
         if (!p)
         {
@@ -15795,7 +15839,7 @@ Image_white_threshold(int argc, VALUE *argv, VALUE self)
 void add_format_prefix(Info *info, VALUE file)
 {
     char *filename;
-    long filename_l;
+    size_t filename_l;
     const MagickInfo *magick_info, *magick_info2;
     ExceptionInfo *exception;
     char magic[MaxTextExtent];
@@ -15808,7 +15852,7 @@ void add_format_prefix(Info *info, VALUE file)
     {
         FilePathStringValue(file);
     }
-    file = rb_rescue(rb_String, file, file_arg_rescue, file);
+    file = rb_rescue(RESCUE_FUNC(rb_String), file, RESCUE_EXCEPTION_HANDLER_FUNC(file_arg_rescue), file);
 
     filename = rm_str2cstr(file, &filename_l);
 
@@ -15822,7 +15866,7 @@ void add_format_prefix(Info *info, VALUE file)
     // If the filename starts with a prefix, and it's a valid image format
     // prefix, then check for a conflict. If it's not a valid format prefix,
     // ignore it.
-    p = memchr(filename, ':', (size_t)filename_l);
+    p = (char *)memchr(filename, ':', (size_t)filename_l);
     if (p)
     {
         memset(magic, '\0', sizeof(magic));
@@ -15903,7 +15947,8 @@ Image_write(VALUE self, VALUE file)
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
         rb_io_check_writable(fptr);
-        add_format_prefix(info, fptr->pathv);
+
+        add_format_prefix(info, rm_io_path(file));
 #if defined(_WIN32)
         SetImageInfoFile(info, NULL);
 #else
@@ -16310,7 +16355,7 @@ ChannelType extract_channels(int *argc, VALUE *argv)
     VALUE arg;
     ChannelType channels, ch_arg;
 
-    channels = 0;
+    channels = UndefinedChannel;
     while (*argc > 0)
     {
         arg = argv[(*argc)-1];
@@ -16321,7 +16366,7 @@ ChannelType extract_channels(int *argc, VALUE *argv)
             break;
         }
         VALUE_TO_ENUM(arg, ch_arg, ChannelType);
-        channels |= ch_arg;
+        channels = (ChannelType)(channels | ch_arg);
         *argc -= 1;
     }