cairo 1.17.5 → 1.17.8

data/ext/cairo/rb_cairo_font_face.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 14:13:58 $
  *
- * Copyright 2003-2019 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2003-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -39,6 +39,9 @@ static ID cr_id_new;
 
 static ID cr_id_init;
 static ID cr_id_render_glyph;
+#  if CAIRO_CHECK_VERSION(1, 17, 6)
+static ID cr_id_render_color_glyph;
+#endif
 static ID cr_id_text_to_glyphs;
 static ID cr_id_unicode_to_glyph;
 
@@ -52,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)
 {
@@ -69,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)
 {
@@ -113,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
     {
@@ -124,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
@@ -272,7 +283,7 @@ cr_freetype_font_face_initialize (VALUE self, VALUE path)
     rb_cairo_check_status (status);
   }
 
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }
@@ -321,7 +332,7 @@ cr_toy_font_face_initialize (int argc, VALUE *argv, VALUE self)
 
   face = cairo_toy_font_face_create (family, slant, weight);
   cr_font_face_check_status (face);
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }
@@ -463,10 +474,11 @@ cr_user_font_face_render_glyph_func_after (VALUE user_data)
 }
 
 static cairo_status_t
-cr_user_font_face_render_glyph_func (cairo_scaled_font_t *scaled_font,
-                                     unsigned long glyph,
-                                     cairo_t *cr,
-                                     cairo_text_extents_t *extents)
+cr_user_font_face_render_glyph_func_internal (cairo_scaled_font_t *scaled_font,
+                                              unsigned long glyph,
+                                              cairo_t *cr,
+                                              cairo_text_extents_t *extents,
+                                              ID id_registered_method_name)
 {
   cairo_status_t status = CAIRO_STATUS_SUCCESS;
   cairo_font_face_t *face;
@@ -476,11 +488,12 @@ cr_user_font_face_render_glyph_func (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);
-  if (NIL_P (receiver) && rb_obj_respond_to (self, cr_id_render_glyph, Qtrue))
+  receiver = rb_ivar_get (self, id_registered_method_name);
+  if (NIL_P (receiver) &&
+      rb_obj_respond_to (self, id_registered_method_name, Qtrue))
     {
       receiver = self;
-      id_method_name = cr_id_render_glyph;
+      id_method_name = id_registered_method_name;
     }
 
   if (!NIL_P (receiver))
@@ -507,6 +520,34 @@ cr_user_font_face_render_glyph_func (cairo_scaled_font_t *scaled_font,
   return status;
 }
 
+static cairo_status_t
+cr_user_font_face_render_glyph_func (cairo_scaled_font_t *scaled_font,
+                                     unsigned long glyph,
+                                     cairo_t *cr,
+                                     cairo_text_extents_t *extents)
+{
+  return cr_user_font_face_render_glyph_func_internal (scaled_font,
+                                                       glyph,
+                                                       cr,
+                                                       extents,
+                                                       cr_id_render_glyph);
+}
+
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+static cairo_status_t
+cr_user_font_face_render_color_glyph_func (cairo_scaled_font_t *scaled_font,
+                                           unsigned long glyph,
+                                           cairo_t *cr,
+                                           cairo_text_extents_t *extents)
+{
+  return cr_user_font_face_render_glyph_func_internal (scaled_font,
+                                                       glyph,
+                                                       cr,
+                                                       extents,
+                                                       cr_id_render_color_glyph);
+}
+#endif
+
 typedef struct _cr_text_to_glyphs_after_hook_data {
   VALUE text_to_glyphs_data;
   cairo_glyph_t **glyphs;
@@ -703,6 +744,10 @@ cr_user_font_face_initialize (VALUE self)
     (face, cr_user_font_face_init_func);
   cairo_user_font_face_set_render_glyph_func
     (face, cr_user_font_face_render_glyph_func);
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  cairo_user_font_face_set_render_color_glyph_func
+    (face, cr_user_font_face_render_color_glyph_func);
+#endif
   cairo_user_font_face_set_text_to_glyphs_func
     (face, cr_user_font_face_text_to_glyphs_func);
   cairo_user_font_face_set_unicode_to_glyph_func
@@ -713,7 +758,7 @@ cr_user_font_face_initialize (VALUE self)
   rb_ivar_set (self, cr_id_text_to_glyphs, Qnil);
   rb_ivar_set (self, cr_id_unicode_to_glyph, Qnil);
 
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }
@@ -732,6 +777,15 @@ cr_user_font_face_on_render_glyph (VALUE self)
   return self;
 }
 
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+static VALUE
+cr_user_font_face_on_render_color_glyph (VALUE self)
+{
+  rb_ivar_set (self, cr_id_render_color_glyph, rb_block_proc ());
+  return self;
+}
+#endif
+
 static VALUE
 cr_user_font_face_on_text_to_glyphs (VALUE self)
 {
@@ -804,6 +858,9 @@ Init_cairo_font (void)
 
   cr_id_init = rb_intern ("init");
   cr_id_render_glyph = rb_intern ("render_glyph");
+#  if CAIRO_CHECK_VERSION(1, 17, 6)
+  cr_id_render_color_glyph = rb_intern ("render_color_glyph");
+#endif
   cr_id_text_to_glyphs = rb_intern ("text_to_glyphs");
   cr_id_unicode_to_glyph = rb_intern ("unicode_to_glyph");
 
@@ -867,6 +924,10 @@ Init_cairo_font (void)
                     cr_user_font_face_on_init, 0);
   rb_define_method (rb_cCairo_UserFontFace, "on_render_glyph",
                     cr_user_font_face_on_render_glyph, 0);
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_define_method (rb_cCairo_UserFontFace, "on_render_color_glyph",
+                    cr_user_font_face_on_render_color_glyph, 0);
+#endif
   rb_define_method (rb_cCairo_UserFontFace, "on_text_to_glyphs",
                     cr_user_font_face_on_text_to_glyphs, 0);
   rb_define_method (rb_cCairo_UserFontFace, "on_unicode_to_glyph",

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
@@ -75,7 +87,7 @@ cr_options_create (VALUE self)
 
   options = cairo_font_options_create ();
   cr_options_check_status (options);
-  DATA_PTR (self) = options;
+  RTYPEDDATA_DATA (self) = options;
   return Qnil;
 }
 

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
@@ -74,7 +77,7 @@ cr_glyph_initialize (VALUE self, VALUE index, VALUE x, VALUE y)
   glyph->x = NUM2DBL (x);
   glyph->y = NUM2DBL (y);
 
-  DATA_PTR (self) = glyph;
+  RTYPEDDATA_DATA (self) = glyph;
   return Qnil;
 }
 

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
@@ -78,7 +81,7 @@ cr_matrix_initialize (VALUE self,
                      NUM2DBL (xx), NUM2DBL (yx),
                      NUM2DBL (xy), NUM2DBL (yy),
                      NUM2DBL (x0), NUM2DBL (y0));
-  DATA_PTR (self) = matrix;
+  RTYPEDDATA_DATA (self) = matrix;
   return Qnil;
 }
 

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);
+  RTYPEDDATA_DATA (self) = path;
 
   return Qnil;
 }

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
@@ -251,7 +259,7 @@ cr_solid_pattern_initialize (int argc, VALUE *argv, VALUE self)
     }
 
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -262,7 +270,7 @@ cr_surface_pattern_initialize (VALUE self, VALUE surface)
 
   pattern = cairo_pattern_create_for_surface (RVAL2CRSURFACE (surface));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -275,7 +283,7 @@ cr_linear_pattern_initialize (VALUE self, VALUE x0, VALUE y0,
   pattern = cairo_pattern_create_linear (NUM2DBL (x0), NUM2DBL (y0),
                                          NUM2DBL (x1), NUM2DBL (y1));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -290,7 +298,7 @@ cr_radial_pattern_initialize (VALUE self, VALUE cx0, VALUE cy0, VALUE radius0,
                                          NUM2DBL (cx1), NUM2DBL (cy1),
                                          NUM2DBL (radius1));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -518,7 +526,7 @@ cr_mesh_pattern_initialize (VALUE self)
 
   pattern = cairo_pattern_create_mesh ();
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -916,7 +924,7 @@ cr_raster_source_pattern_initialize (int argc, VALUE *argv, VALUE self)
                                                 content, width, height);
   cr_pattern_check_status (pattern);
 
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   rb_iv_set (self, "@acquire", Qnil);
   rb_iv_set (self, "@release", Qnil);
   rb_iv_set (self, "@snapshot", Qnil);