rmagick 4.3.0 → 5.1.0

data/ext/RMagick/rmkinfo.c

@@ -10,8 +10,28 @@
 
 #include "rmagick.h"
 
+static void rm_kernel_info_destroy(void *kernel);
+static size_t rm_kernel_info_memsize(const void *ptr);
+
+const rb_data_type_t rm_kernel_info_data_type = {
+    "Magick::KernelInfo",
+    { NULL, rm_kernel_info_destroy, rm_kernel_info_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
+
+/* UnityAddKernelInfo() was private function until IM 6.9 */
+MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
+/* ScaleKernelInfo() was private function until IM 6.9 */
+MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
+
+DEFINE_GVL_VOID_STUB2(UnityAddKernelInfo, KernelInfo *, const double);
+DEFINE_GVL_VOID_STUB3(ScaleKernelInfo, KernelInfo *, const double, const GeometryFlags);
+DEFINE_GVL_VOID_STUB2(ScaleGeometryKernelInfo, KernelInfo *, const char *);
+
+
 /**
- * If there's a kernel info, delete it before destroying the KernelInfo 
+ * If there's a kernel info, delete it before destroying the KernelInfo
  *
  * No Ruby usage (internal function)
  *
@@ -25,6 +45,19 @@ rm_kernel_info_destroy(void *kernel)
       DestroyKernelInfo((KernelInfo*)kernel);
 }
 
+/**
+  * Get KernelInfo object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the KernelInfo object
+  */
+static size_t
+rm_kernel_info_memsize(const void *ptr)
+{
+    return sizeof(KernelInfo);
+}
+
 /**
  * Create a KernelInfo object.
  *
@@ -33,7 +66,7 @@ rm_kernel_info_destroy(void *kernel)
 VALUE
 KernelInfo_alloc(VALUE class)
 {
-    return Data_Wrap_Struct(class, NULL, rm_kernel_info_destroy, NULL);
+    return TypedData_Wrap_Struct(class, &rm_kernel_info_data_type, NULL);
 }
 
 /**
@@ -89,10 +122,8 @@ KernelInfo_unity_add(VALUE self, VALUE scale)
     if (!FIXNUM_P(scale))
         Check_Type(scale, T_FLOAT);
 
-    /* UnityAddKernelInfo() was private function until IM 6.9 */
-    MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
-
-    UnityAddKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale));
+    GVL_STRUCT_TYPE(UnityAddKernelInfo) args = { (KernelInfo*)DATA_PTR(self), NUM2DBL(scale) };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(UnityAddKernelInfo), &args);
     return Qnil;
 }
 
@@ -118,10 +149,8 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
     else
         rb_raise(rb_eArgError, "expected Integer or Magick::GeometryFlags to specify flags");
 
-    /* ScaleKernelInfo() was private function until IM 6.9 */
-    MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
-
-    ScaleKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale), geoflags);
+    GVL_STRUCT_TYPE(ScaleKernelInfo) args = { (KernelInfo*)DATA_PTR(self), NUM2DBL(scale), geoflags };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleKernelInfo), &args);
     return Qnil;
 }
 
@@ -135,7 +164,8 @@ VALUE
 KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 {
     Check_Type(geometry, T_STRING);
-    ScaleGeometryKernelInfo((KernelInfo*)DATA_PTR(self), StringValueCStr(geometry));
+    GVL_STRUCT_TYPE(ScaleGeometryKernelInfo) args = { (KernelInfo*)DATA_PTR(self), StringValueCStr(geometry) };
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleGeometryKernelInfo), &args);
     return Qnil;
 }
 
@@ -148,7 +178,7 @@ VALUE
 KernelInfo_clone(VALUE self)
 {
     KernelInfo *kernel = CloneKernelInfo((KernelInfo*)DATA_PTR(self));
-    return Data_Wrap_Struct(Class_KernelInfo, NULL, rm_kernel_info_destroy, kernel);
+    return TypedData_Wrap_Struct(Class_KernelInfo, &rm_kernel_info_data_type, kernel);
 }
 
 /**
@@ -194,5 +224,5 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
         rb_raise(rb_eRuntimeError, "failed to acquire builtin kernel");
     }
 
-    return Data_Wrap_Struct(self, NULL, rm_kernel_info_destroy, kernel);
+    return TypedData_Wrap_Struct(self, &rm_kernel_info_data_type, kernel);
 }

data/ext/RMagick/rmmain.c

@@ -234,6 +234,10 @@ static void set_managed_memory(void)
 void
 Init_RMagick2(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     Module_Magick = rb_define_module("Magick");
 
     set_managed_memory();
@@ -242,13 +246,10 @@ Init_RMagick2(void)
 
     test_Magick_version();
 
-    rm_main_thread_id = rm_current_thread_id();
-
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
 
-    rm_ID_trace_proc       = rb_intern("@trace_proc");
     rm_ID_call             = rb_intern("call");
     rm_ID_changed          = rb_intern("changed");
     rm_ID_cur_image        = rb_intern("cur_image");
@@ -358,7 +359,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "matte_color=", Image_matte_color_eq, 1);
     rb_define_method(Class_Image, "mean_error_per_pixel", Image_mean_error_per_pixel, 0);
     rb_define_method(Class_Image, "mime_type", Image_mime_type, 0);
-    rb_define_method(Class_Image, "monitor=", Image_monitor_eq, 1);
     rb_define_method(Class_Image, "montage", Image_montage, 0);
     rb_define_method(Class_Image, "normalized_mean_error", Image_normalized_mean_error, 0);
     rb_define_method(Class_Image, "normalized_maximum_error", Image_normalized_maximum_error, 0);
@@ -620,7 +620,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "write", Image_write, 1);
 
     /*-----------------------------------------------------------------------*/
-    /* Class Magick::ImageList methods (see also RMagick.rb)                 */
+    /* Class Magick::ImageList methods                                       */
     /*-----------------------------------------------------------------------*/
 
     Class_ImageList = rb_define_class_under(Module_Magick, "ImageList", rb_cObject);
@@ -735,8 +735,7 @@ Init_RMagick2(void)
     // include Comparable
     rb_include_module(Class_Pixel, rb_mComparable);
 
-    // Magick::Pixel has 4 constructors: "new" "from_color", "from_hsla",
-    // and the deprecated "from_HSL".
+    // Magick::Pixel has 3 constructors: "new" "from_color", "from_hsla"
     rb_define_alloc_func(Class_Pixel, Pixel_alloc);
     rb_define_singleton_method(Class_Pixel, "from_color", Pixel_from_color, 1);
     rb_define_singleton_method(Class_Pixel, "from_hsla", Pixel_from_hsla, -1);
@@ -878,7 +877,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Info, "label=", Info_label_eq, 1);
     rb_define_method(Class_Info, "matte_color", Info_matte_color, 0);
     rb_define_method(Class_Info, "matte_color=", Info_matte_color_eq, 1);
-    rb_define_method(Class_Info, "monitor=", Info_monitor_eq, 1);
     rb_define_method(Class_Info, "monochrome", Info_monochrome, 0);
     rb_define_method(Class_Info, "monochrome=", Info_monochrome_eq, 1);
     rb_define_method(Class_Info, "number_scenes", Info_number_scenes, 0);
@@ -1852,7 +1850,7 @@ Init_RMagick2(void)
  *
  * Notes:
  *   - Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST to
- *     'true' at the top level, before requiring 'RMagick'
+ *     'true' at the top level, before requiring 'rmagick'
  */
 static void
 test_Magick_version(void)

data/ext/RMagick/rmmontage.c

@@ -12,8 +12,15 @@
 
 #include "rmagick.h"
 
+static void Montage_destroy(void *obj);
+static size_t Montage_memsize(const void *obj);
 
-
+const rb_data_type_t rm_montage_data_type = {
+    "Magick::ImageList::Montage",
+    { NULL, Montage_destroy, Montage_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
@@ -28,7 +35,7 @@
  * @param obj the montage object
  */
 static void
-destroy_Montage(void *obj)
+Montage_destroy(void *obj)
 {
     Montage *montage = obj;
 
@@ -48,6 +55,20 @@ destroy_Montage(void *obj)
 }
 
 
+/**
+  * Get Montage object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the Montage object
+  */
+static size_t
+Montage_memsize(const void *ptr)
+{
+    return sizeof(Montage);
+}
+
+
 /**
  * Create a new Montage object.
  *
@@ -79,7 +100,7 @@ Montage_alloc(VALUE class)
     montage = ALLOC(Montage);
     montage->info = montage_info;
     montage->compose = OverCompositeOp;
-    montage_obj = Data_Wrap_Struct(class, NULL, destroy_Montage, montage);
+    montage_obj = TypedData_Wrap_Struct(class, &rm_montage_data_type, montage);
 
     RB_GC_GUARD(montage_obj);
 
@@ -98,7 +119,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     Color_to_PixelColor(&montage->info->background_color, color);
     return color;
 }
@@ -115,7 +136,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     Color_to_PixelColor(&montage->info->border_color, color);
     return color;
 }
@@ -132,7 +153,7 @@ Montage_border_width_eq(VALUE self, VALUE width)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     montage->info->border_width = NUM2ULONG(width);
     return width;
 }
@@ -149,7 +170,7 @@ Montage_compose_eq(VALUE self, VALUE compose)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     VALUE_TO_ENUM(compose, montage->compose, CompositeOperator);
     return compose;
 }
@@ -166,7 +187,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     strlcpy(montage->info->filename, StringValueCStr(filename), sizeof(montage->info->filename));
     return filename;
 }
@@ -183,7 +204,7 @@ Montage_fill_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     Color_to_PixelColor(&montage->info->fill, color);
     return color;
 }
@@ -200,7 +221,7 @@ Montage_font_eq(VALUE self, VALUE font)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     magick_clone_string(&montage->info->font, StringValueCStr(font));
 
     return font;
@@ -223,7 +244,7 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
     Montage *montage;
     VALUE frame;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     frame = rb_String(frame_arg);
     magick_clone_string(&montage->info->frame, StringValueCStr(frame));
 
@@ -250,7 +271,7 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
     Montage *montage;
     VALUE geometry;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     geometry = rb_String(geometry_arg);
     magick_clone_string(&montage->info->geometry, StringValueCStr(geometry));
 
@@ -271,7 +292,7 @@ Montage_gravity_eq(VALUE self, VALUE gravity)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     VALUE_TO_ENUM(gravity, montage->info->gravity, GravityType);
     return gravity;
 }
@@ -301,7 +322,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     Color_to_PixelColor(&montage->info->matte_color, color);
     return color;
 }
@@ -318,7 +339,7 @@ Montage_pointsize_eq(VALUE self, VALUE size)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     montage->info->pointsize = NUM2DBL(size);
     return size;
 }
@@ -335,7 +356,7 @@ Montage_shadow_eq(VALUE self, VALUE shadow)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     montage->info->shadow = (MagickBooleanType) RTEST(shadow);
     return shadow;
 }
@@ -352,7 +373,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     Color_to_PixelColor(&montage->info->stroke, color);
     return color;
 }
@@ -372,7 +393,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     Image *texture_image;
     char temp_name[MaxTextExtent];
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
 
     // If we had a previously defined temp texture image,
     // remove it now in preparation for this new one.
@@ -411,7 +432,7 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
     Montage *montage;
     VALUE tile;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     tile = rb_String(tile_arg);
     magick_clone_string(&montage->info->tile, StringValueCStr(tile));
 
@@ -432,7 +453,7 @@ Montage_title_eq(VALUE self, VALUE title)
 {
     Montage *montage;
 
-    Data_Get_Struct(self, Montage, montage);
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
     magick_clone_string(&montage->info->title, StringValueCStr(title));
     return title;
 }