cairo 1.17.5 → 1.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5775df8bb8a56c3b4274ef0696f9364fe02490bea3164af4bd2b72bfcc6779e4
-  data.tar.gz: ed53259db771ecd57cf7a923b2f9e2b63b312b44021e48ddc0e3ddfb7c1bafc4
+  metadata.gz: 7b1853ada5ca7f86bebe04e05e51c0b49a84fb7782bb2156db4d1825f75cc415
+  data.tar.gz: 326f5322f9e2b66e115d656a762384e5caaa18ecba44c576a805c5989278d330
 SHA512:
-  metadata.gz: db3510810d933b993b021919b772bab5f4fcca734402a57b6fb86c3f3c53650b6ffbab494b9768cc1ea5809db78873f2d7b50031078e7cd5d542be5cdbd6e63f
-  data.tar.gz: d1647888e3e61430a12b2d3268c10d8832d1dad85777d8eb4d99c1be1cb33fd7c73ad0b2a2deeb0fd691c61da148454aa373172749ecd50af9c62715989d6e91
+  metadata.gz: db4171dfe178c24f632f38fcbbd1960412160dd999bdd925b6501c663641a308acab2bd6fa2f9a84b3e18c30821ce3f6514b7dac809fd2b965f25c79051f66bd
+  data.tar.gz: d9ef0bedc2b597617415c88d3734a4fe33a38bffc7a49939d671e4eed88f0da07f741fad595315376a76504dca36f35186563945a124d43510338ecd16970337

data/NEWS

@@ -1,3 +1,43 @@
+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 5
+#define RB_CAIRO_VERSION_MICRO 6
 
 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

@@ -523,6 +523,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 +1500,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)
 {
@@ -1751,6 +1769,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 +1883,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_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_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;
 
@@ -463,10 +466,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;
@@ -477,10 +481,11 @@ 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))
+  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 +512,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 +736,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 +769,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 +850,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 +916,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_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_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>
@@ -232,6 +232,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");
+    }
+  Data_Get_Struct (obj, cairo_surface_t, 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)
 {
@@ -254,7 +276,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 +429,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)
 {
@@ -515,6 +522,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);
+  DATA_PTR (self) = NULL;
 
   if (closure && !NIL_P (closure->error))
     rb_exc_raise (closure->error);
@@ -531,7 +539,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)
@@ -1328,6 +1336,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
@@ -2177,6 +2205,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/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

data/test/test_font_face.rb

@@ -161,12 +161,16 @@ class FontFaceTest < Test::Unit::TestCase
 
   if Cairo.satisfied_version?(1, 7, 2)
     class CustomUserFontFace < Cairo::UserFontFace
-      attr_reader :init_args, :render_glyph_args
-      attr_reader :text_to_glyphs_args, :unicode_to_glyph_args
+      attr_reader :init_args
+      attr_reader :render_glyph_args
+      attr_reader :render_color_glyph_args
+      attr_reader :text_to_glyphs_args
+      attr_reader :unicode_to_glyph_args
       def initialize
         super
         @init_args = []
         @render_glyph_args = []
+        @render_color_glyph_args = []
         @text_to_glyphs_args = []
         @unicode_to_glyph_args = []
       end
@@ -179,6 +183,10 @@ class FontFaceTest < Test::Unit::TestCase
         @render_glyph_args << args
       end
 
+      def render_color_glyph(*args)
+        @render_color_glyph_args << args
+      end
+
       def text_to_glyphs(*args)
         @text_to_glyphs_args << args
         scaled_font, utf8, data = args
@@ -203,25 +211,102 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::Matrix.identity,
                                         Cairo::FontOptions.new)
     result = scaled_font.text_to_glyphs(0, 0, "text")
-    assert_equal([[[Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]],
-                  [[Cairo::ScaledFont, codepoint("t"),
-                    Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, codepoint("e"),
-                    Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, codepoint("x"),
-                    Cairo::Context, Cairo::TextExtents]],
-                  [[Cairo::ScaledFont, "text",
-                    Cairo::UserFontFace::TextToGlyphsData]],
-                  [[Cairo::ScaledFont, codepoint("t")],
-                   [Cairo::ScaledFont, codepoint("e")],
-                   [Cairo::ScaledFont, codepoint("x")],
-                   [Cairo::ScaledFont, codepoint("t")]],
-                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
-                 [classify_cairo_object(face.init_args),
-                  classify_cairo_object(face.render_glyph_args),
-                  classify_cairo_object(face.text_to_glyphs_args),
-                  classify_cairo_object(face.unicode_to_glyph_args),
-                  result])
+    if Cairo.satisfied_version?(1, 17, 6)
+      assert_equal({
+                     init_args: [
+                       [Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]
+                     ],
+                     render_glyph_args: [],
+                     render_color_glyph_args: [
+                       [
+                         Cairo::ScaledFont, codepoint("t"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                       [
+                         Cairo::ScaledFont, codepoint("e"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                       [
+                         Cairo::ScaledFont, codepoint("x"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                     ],
+                     text_to_glyphs_args: [
+                       [
+                         Cairo::ScaledFont, "text",
+                         Cairo::UserFontFace::TextToGlyphsData],
+                     ],
+                     unicode_to_glyph_args: [
+                       [Cairo::ScaledFont, codepoint("t")],
+                       [Cairo::ScaledFont, codepoint("e")],
+                       [Cairo::ScaledFont, codepoint("x")],
+                       [Cairo::ScaledFont, codepoint("t")],
+                     ],
+                     result: [
+                       [],
+                       [],
+                       Cairo::TextClusterFlag::BACKWARD,
+                     ],
+                   },
+                   {
+                     init_args: classify_cairo_object(face.init_args),
+                     render_glyph_args:
+                       classify_cairo_object(face.render_glyph_args),
+                     render_color_glyph_args:
+                       classify_cairo_object(face.render_color_glyph_args),
+                     text_to_glyphs_args:
+                       classify_cairo_object(face.text_to_glyphs_args),
+                     unicode_to_glyph_args:
+                       classify_cairo_object(face.unicode_to_glyph_args),
+                     result: result,
+                   })
+    else
+      assert_equal({
+                     init_args: [
+                       [Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]
+                     ],
+                     render_glyph_args: [
+                       [
+                         Cairo::ScaledFont, codepoint("t"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                       [
+                         Cairo::ScaledFont, codepoint("e"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                       [
+                         Cairo::ScaledFont, codepoint("x"),
+                         Cairo::Context, Cairo::TextExtents,
+                       ],
+                     ],
+                     text_to_glyphs_args: [
+                       [
+                         Cairo::ScaledFont, "text",
+                         Cairo::UserFontFace::TextToGlyphsData],
+                     ],
+                     unicode_to_glyph_args: [
+                       [Cairo::ScaledFont, codepoint("t")],
+                       [Cairo::ScaledFont, codepoint("e")],
+                       [Cairo::ScaledFont, codepoint("x")],
+                       [Cairo::ScaledFont, codepoint("t")],
+                     ],
+                     result: [
+                       [],
+                       [],
+                       Cairo::TextClusterFlag::BACKWARD,
+                     ],
+                   },
+                   {
+                     init_args: classify_cairo_object(face.init_args),
+                     render_glyph_args:
+                       classify_cairo_object(face.render_glyph_args),
+                     text_to_glyphs_args:
+                       classify_cairo_object(face.text_to_glyphs_args),
+                     unicode_to_glyph_args:
+                       classify_cairo_object(face.unicode_to_glyph_args),
+                     result: result,
+                   })
+    end
   end
 
   def test_user_font_face_class_and_callback

data/test/test_quartz_image_surface.rb

@@ -6,8 +6,10 @@ class QuartzImageSurfaceTest < Test::Unit::TestCase
   end
 
   def test_quartz_image_surface
-    surface = Cairo::ImageSurface.new(100, 100)
-    quartz_surface = Cairo::QuartzImageSurface.new(surface)
-    assert_kind_of(Cairo::QuartzImageSurface, quartz_surface)
+    Cairo::ImageSurface.create(100, 100) do |surface|
+      Cairo::QuartzImageSurface.create(surface) do |quartz_surface|
+        assert_kind_of(Cairo::QuartzImageSurface, quartz_surface)
+      end
+    end
   end
 end

data/test/test_svg_surface.rb

@@ -10,7 +10,11 @@ class SVGSurfaceTest < Test::Unit::TestCase
     only_cairo_version(1, 15, 10)
     output = StringIO.new
     surface = Cairo::SVGSurface.new(output, 10, 20)
-    assert_equal(Cairo::SVGUnit::PT, surface.document_unit)
+    if Cairo.satisfied_version?(1, 17, 6)
+      assert_equal(Cairo::SVGUnit::USER, surface.document_unit)
+    else
+      assert_equal(Cairo::SVGUnit::PT, surface.document_unit)
+    end
     surface.document_unit = Cairo::SVGUnit::CM
     assert_equal(Cairo::SVGUnit::CM, surface.document_unit)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.17.5
+  version: 1.17.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2022-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: native-package-installer
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cairo >= 1.2.0
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for cairo