cairo 1.17.5 → 1.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5775df8bb8a56c3b4274ef0696f9364fe02490bea3164af4bd2b72bfcc6779e4
-  data.tar.gz: ed53259db771ecd57cf7a923b2f9e2b63b312b44021e48ddc0e3ddfb7c1bafc4
+  metadata.gz: dffa934fa956305e9ed3ba9a9a5c92956c61c09277ea1723ceb69c1bee1b5c72
+  data.tar.gz: c4a6b1aa7bc5e3e00ca1bb388272d75c726fb20a1366dcbc2f15513d06177cbd
 SHA512:
-  metadata.gz: db3510810d933b993b021919b772bab5f4fcca734402a57b6fb86c3f3c53650b6ffbab494b9768cc1ea5809db78873f2d7b50031078e7cd5d542be5cdbd6e63f
-  data.tar.gz: d1647888e3e61430a12b2d3268c10d8832d1dad85777d8eb4d99c1be1cb33fd7c73ad0b2a2deeb0fd691c61da148454aa373172749ecd50af9c62715989d6e91
+  metadata.gz: 163b19b0d0fdbfadd8117629b95fbd51f97a84617bc77366eb5083b4e631bc3eb863c1daa51ce6e79fd0cfbe462f69215b6bc3548c9a3960e95861c799f53515
+  data.tar.gz: c266cd0dc3e254bccecae19b9f8dfb688c55404cd348446d2e34d67d263e07b1244851292aa1d8c1140e30bfa8162af1135855b99eb1da7af54c9d67d77aefba

data/NEWS

@@ -1,3 +1,66 @@
+Release 1.17.8 (2022-09-01) Sutou Kouhei <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Added support for Pathname for Cairo::Surface#write_to_png.
+    [GitHub#37][Reported by scivola]
+
+Thanks
+------
+
+  * scivola
+
+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>
+===========================================================
+
+Improvements
+------------
+
+  * Added support for cairo 1.17.6:
+
+    * Added Cairo::PDFVersion::VERSION_1_6.
+
+    * Added Cairo::PDFVersion::VERSION_1_7.
+
+    * Added Cairo::PDFSurface#set_metadata.
+
+    * Added Cairo::DirectWriteError.
+
+    * Added Cairo::Context#set_hairline.
+
+    * Added Cairo::Context#hairline?.
+
+    * Added Cairo::UserFont#on_render_color_glyph.
+
+  * Updated tests for cairo 1.17.6.
+    [GitHub#75][Reported by Mamoru TASAKA]
+
+Fixes
+-----
+
+  * Fixed a wrong conversion bug for the rest size argument in read
+    callback.
+
+  * Fixed a wrong conversion bug in Cairo::Options#hash.
+
+  * Fixed a GC related crash bug in Cairo::Surface#finish.
+
+Thanks
+------
+
+  * Mamoru TASAKA
+
 Release 1.17.4 (2021-01-17) Sutou Kouhei <kou@cozmixng.org>
 ===========================================================
 

data/ext/cairo/rb_cairo.c

@@ -46,7 +46,7 @@ rb_cairo_satisfied_version (int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_cairo ()
+Init_cairo (void)
 {
   int major, minor, micro;
 

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2021 Sutou Kouhei <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>
  *
@@ -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 5
+#define RB_CAIRO_VERSION_MICRO 8
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_constants.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>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -113,7 +113,11 @@ VALUE rb_mCairo_SVGUnit = Qnil;
 #define CAIRO_PS_LEVEL_MAX CAIRO_PS_LEVEL_3
 
 #define CAIRO_PDF_VERSION_MIN CAIRO_PDF_VERSION_1_4
-#define CAIRO_PDF_VERSION_MAX CAIRO_PDF_VERSION_1_5
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+#  define CAIRO_PDF_VERSION_MAX CAIRO_PDF_VERSION_1_7
+#else
+#  define CAIRO_PDF_VERSION_MAX CAIRO_PDF_VERSION_1_5
+#endif
 
 #define CAIRO_TEXT_CLUSTER_FLAG_MIN 0
 #define CAIRO_TEXT_CLUSTER_FLAG_MAX CAIRO_TEXT_CLUSTER_FLAG_BACKWARD
@@ -644,6 +648,12 @@ Init_cairo_constants (void)
                    INT2FIX (CAIRO_PDF_VERSION_1_4));
   rb_define_const (rb_mCairo_PDFVersion, "VERSION_1_5",
                    INT2FIX (CAIRO_PDF_VERSION_1_5));
+#    if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_define_const (rb_mCairo_PDFVersion, "VERSION_1_6",
+                   INT2FIX (CAIRO_PDF_VERSION_1_6));
+  rb_define_const (rb_mCairo_PDFVersion, "VERSION_1_7",
+                   INT2FIX (CAIRO_PDF_VERSION_1_7));
+#    endif
 
   rb_define_singleton_method (rb_mCairo_PDFVersion, "list",
                               cr_pdf_get_versions, 0);

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
@@ -118,20 +126,20 @@ cr_destroy (VALUE self)
   cr_set_user_data (cr, &cr_object_holder_key, NULL, NULL);
   cairo_destroy (cr);
 
-  DATA_PTR (self) = NULL;
+  RTYPEDDATA_DATA (self) = NULL;
   return Qnil;
 }
 
 static VALUE
 cr_destroyed (VALUE self)
 {
-  return CBOOL2RVAL (DATA_PTR (self) == NULL);
+  return CBOOL2RVAL (RTYPEDDATA_DATA (self) == NULL);
 }
 
 static VALUE
 cr_destroy_with_destroy_check (VALUE self)
 {
-  if (DATA_PTR (self))
+  if (RTYPEDDATA_DATA (self))
     cr_destroy (self);
   return Qnil;
 }
@@ -194,7 +202,7 @@ cr_s_wrap (VALUE self, VALUE pointer)
 
   rb_cr = rb_obj_alloc (self);
   cairo_reference (cr);
-  DATA_PTR (rb_cr) = cr;
+  RTYPEDDATA_DATA (rb_cr) = cr;
   rb_ivar_set (rb_cr, cr_id_surface, Qnil);
 
   if (rb_block_given_p ())
@@ -224,7 +232,7 @@ cr_initialize (VALUE self, VALUE target)
                       &cr_object_holder_key,
                       cr_object_holder_new (self),
                       cr_object_holder_free);
-  DATA_PTR (self) = cr;
+  RTYPEDDATA_DATA (self) = cr;
   if (rb_block_given_p ())
     result = rb_ensure (rb_yield, self, cr_destroy_with_destroy_check, self);
   return result;
@@ -523,6 +531,16 @@ cr_set_line_width (VALUE self, VALUE width)
   return self;
 }
 
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+static VALUE
+cr_set_hairline (VALUE self, VALUE hairline)
+{
+  cairo_set_hairline (_SELF, RTEST (hairline));
+  cr_check_status (_SELF);
+  return self;
+}
+#endif
+
 static VALUE
 cr_set_line_cap (VALUE self, VALUE cap)
 {
@@ -1490,6 +1508,14 @@ cr_get_line_width (VALUE self)
   return rb_float_new (cairo_get_line_width (_SELF));
 }
 
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+static VALUE
+cr_get_hairline (VALUE self)
+{
+  return CBOOL2RVAL (cairo_get_hairline (_SELF));
+}
+#endif
+
 static VALUE
 cr_get_line_cap (VALUE self)
 {
@@ -1577,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
@@ -1751,6 +1783,9 @@ Init_cairo_context (void)
   rb_define_method (rb_cCairo_Context, "set_antialias", cr_set_antialias, 1);
   rb_define_method (rb_cCairo_Context, "set_fill_rule", cr_set_fill_rule, 1);
   rb_define_method (rb_cCairo_Context, "set_line_width", cr_set_line_width, 1);
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_define_method (rb_cCairo_Context, "set_hairline", cr_set_hairline, 1);
+#endif
   rb_define_method (rb_cCairo_Context, "set_line_cap", cr_set_line_cap, 1);
   rb_define_method (rb_cCairo_Context, "set_line_join", cr_set_line_join, 1);
   rb_define_method (rb_cCairo_Context, "set_dash", cr_set_dash, -1);
@@ -1862,6 +1897,9 @@ Init_cairo_context (void)
                     cr_get_current_point, 0);
   rb_define_method (rb_cCairo_Context, "fill_rule", cr_get_fill_rule, 0);
   rb_define_method (rb_cCairo_Context, "line_width", cr_get_line_width, 0);
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_define_method (rb_cCairo_Context, "hairline?", cr_get_hairline, 0);
+#endif
   rb_define_method (rb_cCairo_Context, "line_cap", cr_get_line_cap, 0);
   rb_define_method (rb_cCairo_Context, "line_join", cr_get_line_join, 0);
   rb_define_method (rb_cCairo_Context, "miter_limit", cr_get_miter_limit, 0);

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
@@ -206,7 +215,7 @@ cr_device_destroy (VALUE self)
 
   device = _SELF;
   cairo_device_destroy (device);
-  DATA_PTR (self) = NULL;
+  RTYPEDDATA_DATA (self) = NULL;
 
   return self;
 }
@@ -326,7 +335,7 @@ cr_ ## type ## _device_initialize (VALUE self,                          \
     }                                                                   \
                                                                         \
   cr_device_check_status (device);                                      \
-  DATA_PTR (self) = device;                                             \
+  RTYPEDDATA_DATA (self) = device;                                             \
   if (rb_block_given_p ())                                              \
     yield_and_finish (self);                                            \
   return Qnil;                                                          \

data/ext/cairo/rb_cairo_exception.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-16 12:52:16 $
  *
- * Copyright 2010-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2010-2022 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -71,6 +71,9 @@ static VALUE rb_eCairo_FreeTypeError;
 static VALUE rb_eCairo_Win32GDIError;
 static VALUE rb_eCairo_TagError;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+static VALUE rb_eCairo_DirectWriteError;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -221,6 +224,11 @@ rb_cairo_check_status (cairo_status_t status)
       rb_raise (rb_eCairo_TagError, "%s", string);
       break;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+    case CAIRO_STATUS_DWRITE_ERROR:
+      rb_raise (rb_eCairo_DirectWriteError, "%s", string);
+      break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
     case CAIRO_STATUS_LAST_STATUS:
 #else
@@ -328,12 +336,16 @@ rb_cairo__exception_to_status (VALUE exception)
   else if (rb_cairo__is_kind_of (exception, rb_eCairo_TagError))
     return CAIRO_STATUS_TAG_ERROR;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  else if (rb_cairo__is_kind_of (exception, rb_eCairo_DirectWriteError))
+    return CAIRO_STATUS_DWRITE_ERROR;
+#endif
 
   return -1;
 }
 
 void
-Init_cairo_exception ()
+Init_cairo_exception (void)
 {
   VALUE rb_eCairo_Error;
   rb_eCairo_Error =
@@ -488,4 +500,10 @@ Init_cairo_exception ()
     rb_define_class_under (rb_mCairo, "TagError",
                            rb_eCairo_Error);
 #endif
+
+#if CAIRO_CHECK_VERSION(1, 17, 6)
+  rb_eCairo_DirectWriteError =
+    rb_define_class_under (rb_mCairo, "DirectWriteError",
+                           rb_eCairo_Error);
+#endif
 }

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
@@ -64,7 +81,7 @@ cr_font_extents_initialize (VALUE self)
   extents->max_x_advance = 1.0;
   extents->max_y_advance = 0.0;
 
-  DATA_PTR (self) = extents;
+  RTYPEDDATA_DATA (self) = extents;
 
   return Qnil;
 }