ext/cairo/rb_cairo_matrix.c in cairo-1.17.6 vs ext/cairo/rb_cairo_matrix.c in cairo-1.17.7

@@ -3,11 +3,11 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
  * $Date: 2008-08-14 12:37:50 $
  *
- * Copyright 2006-2008 Kouhei Sutou <[e-mail]>
+ * Copyright 2006-2022 Sutou Kouhei <[e-mail]>
  * Copyright 2005 Øyvind Kolås <[e-mail]>
  * Copyright 2004-2005 MenTaLguY <[e-mail]>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -21,50 +21,53 @@
 
 static ID cr_id_equal;
 
 #define _SELF  (RVAL2CRMATRIX(self))
 
+static const rb_data_type_t cr_matrix_type = {
+  "Cairo::Matrix",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_matrix_t *
 rb_cairo_matrix_from_ruby_object (VALUE obj)
 {
   cairo_matrix_t *matrix;
   if (!rb_cairo__is_kind_of (obj, rb_cCairo_Matrix))
     {
       rb_raise (rb_eTypeError, "not a cairo matrix");
     }
-  Data_Get_Struct (obj, cairo_matrix_t, matrix);
+  TypedData_Get_Struct (obj, cairo_matrix_t, &cr_matrix_type, matrix);
   return matrix;
 }
 
-static void
-cr_matrix_free (void *ptr)
-{
-  if (ptr)
-    {
-      xfree ((cairo_matrix_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_matrix_to_ruby_object (cairo_matrix_t *matrix)
 {
   if (matrix)
     {
       cairo_matrix_t *new_matrix = ALLOC (cairo_matrix_t);
       *new_matrix = *matrix;
-      return Data_Wrap_Struct (rb_cCairo_Matrix, NULL,
-                               cr_matrix_free, new_matrix);
+      return TypedData_Wrap_Struct (rb_cCairo_Matrix,
+                                    &cr_matrix_type,
+                                    new_matrix);
     }
   else
     {
       return Qnil;
     }
 }
 
 static VALUE
 cr_matrix_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_matrix_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_matrix_type, NULL);
 }
 
 static VALUE
 cr_matrix_initialize (VALUE self,
                       VALUE xx, VALUE yx,