cairo 1.17.4 → 1.17.7

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2018 Kouhei Sutou <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
@@ -104,7 +116,7 @@ cr_options_equal (VALUE self, VALUE other)
 static VALUE
 cr_options_hash (VALUE self)
 {
-  return INT2NUM (cairo_font_options_hash (_SELF (self)));
+  return ULONG2NUM (cairo_font_options_hash (_SELF (self)));
 }
 
 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_io.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2021 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -130,7 +130,7 @@ rb_cairo__io_read_func_invoke (VALUE read_closure)
     {
       rb_str_concat (result,
                      rb_funcall (input,
-                                 rb_cairo__io_id_read, 1, INT2NUM (rest)));
+                                 rb_cairo__io_id_read, 1, LONG2NUM (rest)));
     }
 
   memcpy ((void *)closure->data, (const void *) StringValuePtr (result), length);

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;
 }

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_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
@@ -168,6 +170,7 @@ 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;
+  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
  *
@@ -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