cairo 1.17.6 → 1.17.7

data/ext/cairo/rb_cairo_pattern.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-06-12 10:59:54 $
  *
- * Copyright 2012-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2012-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -133,6 +133,23 @@ cr_pattern_raster_source_supported_p (VALUE klass)
 #endif
 }
 
+static void
+cr_pattern_free (void *ptr)
+{
+  cairo_pattern_destroy ((cairo_pattern_t *) ptr);
+}
+
+static const rb_data_type_t cr_pattern_type = {
+  "Cairo::Pattern",
+  {
+    NULL,
+    cr_pattern_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_pattern_t *
 rb_cairo_pattern_from_ruby_object (VALUE obj)
 {
@@ -141,19 +158,10 @@ rb_cairo_pattern_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo pattern");
     }
-  Data_Get_Struct (obj, cairo_pattern_t, pattern);
+  TypedData_Get_Struct (obj, cairo_pattern_t, &cr_pattern_type, pattern);
   return pattern;
 }
 
-static void
-cr_pattern_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_pattern_destroy ((cairo_pattern_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_pattern_to_ruby_object (cairo_pattern_t *pattern)
 {
@@ -162,7 +170,7 @@ rb_cairo_pattern_to_ruby_object (cairo_pattern_t *pattern)
       VALUE klass;
       klass = cr_pattern_get_klass (pattern);
       cairo_pattern_reference (pattern);
-      return Data_Wrap_Struct (klass, NULL, cr_pattern_free, pattern);
+      return TypedData_Wrap_Struct (klass, &cr_pattern_type, pattern);
     }
   else
     {
@@ -173,7 +181,7 @@ rb_cairo_pattern_to_ruby_object (cairo_pattern_t *pattern)
 static VALUE
 cr_pattern_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_pattern_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_pattern_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_rectangle.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -15,10 +15,21 @@ VALUE rb_cCairo_Rectangle;
 #define _SELF  ((cairo_rectangle_int_t *)DATA_PTR (self))
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
+static const rb_data_type_t cr_rectangle_type = {
+  "Cairo::Rectangle",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 cr_rectangle_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, xfree, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_rectangle_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_region.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2010-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -18,6 +18,23 @@ VALUE rb_cCairo_Region = Qnil;
 
 #define _SELF  (RVAL2CRREGION(self))
 
+static void
+cr_region_free (void *ptr)
+{
+  cairo_region_destroy ((cairo_region_t *) ptr);
+}
+
+static const rb_data_type_t cr_region_type = {
+  "Cairo::Region",
+  {
+    NULL,
+    cr_region_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static inline void
 cr_region_check_status (cairo_region_t *region)
 {
@@ -32,26 +49,17 @@ rb_cairo_region_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo region");
     }
-  Data_Get_Struct (obj, cairo_region_t, region);
+  TypedData_Get_Struct (obj, cairo_region_t, &cr_region_type, region);
   return region;
 }
 
-static void
-cr_region_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_region_destroy ((cairo_region_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_region_to_ruby_object (cairo_region_t *region)
 {
   if (region)
     {
       cairo_region_reference (region);
-      return Data_Wrap_Struct (rb_cCairo_Region, NULL, cr_region_free, region);
+      return TypedData_Wrap_Struct (rb_cCairo_Region, &cr_region_type, region);
     }
   else
     {
@@ -62,7 +70,7 @@ rb_cairo_region_to_ruby_object (cairo_region_t *region)
 static VALUE
 cr_region_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_region_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_region_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_scaled_font.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -19,6 +19,23 @@ VALUE rb_cCairo_ScaledFont;
 
 #define _SELF(self)  (RVAL2CRSCALEDFONT(self))
 
+static void
+cr_scaled_font_free (void *ptr)
+{
+  cairo_scaled_font_destroy ((cairo_scaled_font_t *) ptr);
+}
+
+static const rb_data_type_t cr_scaled_font_type = {
+  "Cairo::ScaledFont",
+  {
+    NULL,
+    cr_scaled_font_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static inline void
 cr_scaled_font_check_status (cairo_scaled_font_t *font)
 {
@@ -33,27 +50,19 @@ rb_cairo_scaled_font_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo scaled font");
     }
-  Data_Get_Struct (obj, cairo_scaled_font_t, font);
+  TypedData_Get_Struct (obj, cairo_scaled_font_t, &cr_scaled_font_type, font);
   return font;
 }
 
-static void
-cr_scaled_font_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_scaled_font_destroy ((cairo_scaled_font_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_scaled_font_to_ruby_object (cairo_scaled_font_t *font)
 {
   if (font)
     {
       cairo_scaled_font_reference (font);
-      return Data_Wrap_Struct (rb_cCairo_ScaledFont, NULL,
-                               cr_scaled_font_free, font);
+      return TypedData_Wrap_Struct (rb_cCairo_ScaledFont,
+                                    &cr_scaled_font_type,
+                                    font);
     }
   else
     {
@@ -64,7 +73,7 @@ rb_cairo_scaled_font_to_ruby_object (cairo_scaled_font_t *font)
 static VALUE
 cr_scaled_font_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_scaled_font_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_scaled_font_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_surface.c

@@ -103,6 +103,18 @@ static cairo_user_data_key_t cr_finished_key;
 
 #define _SELF  (RVAL2CRSURFACE(self))
 
+static void cr_surface_free (void *ptr);
+static const rb_data_type_t cr_surface_type = {
+  "Cairo::Surface",
+  {
+    NULL,
+    cr_surface_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 cr_paper_parse (VALUE paper_description)
 {
@@ -240,7 +252,7 @@ rb_cairo_surface_from_ruby_object_without_null_check (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo surface");
     }
-  Data_Get_Struct (obj, cairo_surface_t, surface);
+  TypedData_Get_Struct (obj, cairo_surface_t, &cr_surface_type, surface);
   return surface;
 }
 
@@ -461,7 +473,7 @@ rb_cairo_surface_to_ruby_object (cairo_surface_t *surface)
       klass = cr_surface_get_klass (surface);
       cairo_surface_reference (surface);
       rb_cairo_surface_adjust_memory_usage (surface, CR_TRUE);
-      return Data_Wrap_Struct (klass, NULL, cr_surface_free, surface);
+      return TypedData_Wrap_Struct (klass, &cr_surface_type, surface);
     }
   else
     {
@@ -484,7 +496,7 @@ rb_cairo_surface_to_ruby_object_with_destroy (cairo_surface_t *surface)
 static VALUE
 cr_surface_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_surface_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_surface_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_text_cluster.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-16 08:16:40 $
  *
- * Copyright 2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2008-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -20,6 +20,17 @@ VALUE rb_cCairo_TextCluster = Qnil;
 #if CAIRO_CHECK_VERSION(1, 7, 2)
 #define _SELF(self)  (RVAL2CRTEXTCLUSTER(self))
 
+static const rb_data_type_t cr_text_cluster_type = {
+  "Cairo::TextCluster",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_text_cluster_t *
 rb_cairo_text_cluster_from_ruby_object (VALUE obj)
 {
@@ -29,19 +40,13 @@ rb_cairo_text_cluster_from_ruby_object (VALUE obj)
       rb_raise (rb_eTypeError,
                 "not a cairo cluster: %s", rb_cairo__inspect (obj));
     }
-  Data_Get_Struct (obj, cairo_text_cluster_t, cluster);
+  TypedData_Get_Struct (obj,
+                        cairo_text_cluster_t,
+                        &cr_text_cluster_type,
+                        cluster);
   return cluster;
 }
 
-static void
-cr_text_cluster_free (void *ptr)
-{
-  if (ptr)
-    {
-      xfree (ptr);
-    }
-}
-
 VALUE
 rb_cairo_text_cluster_to_ruby_object (cairo_text_cluster_t *cluster)
 {
@@ -51,8 +56,9 @@ rb_cairo_text_cluster_to_ruby_object (cairo_text_cluster_t *cluster)
 
       new_cluster = ALLOC (cairo_text_cluster_t);
       *new_cluster = *cluster;
-      return Data_Wrap_Struct (rb_cCairo_TextCluster, NULL,
-                               cr_text_cluster_free, new_cluster);
+      return TypedData_Wrap_Struct (rb_cCairo_TextCluster,
+                                    &cr_text_cluster_type,
+                                    new_cluster);
     }
   else
     {
@@ -63,7 +69,7 @@ rb_cairo_text_cluster_to_ruby_object (cairo_text_cluster_t *cluster)
 static VALUE
 cr_text_cluster_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_text_cluster_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_text_cluster_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_text_extents.c

@@ -5,6 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 05:41:28 $
  *
+ * Copyright 2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -19,6 +20,17 @@ VALUE rb_cCairo_TextExtents;
 
 #define _SELF(self)  (RVAL2CRTEXTEXTENTS(self))
 
+static const rb_data_type_t cr_text_extents_type = {
+  "Cairo::TextExtents",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_text_extents_t *
 rb_cairo_text_extents_from_ruby_object (VALUE obj)
 {
@@ -27,7 +39,10 @@ rb_cairo_text_extents_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo text_extents");
     }
-  Data_Get_Struct (obj, cairo_text_extents_t, extents);
+  TypedData_Get_Struct (obj,
+                        cairo_text_extents_t,
+                        &cr_text_extents_type,
+                        extents);
   return extents;
 }
 
@@ -38,7 +53,9 @@ rb_cairo_text_extents_to_ruby_object (cairo_text_extents_t *extents)
     {
       cairo_text_extents_t *new_extents = ALLOC (cairo_text_extents_t);
       *new_extents = *extents;
-      return Data_Wrap_Struct (rb_cCairo_TextExtents, NULL, -1, new_extents);
+      return TypedData_Wrap_Struct (rb_cCairo_TextExtents,
+                                    &cr_text_extents_type,
+                                    new_extents);
     }
   else
     {
@@ -49,7 +66,7 @@ rb_cairo_text_extents_to_ruby_object (cairo_text_extents_t *extents)
 static VALUE
 cr_text_extents_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, -1, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_text_extents_type, NULL);
 }
 
 static VALUE