cairo 1.17.5 → 1.17.8

data/ext/cairo/rb_cairo_quartz_surface.c

@@ -17,6 +17,8 @@
 #endif
 
 #ifdef CAIRO_HAS_QUARTZ_SURFACE
+static ID cr_id_image_surface;
+
 #  ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
 enum ruby_value_type {
   RUBY_T_DATA = T_DATA
@@ -132,7 +134,7 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
     }
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -167,7 +169,8 @@ cr_quartz_image_surface_initialize (VALUE self, VALUE image_surface)
 
   surface = cairo_quartz_image_surface_create (RVAL2CRSURFACE (image_surface));
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
+  rb_ivar_set (self, cr_id_image_surface, image_surface);
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -199,6 +202,8 @@ Init_cairo_quartz_surface (void)
 
   /* Quartz image surface */
 #ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+  cr_id_image_surface = rb_intern ("image_surface");
+
   rb_define_method (rb_cCairo_QuartzImageSurface, "initialize",
                     cr_quartz_image_surface_initialize, 1);
   rb_define_method (rb_cCairo_QuartzImageSurface, "image",

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
  *
@@ -12,13 +12,24 @@
 
 VALUE rb_cCairo_Rectangle;
 
-#define _SELF  ((cairo_rectangle_int_t *)DATA_PTR (self))
+#define _SELF  ((cairo_rectangle_int_t *)RTYPEDDATA_DATA (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
@@ -28,7 +39,7 @@ cr_rectangle_initialize (VALUE self, VALUE x, VALUE y,
   cairo_rectangle_int_t *rectangle;
 
   rectangle = ALLOC (cairo_rectangle_int_t);
-  DATA_PTR (self) = rectangle;
+  RTYPEDDATA_DATA (self) = rectangle;
 
   rectangle->x = NUM2INT (x);
   rectangle->y = NUM2INT (y);

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
@@ -98,7 +106,7 @@ cr_region_initialize (int argc, VALUE *argv, VALUE self)
       region = cairo_region_create_rectangles (rectangles, argc);
     }
   cr_region_check_status (region);
-  DATA_PTR (self) = region;
+  RTYPEDDATA_DATA (self) = region;
   return Qnil;
 }
 

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
@@ -78,7 +87,7 @@ cr_scaled_font_initialize (VALUE self, VALUE face, VALUE matrix,
                                    RVAL2CRMATRIX (ctm),
                                    RVAL2CRFONTOPTIONS (options));
   cr_scaled_font_check_status (font);
-  DATA_PTR (self) = font;
+  RTYPEDDATA_DATA (self) = font;
   return Qnil;
 }
 

data/ext/cairo/rb_cairo_surface.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -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)
 {
@@ -232,6 +244,28 @@ rb_cairo_surface_adjust_memory_usage (cairo_surface_t *surface,
 #endif
 }
 
+static cairo_surface_t *
+rb_cairo_surface_from_ruby_object_without_null_check (VALUE obj)
+{
+  cairo_surface_t *surface;
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_Surface))
+    {
+      rb_raise (rb_eTypeError, "not a cairo surface");
+    }
+  TypedData_Get_Struct (obj, cairo_surface_t, &cr_surface_type, surface);
+  return surface;
+}
+
+cairo_surface_t *
+rb_cairo_surface_from_ruby_object (VALUE obj)
+{
+  cairo_surface_t *surface =
+    rb_cairo_surface_from_ruby_object_without_null_check (obj);
+  if (!surface)
+    rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
+  return surface;
+}
+
 static void
 cr_surface_destroy_raw (cairo_surface_t *surface)
 {
@@ -246,7 +280,7 @@ cr_surface_destroy (VALUE self)
 
   surface = _SELF;
   cr_surface_destroy_raw (surface);
-  DATA_PTR (self) = NULL;
+  RTYPEDDATA_DATA (self) = NULL;
 
   return self;
 }
@@ -254,7 +288,7 @@ cr_surface_destroy (VALUE self)
 static VALUE
 cr_surface_destroy_with_destroy_check (VALUE self)
 {
-  if (_SELF)
+  if (rb_cairo_surface_from_ruby_object_without_null_check (self))
     cr_surface_destroy (self);
   return Qnil;
 }
@@ -407,21 +441,6 @@ cr_surface_xml_supported_p (VALUE klass)
 #endif
 }
 
-/* constructor/de-constructor */
-cairo_surface_t *
-rb_cairo_surface_from_ruby_object (VALUE obj)
-{
-  cairo_surface_t *surface;
-  if (!rb_cairo__is_kind_of (obj, rb_cCairo_Surface))
-    {
-      rb_raise (rb_eTypeError, "not a cairo surface");
-    }
-  Data_Get_Struct (obj, cairo_surface_t, surface);
-  if (!surface)
-    rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
-  return surface;
-}
-
 static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
@@ -454,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
     {
@@ -477,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
@@ -515,6 +534,7 @@ cr_surface_finish (VALUE self)
   cairo_surface_finish (surface);
   cairo_surface_set_user_data (surface, &cr_finished_key, (void *)CR_TRUE, NULL);
   cairo_surface_set_user_data (surface, &cr_object_holder_key, NULL, NULL);
+  RTYPEDDATA_DATA (self) = NULL;
 
   if (closure && !NIL_P (closure->error))
     rb_exc_raise (closure->error);
@@ -531,7 +551,7 @@ rb_cairo__surface_yield_and_finish (VALUE self)
 
   rb_result = rb_yield (self);
 
-  surface = _SELF;
+  surface = rb_cairo_surface_from_ruby_object_without_null_check (self);
   if (!surface)
     return rb_result;
   if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
@@ -730,6 +750,11 @@ cr_surface_write_to_png (VALUE self, VALUE filename)
 static VALUE
 cr_surface_write_to_png_generic (VALUE self, VALUE target)
 {
+  if (rb_respond_to (target, rb_cairo__io_id_to_path) &&
+      !rb_respond_to (target, rb_cairo__io_id_to_io))
+    {
+      target = rb_funcall (target, rb_cairo__io_id_to_path, 0);
+    }
   if (rb_respond_to (target, rb_cairo__io_id_write))
     return cr_surface_write_to_png_stream (self, target);
   else
@@ -995,7 +1020,7 @@ cr_image_surface_create_from_png_generic (VALUE klass, VALUE target)
 
   rb_cairo_surface_check_status (surface);
   rb_surface = cr_surface_allocate (klass);
-  DATA_PTR (rb_surface) = surface;
+  RTYPEDDATA_DATA (rb_surface) = surface;
   return rb_surface;
 }
 #endif
@@ -1052,7 +1077,7 @@ cr_image_surface_initialize (int argc, VALUE *argv, VALUE self)
               rb_cairo__inspect (rb_ary_new3 (4, arg1, arg2, arg3, arg4)));
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   rb_cairo_surface_adjust_memory_usage (surface, CR_TRUE);
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
@@ -1173,7 +1198,7 @@ cr_ ## type ## _surface_initialize (int argc, VALUE *argv, VALUE self)  \
     }                                                                   \
                                                                         \
   rb_cairo_surface_check_status (surface);                              \
-  DATA_PTR (self) = surface;                                            \
+  RTYPEDDATA_DATA (self) = surface;                                            \
   if (rb_block_given_p ())                                              \
     rb_cairo__surface_yield_and_finish (self);                          \
   return Qnil;                                                          \
@@ -1328,6 +1353,26 @@ cr_pdf_surface_set_thumbnail_size (VALUE self,
   return Qnil;
 }
 #  endif
+
+#  if CAIRO_CHECK_VERSION(1, 17, 6)
+static VALUE
+cr_pdf_surface_set_custom_metadata (VALUE self,
+                                    VALUE rb_name,
+                                    VALUE rb_value)
+{
+  cairo_surface_t *surface;
+  const char *name;
+  const char *value;
+
+  surface = _SELF;
+  name = RVAL2CSTR (rb_name);
+  value = RVAL2CSTR (rb_value);
+  cairo_pdf_surface_set_custom_metadata (surface, name, value);
+  rb_cairo_surface_check_status (surface);
+
+  return Qnil;
+}
+#  endif
 #endif
 
 #ifdef CAIRO_HAS_PS_SURFACE
@@ -1494,7 +1539,7 @@ cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
   if (!surface)
     rb_cairo_check_status (CAIRO_STATUS_INVALID_FORMAT);
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1570,7 +1615,7 @@ cr_win32_printing_surface_initialize (VALUE self, VALUE hdc)
 
   surface = cairo_win32_printing_surface_create (NUM2PTR (hdc));
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1625,7 +1670,7 @@ cr_script_surface_initialize (int argc, VALUE *argv, VALUE self)
     surface = cairo_script_surface_create (device, content, width, height);
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1680,7 +1725,7 @@ cr_recording_surface_initialize (int argc, VALUE *argv, VALUE self)
 
   surface = cairo_recording_surface_create (content, &extents);
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1757,7 +1802,7 @@ cr_gl_surface_initialize (int argc, VALUE *argv, VALUE self)
   surface = cairo_gl_surface_create (device, content, width, height);
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1804,7 +1849,7 @@ cr_gl_texture_surface_initialize (int argc, VALUE *argv, VALUE self)
                                                  height);
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1854,7 +1899,7 @@ cr_tee_surface_initialize (VALUE self, VALUE master)
 
   surface = cairo_tee_surface_create (RVAL2CRSURFACE (master));
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   rb_iv_set (self, "surfaces", rb_ary_new3 (1, master));
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
@@ -1976,7 +2021,7 @@ cr_xml_surface_initialize (int argc, VALUE *argv, VALUE self)
   surface = cairo_xml_surface_create (device, content, width, height);
 
   rb_cairo_surface_check_status (surface);
-  DATA_PTR (self) = surface;
+  RTYPEDDATA_DATA (self) = surface;
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -2177,6 +2222,11 @@ Init_cairo_surface (void)
   }
 #  endif
 
+#  if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_define_method (rb_cCairo_PDFSurface, "set_custom_metadata",
+                    cr_pdf_surface_set_custom_metadata, 2);
+#  endif
+
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
 #endif
 

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
@@ -75,7 +81,7 @@ cr_text_cluster_initialize (VALUE self, VALUE num_bytes, VALUE num_glyphs)
   cluster->num_bytes = NUM2INT (num_bytes);
   cluster->num_glyphs = NUM2INT (num_glyphs);
 
-  DATA_PTR (self) = cluster;
+  RTYPEDDATA_DATA (self) = cluster;
   return Qnil;
 }
 

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
@@ -65,7 +82,7 @@ cr_text_extents_initialize (VALUE self)
   extents->x_advance = 1.0;
   extents->y_advance = 0.0;
 
-  DATA_PTR (self) = extents;
+  RTYPEDDATA_DATA (self) = extents;
 
   return Qnil;
 }

data/test/test_context.rb

@@ -129,4 +129,18 @@ class ContextTest < Test::Unit::TestCase
       context.raw_address > 0
     end
   end
+
+  def test_hairline
+    only_cairo_version(1, 17, 6)
+
+    Cairo::Context.create(@surface) do |context|
+      assert do
+        not context.hairline?
+      end
+      context.hairline = true
+      assert do
+        context.hairline?
+      end
+    end
+  end
 end