rmagick 5.0.0 → 5.1.0

data/ext/RMagick/rmdraw.c

@@ -13,17 +13,33 @@
 #include "rmagick.h"
 #include "float.h"
 
-static void mark_Draw(void *);
-static void destroy_Draw(void *);
+static void Draw_mark(void *);
+static void Draw_destroy(void *);
+static size_t Draw_memsize(const void *);
 static VALUE new_DrawOptions(void);
+static VALUE get_type_metrics(int, VALUE *, VALUE, gvl_function_t);
 
-/** Method that gets type metrics */
+const rb_data_type_t rm_draw_data_type = {
+    "Magick::Draw",
+    { Draw_mark, Draw_destroy, Draw_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
+
+
+DEFINE_GVL_STUB4(BlobToImage, const ImageInfo *, const void *, const size_t, ExceptionInfo *);
+DEFINE_GVL_STUB4(ImageToBlob, const ImageInfo *, Image *, size_t *, ExceptionInfo *);
 #if defined(IMAGEMAGICK_7)
-    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+DEFINE_GVL_STUB3(AnnotateImage, Image *, const DrawInfo *, ExceptionInfo *);
+DEFINE_GVL_STUB3(DrawImage, Image *, const DrawInfo *, ExceptionInfo *);
+DEFINE_GVL_STUB4(GetMultilineTypeMetrics, Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+DEFINE_GVL_STUB4(GetTypeMetrics, Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
 #else
-    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
+DEFINE_GVL_STUB2(AnnotateImage, Image *, const DrawInfo *);
+DEFINE_GVL_STUB2(DrawImage, Image *, const DrawInfo *);
+DEFINE_GVL_STUB3(GetMultilineTypeMetrics, Image *, const DrawInfo *, TypeMetric *);
+DEFINE_GVL_STUB3(GetTypeMetrics, Image *, const DrawInfo *, TypeMetric *);
 #endif
-static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
 
 
 /**
@@ -38,7 +54,7 @@ Draw_affine_eq(VALUE self, VALUE matrix)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Export_AffineMatrix(&draw->info->affine, matrix);
     return matrix;
 }
@@ -56,7 +72,7 @@ Draw_align_eq(VALUE self, VALUE align)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(align, draw->info->align, AlignType);
     return align;
 }
@@ -74,7 +90,7 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(decorate, draw->info->decorate, DecorationType);
     return decorate;
 }
@@ -92,7 +108,7 @@ Draw_density_eq(VALUE self, VALUE density)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     magick_clone_string(&draw->info->density, StringValueCStr(density));
 
     return density;
@@ -111,7 +127,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     magick_clone_string(&draw->info->encoding, StringValueCStr(encoding));
 
     return encoding;
@@ -130,7 +146,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->fill, fill);
     return fill;
 }
@@ -151,7 +167,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->info->fill_pattern != NULL)
     {
@@ -186,7 +202,7 @@ Draw_font_eq(VALUE self, VALUE font)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     magick_clone_string(&draw->info->font, StringValueCStr(font));
 
     return font;
@@ -205,7 +221,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     magick_clone_string(&draw->info->family, StringValueCStr(family));
 
     return family;
@@ -224,7 +240,7 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(stretch, draw->info->stretch, StretchType);
     return stretch;
 }
@@ -242,7 +258,7 @@ Draw_font_style_eq(VALUE self, VALUE style)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(style, draw->info->style, StyleType);
     return style;
 }
@@ -262,7 +278,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
     size_t w;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (FIXNUM_P(weight))
     {
@@ -328,7 +344,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(grav, draw->info->gravity, GravityType);
 
     return grav;
@@ -347,7 +363,7 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->kerning = NUM2DBL(kerning);
     return kerning;
 }
@@ -365,7 +381,7 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->interline_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -383,7 +399,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->interword_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -415,7 +431,8 @@ image_to_str(Image *image)
 
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        blob = ImageToBlob(info, image, &length, exception);
+        GVL_STRUCT_TYPE(ImageToBlob) args = { info, image, &length, exception };
+        blob = (unsigned char *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImageToBlob), &args);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -453,7 +470,8 @@ Image *str_to_image(VALUE str)
 
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), exception);
+        GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), RSTRING_LEN(str), exception };
+        image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -482,7 +500,7 @@ Draw_marshal_dump(VALUE self)
     Draw *draw;
     VALUE ddraw;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     // Raise an exception if the Draw has a non-NULL gradient or element_reference field
     if (draw->info->element_reference.type != UndefinedReference
@@ -541,7 +559,7 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     Draw *draw;
     VALUE val;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->info == NULL)
     {
@@ -613,7 +631,7 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->pointsize = NUM2DBL(pointsize);
     return pointsize;
 }
@@ -633,7 +651,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     AffineMatrix affine, current;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     degrees = NUM2DBL(deg);
     if (fabs(degrees) > DBL_EPSILON)
@@ -669,7 +687,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->stroke, stroke);
     return stroke;
 }
@@ -689,7 +707,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->info->stroke_pattern != NULL)
     {
@@ -725,7 +743,7 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->stroke_width = NUM2DBL(stroke_width);
     return stroke_width;
 }
@@ -743,7 +761,7 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->text_antialias = (MagickBooleanType) RTEST(text_antialias);
     return text_antialias;
 }
@@ -774,7 +792,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->undercolor, undercolor);
     return undercolor;
 }
@@ -817,7 +835,7 @@ VALUE Draw_annotate(
 
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     keep = draw->info->affine;
 
     image_arg = rm_cur_image(image_arg);
@@ -875,10 +893,11 @@ VALUE Draw_annotate(
     magick_clone_string(&draw->info->geometry, geometry_str);
 
 #if defined(IMAGEMAGICK_7)
-    AnnotateImage(image, draw->info, exception);
+    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info, exception };
 #else
-    AnnotateImage(image, draw->info);
+    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info };
 #endif
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnnotateImage), &args);
 
     magick_free(draw->info->text);
     draw->info->text = NULL;
@@ -981,7 +1000,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "unknown composite operator (%d)", cop);
     }
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     // Create a temp copy of the composite image
     rm_write_temp_image(comp_img, name, sizeof(name));
@@ -1026,7 +1045,7 @@ Draw_draw(VALUE self, VALUE image_arg)
     image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     if (draw->primitives == 0)
     {
         rb_raise(rb_eArgError, "nothing to draw");
@@ -1037,10 +1056,11 @@ Draw_draw(VALUE self, VALUE image_arg)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    DrawImage(image, draw->info, exception);
+    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info, exception };
 #else
-    DrawImage(image, draw->info);
+    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info };
 #endif
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DrawImage), &args);
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
@@ -1071,7 +1091,7 @@ Draw_dup(VALUE self)
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
-    dup = Data_Wrap_Struct(CLASS_OF(self), mark_Draw, destroy_Draw, draw);
+    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_draw_data_type, draw);
     RB_GC_GUARD(dup);
 
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
@@ -1101,7 +1121,7 @@ Draw_get_type_metrics(
                      VALUE *argv,
                      VALUE self)
 {
-    return get_type_metrics(argc, argv, self, GetTypeMetrics);
+    return get_type_metrics(argc, argv, self, GVL_FUNC(GetTypeMetrics));
 }
 
 
@@ -1128,7 +1148,7 @@ Draw_get_multiline_type_metrics(
                                VALUE *argv,
                                VALUE self)
 {
-    return get_type_metrics(argc, argv, self, GetMultilineTypeMetrics);
+    return get_type_metrics(argc, argv, self, GVL_FUNC(GetMultilineTypeMetrics));
 }
 
 
@@ -1142,8 +1162,8 @@ VALUE Draw_init_copy(VALUE self, VALUE orig)
 {
     Draw *copy, *original;
 
-    Data_Get_Struct(orig, Draw, original);
-    Data_Get_Struct(self, Draw, copy);
+    TypedData_Get_Struct(orig, Draw, &rm_draw_data_type, original);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, copy);
 
     copy->info = CloneDrawInfo(NULL, original->info);
     if (!copy->info)
@@ -1171,10 +1191,10 @@ Draw_initialize(VALUE self)
     Draw *draw, *draw_options;
     VALUE options;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     options = new_DrawOptions();
-    Data_Get_Struct(options, Draw, draw_options);
+    TypedData_Get_Struct(options, Draw, &rm_draw_data_type, draw_options);
     draw->info = draw_options->info;
     draw_options->info = NULL;
 
@@ -1195,7 +1215,7 @@ Draw_inspect(VALUE self)
 {
     Draw *draw;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     return draw->primitives ? draw->primitives : rb_str_new2("(no primitives defined)");
 }
 
@@ -1212,7 +1232,7 @@ VALUE Draw_alloc(VALUE class)
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
-    draw_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw);
+    draw_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(draw_obj);
 
@@ -1232,7 +1252,7 @@ Draw_primitive(VALUE self, VALUE primitive)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->primitives == (VALUE)0)
     {
@@ -1240,7 +1260,7 @@ Draw_primitive(VALUE self, VALUE primitive)
     }
     else
     {
-        draw->primitives = rb_str_concat(draw->primitives, rb_str_new2("\n"));
+        draw->primitives = rb_str_plus(draw->primitives, rb_str_new2("\n"));
         draw->primitives = rb_str_concat(draw->primitives, primitive);
     }
 
@@ -1256,7 +1276,7 @@ Draw_primitive(VALUE self, VALUE primitive)
  * @param drawptr pointer to a Draw object
  */
 static void
-mark_Draw(void *drawptr)
+Draw_mark(void *drawptr)
 {
     Draw *draw = (Draw *)drawptr;
 
@@ -1275,7 +1295,7 @@ mark_Draw(void *drawptr)
  * @param drawptr pointer to a Draw object
  */
 static void
-destroy_Draw(void *drawptr)
+Draw_destroy(void *drawptr)
 {
     Draw *draw = (Draw *)drawptr;
 
@@ -1299,6 +1319,18 @@ destroy_Draw(void *drawptr)
     xfree(drawptr);
 }
 
+/**
+  * Get Draw object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param infoptr pointer to the Draw object
+  */
+static size_t
+Draw_memsize(const void *drawptr)
+{
+    return sizeof(Draw);
+}
 
 /**
  * Allocate & initialize a DrawOptions object.
@@ -1330,7 +1362,7 @@ DrawOptions_alloc(VALUE class)
 
     draw_options = ALLOC(Draw);
     memset(draw_options, 0, sizeof(Draw));
-    draw_options_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw_options);
+    draw_options_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw_options);
 
     RB_GC_GUARD(draw_options_obj);
 
@@ -1348,7 +1380,7 @@ DrawOptions_initialize(VALUE self)
 {
     Draw *draw_options;
 
-    Data_Get_Struct(self, Draw, draw_options);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw_options);
     draw_options->info = AcquireDrawInfo();
     if (!draw_options->info)
     {
@@ -1389,7 +1421,7 @@ PolaroidOptions_alloc(VALUE class)
     draw->info = CloneDrawInfo(image_info, (DrawInfo *) NULL);
     (void) DestroyImageInfo(image_info);
 
-    polaroid_obj = Data_Wrap_Struct(class, NULL, destroy_Draw, draw);
+    polaroid_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(polaroid_obj);
 
@@ -1411,7 +1443,7 @@ PolaroidOptions_initialize(VALUE self)
     ExceptionInfo *exception;
 
     // Default shadow color
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     exception = AcquireExceptionInfo();
     QueryColorCompliance("gray75", AllCompliance, &draw->shadow_color, exception);
@@ -1455,7 +1487,7 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->shadow_color, shadow);
     return shadow;
 }
@@ -1473,7 +1505,7 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->border_color, border);
     return border;
 }
@@ -1522,6 +1554,9 @@ get_dummy_tm_img(VALUE klass)
 }
 
 
+// aliases for common use of structure types; GetMultilineTypeMetrics, GetTypeMetrics
+typedef GVL_STRUCT_TYPE(GetTypeMetrics) GVL_STRUCT_TYPE(get_type_metrics);
+
 /**
  * Call a get-type-metrics function.
  *
@@ -1539,11 +1574,7 @@ get_dummy_tm_img(VALUE klass)
  * @see Draw_get_multiline_type_metrics
  */
 static VALUE
-get_type_metrics(
-                int argc,
-                VALUE *argv,
-                VALUE self,
-                get_type_metrics_func_t getter)
+get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
 {
     Image *image;
     Draw *draw;
@@ -1551,7 +1582,7 @@ get_type_metrics(
     TypeMetric metrics;
     char *text = NULL;
     long text_l;
-    unsigned int okay;
+    MagickBooleanType okay;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -1560,7 +1591,7 @@ get_type_metrics(
     {
         case 1:                   // use default image
             text = rm_str2cstr(argv[0], &text_l);
-            Data_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, image);
+            TypedData_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, &rm_image_data_type, image);
             break;
         case 2:
             t = rm_cur_image(argv[0]);
@@ -1577,7 +1608,7 @@ get_type_metrics(
         rb_raise(rb_eArgError, "no text to measure");
     }
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
     draw->info->text = InterpretImageProperties(NULL, image, text, exception);
@@ -1601,10 +1632,11 @@ get_type_metrics(
     }
 
 #if defined(IMAGEMAGICK_7)
-    okay = (*getter)(image, draw->info, &metrics, exception);
+    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics, exception };
 #else
-    okay = (*getter)(image, draw->info, &metrics);
+    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };
 #endif
+    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(fp, &args);
 
     magick_free(draw->info->text);
     draw->info->text = NULL;

data/ext/RMagick/rmenum.c

@@ -18,9 +18,15 @@
 
 static VALUE Enum_type_values(VALUE);
 static VALUE Enum_type_inspect(VALUE);
+static void rm_enum_free(void *magick_enum);
+static size_t rm_enum_memsize(const void *magick_enum);
 
-
-
+const rb_data_type_t rm_enum_data_type = {
+    "Magick::Enum",
+    { NULL, rm_enum_free, rm_enum_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
@@ -78,7 +84,7 @@ rm_enum_to_cstr(VALUE enum_type)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(enum_type, MagickEnum, magick_enum);
+    TypedData_Get_Struct(enum_type, MagickEnum, &rm_enum_data_type, magick_enum);
     return rb_id2name(magick_enum->id);
 }
 
@@ -93,6 +99,19 @@ static void rm_enum_free(void *magick_enum)
 {
     xfree(magick_enum);
 }
+
+/**
+  * Get Enum object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param magick_enum the enum
+  */
+ static size_t rm_enum_memsize(const void *magick_enum)
+ {
+     return sizeof(MagickEnum);
+ }
+
 /**
  * Enum class alloc function.
  *
@@ -104,7 +123,7 @@ Enum_alloc(VALUE class)
     MagickEnum *magick_enum;
     VALUE enumr;
 
-    enumr = Data_Make_Struct(class, MagickEnum, NULL, rm_enum_free, magick_enum);
+    enumr = TypedData_Make_Struct(class, MagickEnum, &rm_enum_data_type, magick_enum);
     rb_obj_freeze(enumr);
 
     return enumr;
@@ -124,8 +143,8 @@ Enum_case_eq(VALUE self, VALUE other)
     {
         MagickEnum *this, *that;
 
-        Data_Get_Struct(self, MagickEnum, this);
-        Data_Get_Struct(other, MagickEnum, that);
+        TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
+        TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, that);
         return this->val == that->val ? Qtrue : Qfalse;
     }
 
@@ -145,7 +164,7 @@ Enum_initialize(VALUE self, VALUE sym, VALUE val)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     magick_enum->id = rb_to_id(sym); /* convert symbol to ID */
     magick_enum->val = NUM2INT(val);
 
@@ -163,7 +182,7 @@ Enum_to_i(VALUE self)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     return INT2NUM(magick_enum->val);
 }
 
@@ -183,8 +202,8 @@ Enum_spaceship(VALUE self, VALUE other)
         return Qnil;
     }
 
-    Data_Get_Struct(self, MagickEnum, this);
-    Data_Get_Struct(other, MagickEnum, that);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
+    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, that);
 
     if (this->val > that->val)
     {
@@ -218,9 +237,9 @@ Enum_bitwise_or(VALUE self, VALUE another)
 
     new_enum = Enum_alloc(cls);
 
-    Data_Get_Struct(self, MagickEnum, this);
-    Data_Get_Struct(another, MagickEnum, that);
-    Data_Get_Struct(new_enum, MagickEnum, new_enum_data);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
+    TypedData_Get_Struct(another, MagickEnum, &rm_enum_data_type, that);
+    TypedData_Get_Struct(new_enum, MagickEnum, &rm_enum_data_type, new_enum_data);
 
     new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(this->id), rb_id2name(that->id)));
     new_enum_data->val = this->val | that->val;
@@ -282,7 +301,7 @@ Enum_type_inspect(VALUE self)
     char str[100];
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     snprintf(str, sizeof(str), "%.48s=%d", rb_id2name(magick_enum->id), magick_enum->val);
 
     return rb_str_new2(str);
@@ -359,7 +378,7 @@ Enum_find(VALUE class, int val)
     for (x = 0; x < RARRAY_LEN(enumerators); x++)
     {
         VALUE enumerator = rb_ary_entry(enumerators, x);
-        Data_Get_Struct(enumerator, MagickEnum, magick_enum);
+        TypedData_Get_Struct(enumerator, MagickEnum, &rm_enum_data_type, magick_enum);
         if (magick_enum->val == val)
         {
             return enumerator;