cairo 1.17.6 → 1.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1853ada5ca7f86bebe04e05e51c0b49a84fb7782bb2156db4d1825f75cc415
-  data.tar.gz: 326f5322f9e2b66e115d656a762384e5caaa18ecba44c576a805c5989278d330
+  metadata.gz: f5ac730747ea5dada591e534a7c0653a0d1ad3fa3962dfdd01173e0074ff835c
+  data.tar.gz: 2fbccb304f8b4dbd3a89df42c9f1779b45a84b2f4c9be5ab591992eb9d7c3d31
 SHA512:
-  metadata.gz: db4171dfe178c24f632f38fcbbd1960412160dd999bdd925b6501c663641a308acab2bd6fa2f9a84b3e18c30821ce3f6514b7dac809fd2b965f25c79051f66bd
-  data.tar.gz: d9ef0bedc2b597617415c88d3734a4fe33a38bffc7a49939d671e4eed88f0da07f741fad595315376a76504dca36f35186563945a124d43510338ecd16970337
+  metadata.gz: 389eeca0e8c453e3c1b2ebe10053a1713c1c1ae93b22e46100b5bc1c39d566f00f60a1c676ae288e06fa9fdea6f24db8e107d53355bd52bc0e067e5b8b4fe073
+  data.tar.gz: d107b587d530433a0288f73a5b8d85710e2923213347f88e09de92562645dbcd9e501f8f9ab1bd74bb9ae13559ee94999e94c7555cd96a345b9d1d75965b961c

data/NEWS

@@ -1,3 +1,12 @@
+Release 1.17.7 (2022-07-31) Sutou Kouhei <kou@cozmixng.org>
+===========================================================
+
+Fixes
+-----
+
+  * Fixed a bug that Cairo::UserFontFace#on_render_color_glyph isn't
+    called.
+
 Release 1.17.6 (2022-07-30) Sutou Kouhei <kou@cozmixng.org>
 ===========================================================
 

data/ext/cairo/rb_cairo.h

@@ -65,7 +65,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 17
-#define RB_CAIRO_VERSION_MICRO 6
+#define RB_CAIRO_VERSION_MICRO 7
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -40,6 +40,23 @@ cr_check_status (cairo_t *context)
   rb_cairo_check_status (cairo_status (context));
 }
 
+static void
+cr_context_free (void *ptr)
+{
+  cairo_destroy ((cairo_t *) ptr);
+}
+
+static const rb_data_type_t cr_context_type = {
+  "Cairo::Context",
+  {
+    NULL,
+    cr_context_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /* Functions for manipulating state objects */
 cairo_t *
 rb_cairo_context_from_ruby_object (VALUE obj)
@@ -49,7 +66,7 @@ rb_cairo_context_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo graphics context");
     }
-  Data_Get_Struct (obj, cairo_t, context);
+  TypedData_Get_Struct (obj, cairo_t, &cr_context_type, context);
   if (!context)
     rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
   return context;
@@ -67,22 +84,13 @@ cr_object_holder_free (void *ptr)
   rb_cairo__object_holder_free (rb_cCairo_Context, ptr);
 }
 
-static void
-cr_context_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_destroy ((cairo_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_context_to_ruby_object (cairo_t *cr)
 {
   if (cr)
     {
       cairo_reference (cr);
-      return Data_Wrap_Struct (rb_cCairo_Context, NULL, cr_context_free, cr);
+      return TypedData_Wrap_Struct (rb_cCairo_Context, &cr_context_type, cr);
     }
   else
     {
@@ -93,7 +101,7 @@ rb_cairo_context_to_ruby_object (cairo_t *cr)
 static VALUE
 cr_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_context_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_context_type, NULL);
 }
 
 static void
@@ -1595,20 +1603,26 @@ static VALUE
 cr_copy_path (VALUE self)
 {
   cairo_path_t *path;
+  VALUE rb_path;
 
   path = cairo_copy_path (_SELF);
   rb_cairo_check_status (path->status);
-  return CRPATH2RVAL (path);
+  rb_path = CRPATH2RVAL (path);
+  cairo_path_destroy (path);
+  return rb_path;
 }
 
 static VALUE
 cr_copy_path_flat (VALUE self)
 {
   cairo_path_t *path;
+  VALUE rb_path;
 
-  path =  cairo_copy_path_flat (_SELF);
+  path = cairo_copy_path_flat (_SELF);
   rb_cairo_check_status (path->status);
-  return CRPATH2RVAL (path);
+  rb_path = CRPATH2RVAL (path);
+  cairo_path_destroy (path);
+  return rb_path;
 }
 
 static VALUE

data/ext/cairo/rb_cairo_device.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2010-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2010-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -117,6 +117,24 @@ cr_device_xml_supported_p (VALUE klass)
 }
 
 /* constructor/de-constructor */
+static void
+cr_device_free (void *ptr)
+{
+  cairo_device_t *device = ptr;
+  cairo_device_destroy (device);
+}
+
+static const rb_data_type_t cr_device_type = {
+  "Cairo::Device",
+  {
+    NULL,
+    cr_device_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_device_t *
 rb_cairo_device_from_ruby_object (VALUE obj)
 {
@@ -125,7 +143,7 @@ rb_cairo_device_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo device");
     }
-  Data_Get_Struct (obj, cairo_device_t, device);
+  TypedData_Get_Struct (obj, cairo_device_t, &cr_device_type, device);
   if (!device)
     rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
   return device;
@@ -145,15 +163,6 @@ cr_object_holder_free (void *ptr)
 }
 #endif
 
-static void
-cr_device_free (void *ptr)
-{
-  cairo_device_t *device = ptr;
-
-  if (device)
-    cairo_device_destroy (device);
-}
-
 VALUE
 rb_cairo_device_to_ruby_object (cairo_device_t *device)
 {
@@ -162,7 +171,7 @@ rb_cairo_device_to_ruby_object (cairo_device_t *device)
       VALUE klass;
       klass = cr_device_get_klass (device);
       cairo_device_reference (device);
-      return Data_Wrap_Struct (klass, NULL, cr_device_free, device);
+      return TypedData_Wrap_Struct (klass, &cr_device_type, device);
     }
   else
     {
@@ -185,7 +194,7 @@ rb_cairo_device_to_ruby_object_with_destroy (cairo_device_t *device)
 static VALUE
 cr_device_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_device_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_device_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_font_extents.c

@@ -5,6 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 05:12:37 $
  *
+ * Copyright 2005-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_FontExtents;
 
 #define _SELF(self)  (RVAL2CRFONTEXTENTS(self))
 
+static const rb_data_type_t cr_font_extents_type = {
+  "Cairo::FontExtents",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_font_extents_t *
 rb_cairo_font_extents_from_ruby_object (VALUE obj)
 {
@@ -27,7 +39,10 @@ rb_cairo_font_extents_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo font extents");
     }
-  Data_Get_Struct (obj, cairo_font_extents_t, extents);
+  TypedData_Get_Struct (obj,
+                        cairo_font_extents_t,
+                        &cr_font_extents_type,
+                        extents);
   return extents;
 }
 
@@ -38,7 +53,9 @@ rb_cairo_font_extents_to_ruby_object (cairo_font_extents_t *extents)
     {
       cairo_font_extents_t *new_extents = ALLOC (cairo_font_extents_t);
       *new_extents = *extents;
-      return Data_Wrap_Struct (rb_cCairo_FontExtents, NULL, -1, new_extents);
+      return TypedData_Wrap_Struct (rb_cCairo_FontExtents,
+                                    &cr_font_extents_type,
+                                    new_extents);
     }
   else
     {
@@ -49,7 +66,7 @@ rb_cairo_font_extents_to_ruby_object (cairo_font_extents_t *extents)
 static VALUE
 cr_font_extents_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, -1, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_font_extents_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_font_face.c

@@ -55,6 +55,24 @@ static ID cr_id_at_need_cluster_flags;
 
 #define _SELF  (RVAL2CRFONTFACE(self))
 
+static void
+cr_font_face_free (void *ptr)
+{
+  cairo_font_face_t *face = ptr;
+  cairo_font_face_destroy (face);
+}
+
+static const rb_data_type_t cr_font_face_type = {
+  "Cairo::FontFace",
+  {
+    NULL,
+    cr_font_face_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static inline void
 cr_font_face_check_status (cairo_font_face_t *face)
 {
@@ -72,23 +90,13 @@ rb_cairo_font_face_from_ruby_object (VALUE obj)
                 "not a cairo font face: %s",
                 rb_cairo__inspect (obj));
     }
-  Data_Get_Struct (obj, cairo_font_face_t, face);
+  TypedData_Get_Struct (obj, cairo_font_face_t, &cr_font_face_type, face);
   if (!face)
     rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
   cr_font_face_check_status (face);
   return face;
 }
 
-static void
-cr_font_face_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_font_face_t *face = ptr;
-      cairo_font_face_destroy (face);
-    }
-}
-
 VALUE
 rb_cairo_font_face_to_ruby_object (cairo_font_face_t *face)
 {
@@ -116,7 +124,7 @@ rb_cairo_font_face_to_ruby_object (cairo_font_face_t *face)
           break;
         }
       cairo_font_face_reference (face);
-      return Data_Wrap_Struct (klass, NULL, cr_font_face_free, face);
+      return TypedData_Wrap_Struct (klass, &cr_font_face_type, face);
     }
   else
     {
@@ -127,7 +135,7 @@ rb_cairo_font_face_to_ruby_object (cairo_font_face_t *face)
 static VALUE
 cr_font_face_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_font_face_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_font_face_type, NULL);
 }
 
 static VALUE
@@ -480,7 +488,7 @@ cr_user_font_face_render_glyph_func_internal (cairo_scaled_font_t *scaled_font,
 
   face = cairo_scaled_font_get_font_face (scaled_font);
   self = (VALUE)cairo_font_face_get_user_data (face, &ruby_object_key);
-  receiver = rb_ivar_get (self, cr_id_render_glyph);
+  receiver = rb_ivar_get (self, id_registered_method_name);
   if (NIL_P (receiver) &&
       rb_obj_respond_to (self, id_registered_method_name, Qtrue))
     {

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2021 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -18,6 +18,23 @@
 
 VALUE rb_cCairo_FontOptions;
 
+static void
+cr_options_free (void *ptr)
+{
+  cairo_font_options_destroy ((cairo_font_options_t *) ptr);
+}
+
+static const rb_data_type_t cr_font_options_type = {
+  "Cairo::FontOptions",
+  {
+    NULL,
+    cr_options_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static inline void
 cr_options_check_status (cairo_font_options_t *options)
 {
@@ -32,19 +49,13 @@ rb_cairo_font_options_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo font options");
     }
-  Data_Get_Struct (obj, cairo_font_options_t, options);
+  TypedData_Get_Struct (obj,
+                        cairo_font_options_t,
+                        &cr_font_options_type,
+                        options);
   return options;
 }
 
-static void
-cr_options_free (void *ptr)
-{
-  if (ptr)
-    {
-      cairo_font_options_destroy ((cairo_font_options_t *) ptr);
-    }
-}
-
 VALUE
 rb_cairo_font_options_to_ruby_object (cairo_font_options_t *options)
 {
@@ -53,8 +64,9 @@ rb_cairo_font_options_to_ruby_object (cairo_font_options_t *options)
       cairo_font_options_t *copied_options;
       copied_options = cairo_font_options_copy (options);
       cr_options_check_status (copied_options);
-      return Data_Wrap_Struct (rb_cCairo_FontOptions, NULL,
-                               cr_options_free, copied_options);
+      return TypedData_Wrap_Struct (rb_cCairo_FontOptions,
+                                    &cr_font_options_type,
+                                    copied_options);
     }
   else
     {
@@ -65,7 +77,7 @@ rb_cairo_font_options_to_ruby_object (cairo_font_options_t *options)
 static VALUE
 cr_options_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_options_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_font_options_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_glyph.c

@@ -5,6 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-16 08:16:39 $
  *
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -20,6 +21,17 @@ VALUE rb_cCairo_Glyph;
 
 #define _SELF(self)  (RVAL2CRGLYPH(self))
 
+static const rb_data_type_t cr_glyph_type = {
+  "Cairo::Glyph",
+  {
+    NULL,
+    ruby_xfree,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_glyph_t *
 rb_cairo_glyph_from_ruby_object (VALUE obj)
 {
@@ -28,19 +40,10 @@ rb_cairo_glyph_from_ruby_object (VALUE obj)
     {
       rb_raise (rb_eTypeError, "not a cairo glyph");
     }
-  Data_Get_Struct (obj, cairo_glyph_t, glyph);
+  TypedData_Get_Struct (obj, cairo_glyph_t, &cr_glyph_type, glyph);
   return glyph;
 }
 
-static void
-cr_glyph_free (void *ptr)
-{
-  if (ptr)
-    {
-      xfree (ptr);
-    }
-}
-
 VALUE
 rb_cairo_glyph_to_ruby_object (cairo_glyph_t *glyph)
 {
@@ -50,7 +53,7 @@ rb_cairo_glyph_to_ruby_object (cairo_glyph_t *glyph)
 
       new_glyph = ALLOC (cairo_glyph_t);
       *new_glyph = *glyph;
-      return Data_Wrap_Struct (rb_cCairo_Glyph, NULL, cr_glyph_free, new_glyph);
+      return TypedData_Wrap_Struct (rb_cCairo_Glyph, &cr_glyph_type, new_glyph);
     }
   else
     {
@@ -61,7 +64,7 @@ rb_cairo_glyph_to_ruby_object (cairo_glyph_t *glyph)
 static VALUE
 cr_glyph_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_glyph_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_glyph_type, NULL);
 }
 
 static VALUE

data/ext/cairo/rb_cairo_matrix.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-14 12:37:50 $
  *
- * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -23,6 +23,17 @@ 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)
 {
@@ -31,19 +42,10 @@ rb_cairo_matrix_from_ruby_object (VALUE obj)
     {
       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)
 {
@@ -51,8 +53,9 @@ rb_cairo_matrix_to_ruby_object (cairo_matrix_t *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
     {
@@ -63,7 +66,7 @@ rb_cairo_matrix_to_ruby_object (cairo_matrix_t *matrix)
 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

data/ext/cairo/rb_cairo_path.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-04-04 03:52:31 $
  *
- * Copyright 2005 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -223,54 +223,34 @@ cr_path_close_path_initialize (VALUE self)
 static void
 cr_path_free (void *ptr)
 {
-  if (ptr)
-    {
-      cairo_path_destroy ((cairo_path_t *)ptr);
-    }
+  cairo_path_t *path = ptr;
+  ruby_xfree (path->data);
+  ruby_xfree (path);
 }
 
+static const rb_data_type_t cr_path_type = {
+  "Cairo::Path",
+  {
+    NULL,
+    cr_path_free,
+  },
+  NULL,
+  NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 cairo_path_t *
 rb_cairo_path_from_ruby_object (VALUE obj)
 {
-  VALUE context;
-  cairo_t *cr;
-  cairo_path_t *path, *copied_path;
+  cairo_path_t *path;
 
   if (!rb_cairo__is_kind_of (obj, rb_cCairo_Path))
     {
       rb_raise (rb_eTypeError, "not a cairo path");
     }
-  Data_Get_Struct (obj, cairo_path_t, path);
-
-  context = rb_ivar_get (obj, id_at_context);
-  if (NIL_P (context))
-    return path;
-
-  cr = RVAL2CRCONTEXT (context);
-  if (cairo_status (cr) != CAIRO_STATUS_SUCCESS)
-    return path;
+  TypedData_Get_Struct (obj, cairo_path_t, &cr_path_type, path);
 
-  copied_path = cairo_copy_path (cr);
-  rb_ivar_set (obj, id_current_path, CRPATH2RVAL (copied_path));
-  return copied_path;
-}
-
-static void
-cr_path_ensure_internal_context (VALUE rb_path, cairo_path_t *path)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-
-  if (!NIL_P (rb_ivar_get (rb_path, id_at_context)))
-    return;
-
-  surface = cairo_image_surface_create (CAIRO_FORMAT_A1, 1, 1);
-  cr = cairo_create (surface);
-  if (path->num_data > 0)
-    cairo_append_path (cr, path);
-  rb_cairo_check_status (cairo_status (cr));
-  rb_ivar_set (rb_path, id_at_context, CRCONTEXT2RVAL (cr));
-  cairo_destroy (cr);
+  return path;
 }
 
 VALUE
@@ -279,8 +259,15 @@ rb_cairo_path_to_ruby_object (cairo_path_t *path)
   if (path)
     {
       VALUE rb_path;
-      rb_path = Data_Wrap_Struct (rb_cCairo_Path, NULL, cr_path_free, path);
-      cr_path_ensure_internal_context (rb_path, path);
+      cairo_path_t *copied_path;
+      copied_path = RB_ALLOC (cairo_path_t);
+      copied_path->data = RB_ALLOC_N (cairo_path_data_t, path->num_data);
+      memcpy(copied_path->data,
+             path->data,
+             sizeof (cairo_path_data_t) * path->num_data);
+      rb_path = TypedData_Wrap_Struct (rb_cCairo_Path,
+                                       &cr_path_type,
+                                       copied_path);
       return rb_path;
     }
   else
@@ -292,7 +279,7 @@ rb_cairo_path_to_ruby_object (cairo_path_t *path)
 static VALUE
 cr_path_allocate (VALUE klass)
 {
-  return Data_Wrap_Struct (klass, NULL, cr_path_free, NULL);
+  return TypedData_Wrap_Struct (klass, &cr_path_type, NULL);
 }
 
 static VALUE
@@ -300,13 +287,11 @@ cr_path_initialize (VALUE self)
 {
   cairo_path_t *path;
 
-  path = ALLOC(cairo_path_t);
+  path = RB_ALLOC (cairo_path_t);
   path->status = CAIRO_STATUS_SUCCESS;
   path->data = NULL;
   path->num_data = 0;
-
   DATA_PTR (self) = path;
-  cr_path_ensure_internal_context (self, path);
 
   return Qnil;
 }