cairo 1.17.4 → 1.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d45ddf05c3bd2840bdc6f85f17b134625cc5d5fabcc47a1c182fd2868d37c5
-  data.tar.gz: b3f5c9fe2a34a496fece236be896d82c2a7d0615fab0d3a86158db36e592c7fe
+  metadata.gz: f5ac730747ea5dada591e534a7c0653a0d1ad3fa3962dfdd01173e0074ff835c
+  data.tar.gz: 2fbccb304f8b4dbd3a89df42c9f1779b45a84b2f4c9be5ab591992eb9d7c3d31
 SHA512:
-  metadata.gz: f78c4b463a008645ca76fd791e8bb9f40d56712a1883a7414e228a9977e47447e58bbe479cc5de25e0ca8b36dd4e383b0ba061c7e7a4fadaaacb744acc4d5979
-  data.tar.gz: 566f60ce9e7bb301fa972fa37f28e1d7107e735b3e9178714c845d60955d1b64fe01e0ca8d1efc36291f8b927a9ee2c44cf11b68e1811465f55b1dfee619b9ea
+  metadata.gz: 389eeca0e8c453e3c1b2ebe10053a1713c1c1ae93b22e46100b5bc1c39d566f00f60a1c676ae288e06fa9fdea6f24db8e107d53355bd52bc0e067e5b8b4fe073
+  data.tar.gz: d107b587d530433a0288f73a5b8d85710e2923213347f88e09de92562645dbcd9e501f8f9ab1bd74bb9ae13559ee94999e94c7555cd96a345b9d1d75965b961c

data/NEWS

@@ -1,3 +1,52 @@
+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

@@ -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 4
+#define RB_CAIRO_VERSION_MICRO 7
 
 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
@@ -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

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

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
@@ -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
@@ -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",