rmagick 4.2.2 → 5.4.4

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

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmilist.c
- * @version  $Id: rmilist.c,v 1.94 2009/12/20 02:33:33 baror Exp $
+ * @file     rmilist.cpp
+ * @version  $Id: rmilist.cpp,v 1.94 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -20,7 +20,39 @@ static void imagelist_push(VALUE, VALUE);
 static VALUE ImageList_new(void);
 
 
+DEFINE_GVL_STUB3(AppendImages, const Image *, const MagickBooleanType, ExceptionInfo *);
+DEFINE_GVL_STUB5(CloneImage, const Image *, const size_t, const size_t, const MagickBooleanType, ExceptionInfo *);
+DEFINE_GVL_STUB2(CloneImageList, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB2(CoalesceImages, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB2(DisposeImages, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB3(EvaluateImages, const Image *, const MagickEvaluateOperator, ExceptionInfo *);
+DEFINE_GVL_STUB4(ImagesToBlob, const ImageInfo *, Image *, size_t *, ExceptionInfo *);
+DEFINE_GVL_STUB3(MergeImageLayers, Image *, const LayerMethod, ExceptionInfo *);
+DEFINE_GVL_STUB3(MontageImages, const Image *, const MontageInfo *, ExceptionInfo *);
+DEFINE_GVL_STUB3(MorphImages, const Image *, const size_t, ExceptionInfo *);
+DEFINE_GVL_STUB2(OptimizeImageLayers, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB2(OptimizePlusImageLayers, const Image *, ExceptionInfo *);
+#if defined(IMAGEMAGICK_7)
+DEFINE_GVL_STUB3(AnimateImages, const ImageInfo *, Image *, ExceptionInfo *);
+DEFINE_GVL_STUB3(CombineImages, const Image *, const ColorspaceType, ExceptionInfo *);
+DEFINE_GVL_STUB3(CompareImagesLayers, const Image *, const LayerMethod, ExceptionInfo *);
+DEFINE_GVL_STUB3(QuantizeImages, const QuantizeInfo *, Image *, ExceptionInfo *);
+DEFINE_GVL_STUB4(RemapImages, const QuantizeInfo *, Image *, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB3(WriteImage, const ImageInfo *, Image *, ExceptionInfo *);
+#else
+DEFINE_GVL_STUB2(AnimateImages, const ImageInfo *, Image *);
+DEFINE_GVL_STUB3(CombineImages, const Image *, const ChannelType, ExceptionInfo *);
+DEFINE_GVL_STUB3(CompareImageLayers, const Image *, const ImageLayerMethod, ExceptionInfo *);
+DEFINE_GVL_STUB2(DeconstructImages, const Image *, ExceptionInfo *);
+DEFINE_GVL_STUB2(QuantizeImages, const QuantizeInfo *, Image *);
+DEFINE_GVL_STUB3(RemapImages, const QuantizeInfo *, Image *, const Image *);
+DEFINE_GVL_STUB2(WriteImage, const ImageInfo *, Image *);
+#endif
 
+DEFINE_GVL_VOID_STUB6(CompositeLayers, Image *, const CompositeOperator, Image *, const ssize_t, const ssize_t, ExceptionInfo *);
+DEFINE_GVL_VOID_STUB2(OptimizeImageTransparency, const Image *, ExceptionInfo *);
+DEFINE_GVL_VOID_STUB2(RemoveDuplicateLayers, Image **, ExceptionInfo *);
+DEFINE_GVL_VOID_STUB2(RemoveZeroDelayLayers, Image **, ExceptionInfo *);
 
 
 /**
@@ -72,15 +104,17 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
         }
     }
 
-    Data_Get_Struct(info_obj, Info, info);
+    TypedData_Get_Struct(info_obj, Info, &rm_info_data_type, info);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    AnimateImages(info, images, exception);
+    GVL_STRUCT_TYPE(AnimateImages) args = { info, images, exception };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnimateImages), &args);
     rm_split(images);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else
-    AnimateImages(info, images);
+    GVL_STRUCT_TYPE(AnimateImages) args = { info, images };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnimateImages), &args);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 #endif
@@ -101,7 +135,7 @@ VALUE
 ImageList_append(VALUE self, VALUE stack_arg)
 {
     Image *images, *new_image;
-    unsigned int stack;
+    MagickBooleanType stack;
     ExceptionInfo *exception;
 
     // Convert the image array to an image sequence.
@@ -109,10 +143,11 @@ ImageList_append(VALUE self, VALUE stack_arg)
 
     // If stack == true, stack rectangular images top-to-bottom,
     // otherwise left-to-right.
-    stack = RTEST(stack_arg);
+    stack = (MagickBooleanType)RTEST(stack_arg);
 
     exception = AcquireExceptionInfo();
-    new_image = AppendImages(images, stack, exception);
+    GVL_STRUCT_TYPE(AppendImages) args = { images, stack, exception };
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AppendImages), &args);
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -136,8 +171,8 @@ ImageList_average(VALUE self)
     images = images_from_imagelist(self);
 
     exception = AcquireExceptionInfo();
-    new_image = EvaluateImages(images, MeanEvaluateOperator, exception);
-
+    GVL_STRUCT_TYPE(EvaluateImages) args = { images, MeanEvaluateOperator, exception };
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(EvaluateImages), &args);
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -164,7 +199,8 @@ ImageList_coalesce(VALUE self)
     images = images_from_imagelist(self);
 
     exception = AcquireExceptionInfo();
-    new_images = CoalesceImages(images, exception);
+    GVL_STRUCT_TYPE(CoalesceImages) args = { images, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CoalesceImages), &args);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -224,20 +260,20 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
     {
         case 5:
             if (colorspace == CMYKColorspace)
-                channel |= AlphaChannel;
+                channel = (ChannelType)(channel | AlphaChannel);
             else
                 rb_raise(rb_eArgError, "invalid number of images in this image list");
         case 4:
             if (colorspace == CMYKColorspace)
-                channel |= IndexChannel;
+                channel = (ChannelType)(channel | IndexChannel);
             else
-                channel |= AlphaChannel;
+                channel = (ChannelType)(channel | AlphaChannel);
         case 3:
-            channel |= GreenChannel;
-            channel |= BlueChannel;
+            channel = (ChannelType)(channel | GreenChannel);
+            channel = (ChannelType)(channel | BlueChannel);
             break;
         case 2:
-            channel |= AlphaChannel;
+            channel = (ChannelType)(channel | AlphaChannel);
             break;
         case 1:
             break;
@@ -252,10 +288,11 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_6)
     old_colorspace = images->colorspace;
     SetImageColorspace(images, colorspace);
-    new_image = CombineImages(images, channel, exception);
+    GVL_STRUCT_TYPE(CombineImages) args = { images, channel, exception };
 #else
-    new_image = CombineImages(images, colorspace, exception);
+    GVL_STRUCT_TYPE(CombineImages) args = { images, colorspace, exception };
 #endif
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CombineImages), &args);
 
     rm_split(images);
 #if defined(IMAGEMAGICK_6)
@@ -274,10 +311,10 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
  * @overload composite_layers(images)
  *   @param images [Magick::ImageList] the source images
  *
- * @overload composite_layers(images, operator)
+ * @overload composite_layers(images, composite_op)
  *   - Default operator is {Magick::OverCompositeOp}
  *   @param images [Magick::ImageList] the source images
- *   @param operator [Magick::CompositeOperator] the operator
+ *   @param composite_op [Magick::CompositeOperator] the operator
  *
  * @return [Magick::ImageList] a new imagelist
  */
@@ -287,13 +324,13 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
     VALUE source_images;
     Image *dest, *source, *new_images;
     RectangleInfo geometry;
-    CompositeOperator operator = OverCompositeOp;
+    CompositeOperator composite_op = OverCompositeOp;
     ExceptionInfo *exception;
 
     switch (argc)
     {
         case 2:
-            VALUE_TO_ENUM(argv[1], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[1], composite_op, CompositeOperator);
         case 1:
             source_images = argv[0];
             break;
@@ -319,7 +356,8 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
                           new_images->gravity, &geometry);
 
     exception = AcquireExceptionInfo();
-    CompositeLayers(new_images, operator, source, geometry.x, geometry.y, exception);
+    GVL_STRUCT_TYPE(CompositeLayers) args = { new_images, composite_op, source, geometry.x, geometry.y, exception };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeLayers), &args);
     rm_split(source);
     rm_check_exception(exception, new_images, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -345,9 +383,11 @@ ImageList_deconstruct(VALUE self)
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
-    new_images = CompareImagesLayers(images, CompareAnyLayer, exception);
+    GVL_STRUCT_TYPE(CompareImagesLayers) args = { images, CompareAnyLayer, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompareImagesLayers), &args);
 #else
-    new_images = DeconstructImages(images, exception);
+    GVL_STRUCT_TYPE(DeconstructImages) args = { images, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DeconstructImages), &args);
 #endif
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
@@ -374,7 +414,7 @@ ImageList_display(VALUE self)
 
     // Create a new Info object to use with this call
     info_obj = rm_info_new();
-    Data_Get_Struct(info_obj, Info, info);
+    TypedData_Get_Struct(info_obj, Info, &rm_info_data_type, info);
 
     // Convert the images array to an images sequence.
     images = images_from_imagelist(self);
@@ -410,7 +450,8 @@ ImageList_flatten_images(VALUE self)
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
 
-    new_image = MergeImageLayers(images, FlattenLayer, exception);
+    GVL_STRUCT_TYPE(MergeImageLayers) args = { images, FlattenLayer, exception };
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
@@ -428,8 +469,8 @@ ImageList_flatten_images(VALUE self)
  * @overload montage
  *   Creates {Magick::ImageList::Montage} object, yields to block
  *   if present in {Magick::ImageList::Montage} object's scope.
- *   @yield []
- * 
+ *   @yield [Magick::ImageList::Montage]
+ *
  * @return [Magick::ImageList] a new image list
  */
 VALUE
@@ -440,23 +481,14 @@ ImageList_montage(VALUE self)
     Image *new_images, *images;
     ExceptionInfo *exception;
 
-    // Create a new instance of the Magick::Montage class
+    // Create a new instance of the Magick::ImageList::Montage class
     montage_obj = rm_montage_new();
     if (rb_block_given_p())
     {
-        // Run the block in the instance's context, allowing the app to modify the
-        // object's attributes.
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            rb_obj_instance_eval(0, NULL, montage_obj);
-        }
-        else
-        {
-            rb_yield(montage_obj);
-        }
+        rb_yield(montage_obj);
     }
 
-    Data_Get_Struct(montage_obj, Montage, montage);
+    TypedData_Get_Struct(montage_obj, Montage, &rm_montage_data_type, montage);
 
     images = images_from_imagelist(self);
 
@@ -475,7 +507,8 @@ ImageList_montage(VALUE self)
     exception = AcquireExceptionInfo();
 
     // MontageImage can return more than one image.
-    new_images = MontageImages(images, montage->info, exception);
+    GVL_STRUCT_TYPE(MontageImages) args = { images, montage->info, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MontageImages), &args);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -499,19 +532,20 @@ ImageList_morph(VALUE self, VALUE nimages)
 {
     Image *images, *new_images;
     ExceptionInfo *exception;
-    long number_images;
+    size_t number_images;
 
 
     // Use a signed long so we can test for a negative argument.
-    number_images = NUM2LONG(nimages);
-    if (number_images <= 0)
+    if (NUM2LONG(nimages) <= 0)
     {
         rb_raise(rb_eArgError, "number of intervening images must be > 0");
     }
 
+    number_images = NUM2LONG(nimages);
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
-    new_images = MorphImages(images, (unsigned long)number_images, exception);
+    GVL_STRUCT_TYPE(MorphImages) args = { images, number_images, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MorphImages), &args);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -534,7 +568,8 @@ ImageList_mosaic(VALUE self)
     images = images_from_imagelist(self);
 
     exception = AcquireExceptionInfo();
-    new_image = MergeImageLayers(images, MosaicLayer, exception);
+    GVL_STRUCT_TYPE(MergeImageLayers) args = { images, MosaicLayer, exception };
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
@@ -568,22 +603,37 @@ ImageList_optimize_layers(VALUE self, VALUE method)
     switch (mthd)
     {
         case CoalesceLayer:
-            new_images = CoalesceImages(images, exception);
+            {
+                GVL_STRUCT_TYPE(CoalesceImages) args = { images, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CoalesceImages), &args);
+            }
             break;
         case DisposeLayer:
-            new_images = DisposeImages(images, exception);
+            {
+                GVL_STRUCT_TYPE(DisposeImages) args = { images, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DisposeImages), &args);
+            }
             break;
         case OptimizeTransLayer:
-            new_images = clone_imagelist(images);
-            OptimizeImageTransparency(new_images, exception);
+            {
+                new_images = clone_imagelist(images);
+                GVL_STRUCT_TYPE(OptimizeImageTransparency) args = { new_images, exception };
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OptimizeImageTransparency), &args);
+            }
             break;
         case RemoveDupsLayer:
-            new_images = clone_imagelist(images);
-            RemoveDuplicateLayers(&new_images, exception);
+            {
+                new_images = clone_imagelist(images);
+                GVL_STRUCT_TYPE(RemoveDuplicateLayers) args = { &new_images, exception };
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RemoveDuplicateLayers), &args);
+            }
             break;
         case RemoveZeroLayer:
-            new_images = clone_imagelist(images);
-            RemoveZeroDelayLayers(&new_images, exception);
+            {
+                new_images = clone_imagelist(images);
+                GVL_STRUCT_TYPE(RemoveZeroDelayLayers) args = { &new_images, exception };
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RemoveZeroDelayLayers), &args);
+            }
             break;
         case CompositeLayer:
             rm_split(images);
@@ -592,50 +642,81 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             break;
             // In 6.3.4-ish, OptimizeImageLayer replaced OptimizeLayer
         case OptimizeImageLayer:
-            new_images = OptimizeImageLayers(images, exception);
+            {
+                GVL_STRUCT_TYPE(OptimizeImageLayers) args = { images, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OptimizeImageLayers), &args);
+            }
             break;
             // and OptimizeLayer became a "General Purpose, GIF Animation Optimizer" (ref. mogrify.c)
         case OptimizeLayer:
-            new_images = CoalesceImages(images, exception);
-            rm_split(images);
-            rm_check_exception(exception, new_images, DestroyOnError);
-            new_images2 = OptimizeImageLayers(new_images, exception);
-            DestroyImageList(new_images);
-            rm_check_exception(exception, new_images2, DestroyOnError);
-            new_images = new_images2;
-            OptimizeImageTransparency(new_images, exception);
-            rm_check_exception(exception, new_images, DestroyOnError);
-            // mogrify supports -dither here. We don't.
-            GetQuantizeInfo(&quantize_info);
+            {
+                GVL_STRUCT_TYPE(CoalesceImages) args_CoalesceImages = { images, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CoalesceImages), &args_CoalesceImages);
+                rm_split(images);
+                rm_check_exception(exception, new_images, DestroyOnError);
+
+                GVL_STRUCT_TYPE(OptimizeImageLayers) args_OptimizeImageLayers = { new_images, exception };
+                new_images2 = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OptimizeImageLayers), &args_OptimizeImageLayers);
+                DestroyImageList(new_images);
+                rm_check_exception(exception, new_images2, DestroyOnError);
+
+                new_images = new_images2;
+                GVL_STRUCT_TYPE(OptimizeImageTransparency) args_OptimizeImageTransparency = { new_images, exception };
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OptimizeImageTransparency), &args_OptimizeImageTransparency);
+                rm_check_exception(exception, new_images, DestroyOnError);
+                // mogrify supports -dither here. We don't.
+                GetQuantizeInfo(&quantize_info);
 #if defined(IMAGEMAGICK_7)
-            RemapImages(&quantize_info, new_images, NULL, exception);
+                GVL_STRUCT_TYPE(RemapImages) args_RemapImages = { &quantize_info, new_images, NULL, exception };
 #else
-            RemapImages(&quantize_info, new_images, NULL);
+                GVL_STRUCT_TYPE(RemapImages) args_RemapImages = { &quantize_info, new_images, NULL };
 #endif
+                CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RemapImages), &args_RemapImages);
+
+            }
             break;
         case OptimizePlusLayer:
-            new_images = OptimizePlusImageLayers(images, exception);
+            {
+                GVL_STRUCT_TYPE(OptimizePlusImageLayers) args = { images, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(OptimizePlusImageLayers), &args);
+            }
             break;
         case CompareAnyLayer:
         case CompareClearLayer:
         case CompareOverlayLayer:
+            {
 #if defined(IMAGEMAGICK_7)
-            new_images = CompareImagesLayers(images, mthd, exception);
+                GVL_STRUCT_TYPE(CompareImagesLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompareImagesLayers), &args);
 #else
-            new_images = CompareImageLayers(images, mthd, exception);
+                GVL_STRUCT_TYPE(CompareImageLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompareImageLayers), &args);
 #endif
+            }
             break;
         case MosaicLayer:
-            new_images = MergeImageLayers(images, mthd, exception);
+            {
+                GVL_STRUCT_TYPE(MergeImageLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
+            }
             break;
         case FlattenLayer:
-            new_images = MergeImageLayers(images, mthd, exception);
+            {
+                GVL_STRUCT_TYPE(MergeImageLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
+            }
             break;
         case MergeLayer:
-            new_images = MergeImageLayers(images, mthd, exception);
+            {
+                GVL_STRUCT_TYPE(MergeImageLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
+            }
             break;
         case TrimBoundsLayer:
-            new_images = MergeImageLayers(images, mthd, exception);
+            {
+                GVL_STRUCT_TYPE(MergeImageLayers) args = { images, mthd, exception };
+                new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(MergeImageLayers), &args);
+            }
             break;
         default:
             rm_split(images);
@@ -833,7 +914,8 @@ clone_imagelist(Image *images)
     {
         Image *clone;
 
-        clone = CloneImage(image, 0, 0, MagickTrue, exception);
+        GVL_STRUCT_TYPE(CloneImage) args = { image, 0, 0, MagickTrue, exception };
+        clone = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CloneImage), &args);
         rm_check_exception(exception, new_imagelist, DestroyOnError);
         AppendImageToList(&new_imagelist, clone);
         image = GetNextImageInList(image);
@@ -888,7 +970,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
-                quantize_info.dither = quantize_info.dither_method != NoDitherMethod;
+                quantize_info.dither = (MagickBooleanType)(quantize_info.dither_method != NoDitherMethod);
             }
             else
             {
@@ -910,17 +992,19 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
     // Convert image array to image sequence, clone image sequence.
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
-    new_images = CloneImageList(images, exception);
+    GVL_STRUCT_TYPE(CloneImageList) args_CloneImageList = { images, exception };
+    new_images = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CloneImageList), &args_CloneImageList);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
 
     rm_ensure_result(new_images);
 
 #if defined(IMAGEMAGICK_7)
-    QuantizeImages(&quantize_info, new_images, exception);
+    GVL_STRUCT_TYPE(QuantizeImages) args_QuantizeImages = { &quantize_info, new_images, exception };
 #else
-    QuantizeImages(&quantize_info, new_images);
+    GVL_STRUCT_TYPE(QuantizeImages) args_QuantizeImages = { &quantize_info, new_images };
 #endif
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(QuantizeImages), &args_QuantizeImages);
     rm_check_exception(exception, new_images, DestroyOnError);
     DestroyExceptionInfo(exception);
 
@@ -987,12 +1071,14 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    RemapImages(&quantize_info, images, remap_image, exception);
+    GVL_STRUCT_TYPE(RemapImages) args = { &quantize_info, images, remap_image, exception };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RemapImages), &args);
     rm_split(images);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else
-    RemapImages(&quantize_info, images, remap_image);
+    GVL_STRUCT_TYPE(RemapImages) args = { &quantize_info, images, remap_image };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RemapImages), &args);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 #endif
@@ -1008,7 +1094,7 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
  *
  * @overload to_blob
  *   Runs an info parm block if present - the user can specify the image format and depth
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return [String] the blob
  */
@@ -1024,7 +1110,7 @@ ImageList_to_blob(VALUE self)
     ExceptionInfo *exception;
 
     info_obj = rm_info_new();
-    Data_Get_Struct(info_obj, Info, info);
+    TypedData_Get_Struct(info_obj, Info, &rm_info_data_type, info);
 
     // Convert the images array to an images sequence.
     images = images_from_imagelist(self);
@@ -1051,7 +1137,8 @@ ImageList_to_blob(VALUE self)
     // can happen is that there's only one image or the format
     // doesn't support multi-image files.
     info->adjoin = MagickTrue;
-    blob = ImagesToBlob(info, images, &length, exception);
+    GVL_STRUCT_TYPE(ImagesToBlob) args = { info, images, &length, exception };
+    blob = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImagesToBlob), &args);
     if (blob && exception->severity >= ErrorException)
     {
         magick_free((void*)blob);
@@ -1068,7 +1155,7 @@ ImageList_to_blob(VALUE self)
         return Qnil;
     }
 
-    blob_str = rb_str_new(blob, (long)length);
+    blob_str = rb_str_new((const char *)blob, (long)length);
     magick_free((void*)blob);
 
     RB_GC_GUARD(info_obj);
@@ -1097,7 +1184,7 @@ ImageList_write(VALUE self, VALUE file)
     ExceptionInfo *exception;
 
     info_obj = rm_info_new();
-    Data_Get_Struct(info_obj, Info, info);
+    TypedData_Get_Struct(info_obj, Info, &rm_info_data_type, info);
 
 
     if (TYPE(file) == T_FILE)
@@ -1106,8 +1193,10 @@ ImageList_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, rm_io_path(file));
 #if defined(_WIN32)
-        add_format_prefix(info, fptr->pathv);
         SetImageInfoFile(info, NULL);
 #else
         SetImageInfoFile(info, rb_io_stdio_file(fptr));
@@ -1142,7 +1231,7 @@ ImageList_write(VALUE self, VALUE file)
 #endif
 
     // Tell WriteImage if we want a multi-images file.
-    if (imagelist_length(self) > 1L && GetMagickAdjoin(m))
+    if (imagelist_length(self) > 1L && m && GetMagickAdjoin(m))
     {
         info->adjoin = MagickTrue;
     }
@@ -1151,10 +1240,12 @@ ImageList_write(VALUE self, VALUE file)
     {
         rm_sync_image_options(img, info);
 #if defined(IMAGEMAGICK_7)
-        WriteImage(info, img, exception);
+        GVL_STRUCT_TYPE(WriteImage) args = { info, img, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(WriteImage), &args);
         rm_check_exception(exception, img, RetainOnError);
 #else
-        WriteImage(info, img);
+        GVL_STRUCT_TYPE(WriteImage) args = { info, img };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(WriteImage), &args);
         // images will be split before raising an exception
         rm_check_image_exception(images, RetainOnError);
 #endif