rmagick 4.2.2 → 5.4.4

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

@@ -3,15 +3,30 @@
  *
  * Copyright © RMagick Project
  *
- * @file rmkinfo.c
- * @version $Id: rmkinfo.c,v 1.0 2011/11/29 15:33:14 naquad Exp $
+ * @file rmkinfo.cpp
+ * @version $Id: rmkinfo.cpp,v 1.0 2011/11/29 15:33:14 naquad Exp $
  * @author Naquad
  ****************************************************************************/
 
 #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,
+};
+
+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,15 +40,28 @@ 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.
  *
  * @return [Magick::KernelInfo] a new KernelInfo object
  */
 VALUE
-KernelInfo_alloc(VALUE class)
+KernelInfo_alloc(VALUE klass)
 {
-    return Data_Wrap_Struct(class, NULL, rm_kernel_info_destroy, NULL);
+    return TypedData_Wrap_Struct(klass, &rm_kernel_info_data_type, NULL);
 }
 
 /**
@@ -89,10 +117,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 +144,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 +159,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 +173,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 +219,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);
 }