cairo 1.17.7 → 1.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ac730747ea5dada591e534a7c0653a0d1ad3fa3962dfdd01173e0074ff835c
-  data.tar.gz: 2fbccb304f8b4dbd3a89df42c9f1779b45a84b2f4c9be5ab591992eb9d7c3d31
+  metadata.gz: 05f4568d5884a55b9ec5f2490536c75737a5513ee52db87d6a1847bccb233499
+  data.tar.gz: cf202c94b822be61b2d77fcbdf49a566022038ac23447a3f4cd8780cd5fe4de3
 SHA512:
-  metadata.gz: 389eeca0e8c453e3c1b2ebe10053a1713c1c1ae93b22e46100b5bc1c39d566f00f60a1c676ae288e06fa9fdea6f24db8e107d53355bd52bc0e067e5b8b4fe073
-  data.tar.gz: d107b587d530433a0288f73a5b8d85710e2923213347f88e09de92562645dbcd9e501f8f9ab1bd74bb9ae13559ee94999e94c7555cd96a345b9d1d75965b961c
+  metadata.gz: 569e8766de9065d5887b3de6bfe01b23fdf97f9865b392e85312a7e9e2015a7f0dfccef6ab91dccdc1cc91b48534437c3d61b927b4d799098975b0bc6fdcaa70
+  data.tar.gz: dcc158f18e380017c86d15dc94c66c0d45beb1463937f10366daf017913c1dbdcba82972efd1a76ac981ffc001328103364011816adf5c1e52cc0f8675531bdb

data/NEWS

@@ -1,3 +1,62 @@
+Release 1.17.9 (2023-06-14) Sutou Kouhei <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Dropped support for fat gem.
+    [GH-78][https://github.com/rcairo/rcairo/issues/78]
+    [Reported by Largo]
+
+  * Added support for auto native package installation with conda.
+
+  * Added support for cairo 1.17.8:
+
+    * Added Cairo::SVGFontError.
+
+    * Added Cairo::ColorMode.
+
+    * Added Cairo::FontOptions#color_mode.
+
+    * Added Cairo::FontOptions#color_mode=.
+
+    * Added Cairo::ColorPalette.
+
+    * Added Cairo::FontOptions#color_palette.
+
+    * Added Cairo::FontOptions#color_palette=.
+
+    * Added Cairo::FontOptions#set_custom_palette_color.
+
+Fixes
+-----
+
+  * Fixed the number of arguments of Cairo::GLSurface#initialize and
+    Cairo::GLTextureSurface#initialize.
+    [GH-79][https://github.com/rcairo/rcairo/issues/79]
+    [Patch by Dimitry Andric]
+
+Thanks
+------
+
+  * Largo
+
+  * Dimitry Andric
+
+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>
 ===========================================================
 

data/ext/cairo/extconf.rb

@@ -49,6 +49,7 @@ end
 
 unless required_pkg_config_package([package, major, minor, micro],
                                    :arch_linux => "cairo",
+                                   :conda => "cairo",
                                    :debian => "libcairo2-dev",
                                    :homebrew => "cairo",
                                    :macports => "cairo",

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 7
+#define RB_CAIRO_VERSION_MICRO 9
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -136,6 +136,8 @@ RB_CAIRO_VAR VALUE rb_mCairo_FontWeight;
 RB_CAIRO_VAR VALUE rb_mCairo_SubpixelOrder;
 RB_CAIRO_VAR VALUE rb_mCairo_HintStyle;
 RB_CAIRO_VAR VALUE rb_mCairo_HintMetrics;
+RB_CAIRO_VAR VALUE rb_mCairo_ColorMode;
+RB_CAIRO_VAR VALUE rb_mCairo_ColorPalette;
 RB_CAIRO_VAR VALUE rb_mCairo_FontType;
 RB_CAIRO_VAR VALUE rb_mCairo_PathDataType;
 RB_CAIRO_VAR VALUE rb_mCairo_Content;
@@ -266,6 +268,9 @@ VALUE                 rb_cairo_device_to_ruby_object         (cairo_device_t *de
 #define RVAL2CRSUBPIXELORDER(obj) (rb_cairo_subpixel_order_from_ruby_object(obj))
 #define RVAL2CRHINTSTYLE(obj)     (rb_cairo_hint_style_from_ruby_object(obj))
 #define RVAL2CRHINTMETRICS(obj)   (rb_cairo_hint_metrics_from_ruby_object(obj))
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+#define RVAL2CRCOLORMODE(obj)     (rb_cairo_color_mode_from_ruby_object(obj))
+#endif
 #define RVAL2CRPATHDATATYPE(obj)  (rb_cairo_path_data_type_from_ruby_object(obj))
 #define RVAL2CRCONTENT(obj)       (rb_cairo_content_from_ruby_object(obj))
 #define RVAL2CRFORMAT(obj)        (rb_cairo_format_from_ruby_object(obj))
@@ -311,6 +316,9 @@ cairo_font_weight_t    rb_cairo_font_weight_from_ruby_object    (VALUE obj);
 cairo_subpixel_order_t rb_cairo_subpixel_order_from_ruby_object (VALUE obj);
 cairo_hint_style_t     rb_cairo_hint_style_from_ruby_object     (VALUE obj);
 cairo_hint_metrics_t   rb_cairo_hint_metrics_from_ruby_object   (VALUE obj);
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+cairo_color_mode_t     rb_cairo_color_mode_from_ruby_object     (VALUE obj);
+#endif
 cairo_path_data_type_t rb_cairo_path_data_type_from_ruby_object (VALUE obj);
 cairo_content_t        rb_cairo_content_from_ruby_object        (VALUE obj);
 cairo_format_t         rb_cairo_format_from_ruby_object         (VALUE obj);

data/ext/cairo/rb_cairo_constants.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2005-2023 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -27,6 +27,8 @@ VALUE rb_mCairo_FontWeight;
 VALUE rb_mCairo_SubpixelOrder;
 VALUE rb_mCairo_HintStyle;
 VALUE rb_mCairo_HintMetrics;
+VALUE rb_mCairo_ColorMode;
+VALUE rb_mCairo_ColorPalette;
 VALUE rb_mCairo_PathDataType;
 VALUE rb_mCairo_Content;
 VALUE rb_mCairo_Format;
@@ -81,6 +83,9 @@ VALUE rb_mCairo_SVGUnit = Qnil;
 #define CAIRO_HINT_METRICS_MIN CAIRO_HINT_METRICS_DEFAULT
 #define CAIRO_HINT_METRICS_MAX CAIRO_HINT_METRICS_ON
 
+#define CAIRO_COLOR_MODE_MIN CAIRO_COLOR_MODE_DEFAULT
+#define CAIRO_COLOR_MODE_MAX CAIRO_COLOR_MODE_COLOR
+
 #define CAIRO_PATH_MIN CAIRO_PATH_MOVE_TO
 #define CAIRO_PATH_MAX CAIRO_PATH_CLOSE_PATH
 
@@ -182,6 +187,9 @@ DEFINE_RVAL2ENUM(font_weight, FONT_WEIGHT)
 DEFINE_RVAL2ENUM(subpixel_order, SUBPIXEL_ORDER)
 DEFINE_RVAL2ENUM(hint_style, HINT_STYLE)
 DEFINE_RVAL2ENUM(hint_metrics, HINT_METRICS)
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+DEFINE_RVAL2ENUM(color_mode, COLOR_MODE)
+#endif
 DEFINE_RVAL2ENUM(path_data_type, PATH)
 DEFINE_RVAL2ENUM(content, CONTENT)
 DEFINE_RVAL2ENUM(format, FORMAT)
@@ -529,6 +537,20 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_HintMetrics,     "OFF",
                    INT2FIX (CAIRO_HINT_METRICS_OFF));
 
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  /* cairo_color_mode_t */
+  rb_mCairo_ColorMode = rb_define_module_under (rb_mCairo, "ColorMode");
+  rb_define_const (rb_mCairo_ColorMode,     "DEFAULT",
+                   INT2FIX (CAIRO_COLOR_MODE_DEFAULT));
+  rb_define_const (rb_mCairo_ColorMode,     "NO_COLOR",
+                   INT2FIX (CAIRO_COLOR_MODE_NO_COLOR));
+  rb_define_const (rb_mCairo_ColorMode,     "COLOR",
+                   INT2FIX (CAIRO_COLOR_MODE_COLOR));
+
+  rb_mCairo_ColorPalette = rb_define_module_under (rb_mCairo, "ColorPalette");
+  rb_define_const (rb_mCairo_ColorPalette,     "DEFAULT",
+                   INT2FIX (CAIRO_COLOR_PALETTE_DEFAULT));
+#endif
 
   /* cairo_path_data_type_t */
   rb_mCairo_PathDataType = rb_define_module_under (rb_mCairo, "PathDataType");

data/ext/cairo/rb_cairo_context.c

@@ -126,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;
 }
@@ -202,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 ())
@@ -232,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;

data/ext/cairo/rb_cairo_device.c

@@ -215,7 +215,7 @@ cr_device_destroy (VALUE self)
 
   device = _SELF;
   cairo_device_destroy (device);
-  DATA_PTR (self) = NULL;
+  RTYPEDDATA_DATA (self) = NULL;
 
   return self;
 }
@@ -335,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-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2010-2023 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -74,6 +74,9 @@ static VALUE rb_eCairo_TagError;
 #if CAIRO_CHECK_VERSION(1, 17, 6)
 static VALUE rb_eCairo_DirectWriteError;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+static VALUE rb_eCairo_SVGFontError;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -229,6 +232,11 @@ rb_cairo_check_status (cairo_status_t status)
       rb_raise (rb_eCairo_DirectWriteError, "%s", string);
       break;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+    case CAIRO_STATUS_SVG_FONT_ERROR:
+      rb_raise (rb_eCairo_SVGFontError, "%s", string);
+      break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
     case CAIRO_STATUS_LAST_STATUS:
 #else
@@ -340,6 +348,10 @@ rb_cairo__exception_to_status (VALUE exception)
   else if (rb_cairo__is_kind_of (exception, rb_eCairo_DirectWriteError))
     return CAIRO_STATUS_DWRITE_ERROR;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  else if (rb_cairo__is_kind_of (exception, rb_eCairo_SVGFontError))
+    return CAIRO_STATUS_SVG_FONT_ERROR;
+#endif
 
   return -1;
 }
@@ -506,4 +518,10 @@ Init_cairo_exception (void)
     rb_define_class_under (rb_mCairo, "DirectWriteError",
                            rb_eCairo_Error);
 #endif
+
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  rb_eCairo_SVGFontError =
+    rb_define_class_under (rb_mCairo, "SVGFontError",
+                           rb_eCairo_Error);
+#endif
 }

data/ext/cairo/rb_cairo_font_extents.c

@@ -81,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;
 }

data/ext/cairo/rb_cairo_font_face.c

@@ -283,7 +283,7 @@ cr_freetype_font_face_initialize (VALUE self, VALUE path)
     rb_cairo_check_status (status);
   }
 
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }
@@ -332,7 +332,7 @@ cr_toy_font_face_initialize (int argc, VALUE *argv, VALUE self)
 
   face = cairo_toy_font_face_create (family, slant, weight);
   cr_font_face_check_status (face);
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }
@@ -758,7 +758,7 @@ cr_user_font_face_initialize (VALUE self)
   rb_ivar_set (self, cr_id_text_to_glyphs, Qnil);
   rb_ivar_set (self, cr_id_unicode_to_glyph, Qnil);
 
-  DATA_PTR (self) = face;
+  RTYPEDDATA_DATA (self) = face;
 
   return Qnil;
 }

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2005-2023 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -87,7 +87,7 @@ cr_options_create (VALUE self)
 
   options = cairo_font_options_create ();
   cr_options_check_status (options);
-  DATA_PTR (self) = options;
+  RTYPEDDATA_DATA (self) = options;
   return Qnil;
 }
 
@@ -196,6 +196,53 @@ cr_options_get_variations (VALUE self)
 }
 #endif
 
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+static VALUE
+cr_options_set_color_mode (VALUE self, VALUE mode)
+{
+  cairo_font_options_set_color_mode (_SELF (self),
+                                     RVAL2CRCOLORMODE (mode));
+  return self;
+}
+
+static VALUE
+cr_options_get_color_mode (VALUE self)
+{
+  return INT2NUM (cairo_font_options_get_color_mode (_SELF (self)));
+}
+
+static VALUE
+cr_options_set_color_palette (VALUE self, VALUE index)
+{
+  cairo_font_options_set_color_palette (_SELF (self),
+                                        NUM2UINT (index));
+  return self;
+}
+
+static VALUE
+cr_options_get_color_palette (VALUE self)
+{
+  return UINT2NUM (cairo_font_options_get_color_palette (_SELF (self)));
+}
+
+static VALUE
+cr_options_set_custom_palette_color (VALUE self,
+                                     VALUE index,
+                                     VALUE red,
+                                     VALUE green,
+                                     VALUE blue,
+                                     VALUE alpha)
+{
+  cairo_font_options_set_custom_palette_color (_SELF (self),
+                                               NUM2UINT (index),
+                                               NUM2DBL (red),
+                                               NUM2DBL (green),
+                                               NUM2DBL (blue),
+                                               NUM2DBL (alpha));
+  return self;
+}
+#endif
+
 void
 Init_cairo_font_options (void)
 {
@@ -234,6 +281,18 @@ Init_cairo_font_options (void)
   rb_define_method (rb_cCairo_FontOptions, "variations",
                     cr_options_get_variations, 0);
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  rb_define_method (rb_cCairo_FontOptions, "set_color_mode",
+                    cr_options_set_color_mode, 1);
+  rb_define_method (rb_cCairo_FontOptions, "color_mode",
+                    cr_options_get_color_mode, 0);
+  rb_define_method (rb_cCairo_FontOptions, "set_color_palette",
+                    cr_options_set_color_palette, 1);
+  rb_define_method (rb_cCairo_FontOptions, "color_palette",
+                    cr_options_get_color_palette, 0);
+  rb_define_method (rb_cCairo_FontOptions, "set_custom_palette_color",
+                    cr_options_set_custom_palette_color, 5);
+#endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_FontOptions);
 }

data/ext/cairo/rb_cairo_glyph.c

@@ -77,7 +77,7 @@ cr_glyph_initialize (VALUE self, VALUE index, VALUE x, VALUE y)
   glyph->x = NUM2DBL (x);
   glyph->y = NUM2DBL (y);
 
-  DATA_PTR (self) = glyph;
+  RTYPEDDATA_DATA (self) = glyph;
   return Qnil;
 }
 

data/ext/cairo/rb_cairo_matrix.c

@@ -81,7 +81,7 @@ cr_matrix_initialize (VALUE self,
                      NUM2DBL (xx), NUM2DBL (yx),
                      NUM2DBL (xy), NUM2DBL (yy),
                      NUM2DBL (x0), NUM2DBL (y0));
-  DATA_PTR (self) = matrix;
+  RTYPEDDATA_DATA (self) = matrix;
   return Qnil;
 }
 

data/ext/cairo/rb_cairo_path.c

@@ -291,7 +291,7 @@ cr_path_initialize (VALUE self)
   path->status = CAIRO_STATUS_SUCCESS;
   path->data = NULL;
   path->num_data = 0;
-  DATA_PTR (self) = path;
+  RTYPEDDATA_DATA (self) = path;
 
   return Qnil;
 }

data/ext/cairo/rb_cairo_pattern.c

@@ -259,7 +259,7 @@ cr_solid_pattern_initialize (int argc, VALUE *argv, VALUE self)
     }
 
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -270,7 +270,7 @@ cr_surface_pattern_initialize (VALUE self, VALUE surface)
 
   pattern = cairo_pattern_create_for_surface (RVAL2CRSURFACE (surface));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -283,7 +283,7 @@ cr_linear_pattern_initialize (VALUE self, VALUE x0, VALUE y0,
   pattern = cairo_pattern_create_linear (NUM2DBL (x0), NUM2DBL (y0),
                                          NUM2DBL (x1), NUM2DBL (y1));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -298,7 +298,7 @@ cr_radial_pattern_initialize (VALUE self, VALUE cx0, VALUE cy0, VALUE radius0,
                                          NUM2DBL (cx1), NUM2DBL (cy1),
                                          NUM2DBL (radius1));
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -526,7 +526,7 @@ cr_mesh_pattern_initialize (VALUE self)
 
   pattern = cairo_pattern_create_mesh ();
   cr_pattern_check_status (pattern);
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   return Qnil;
 }
 
@@ -924,7 +924,7 @@ cr_raster_source_pattern_initialize (int argc, VALUE *argv, VALUE self)
                                                 content, width, height);
   cr_pattern_check_status (pattern);
 
-  DATA_PTR (self) = pattern;
+  RTYPEDDATA_DATA (self) = pattern;
   rb_iv_set (self, "@acquire", Qnil);
   rb_iv_set (self, "@release", Qnil);
   rb_iv_set (self, "@snapshot", Qnil);

data/ext/cairo/rb_cairo_quartz_surface.c

@@ -134,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;
@@ -169,7 +169,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;
+  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);

data/ext/cairo/rb_cairo_rectangle.c

@@ -12,7 +12,7 @@
 
 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 = {
@@ -39,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

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

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

@@ -280,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;
 }
@@ -534,7 +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);
-  DATA_PTR (self) = NULL;
+  RTYPEDDATA_DATA (self) = NULL;
 
   if (closure && !NIL_P (closure->error))
     rb_exc_raise (closure->error);
@@ -750,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
@@ -1015,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
@@ -1072,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);
@@ -1193,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;                                                          \
@@ -1534,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;
@@ -1610,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;
@@ -1665,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;
@@ -1720,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;
@@ -1797,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;
@@ -1844,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;
@@ -1894,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);
@@ -2016,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;
@@ -2347,7 +2352,7 @@ Init_cairo_surface (void)
     rb_define_class_under (rb_mCairo, "GLTextureSurface", rb_cCairo_GLSurface);
 #ifdef RB_CAIRO_HAS_GL_SURFACE
   rb_define_method (rb_cCairo_GLSurface, "initialize",
-                    cr_gl_surface_initialize, 1);
+                    cr_gl_surface_initialize, -1);
 
   rb_define_method (rb_cCairo_GLSurface, "set_size",
                     cr_gl_surface_set_size, 2);
@@ -2361,7 +2366,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_GLSurface);
 
   rb_define_method (rb_cCairo_GLTextureSurface, "initialize",
-                    cr_gl_texture_surface_initialize, 1);
+                    cr_gl_texture_surface_initialize, -1);
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_GLTextureSurface);
 #endif

data/ext/cairo/rb_cairo_text_cluster.c

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

@@ -82,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/lib/cairo.rb

@@ -1,28 +1,3 @@
-# vim: filetype=ruby:expandtab:shiftwidth=2:tabstop=8:softtabstop=2 :
-
-if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
-  require "pathname"
-  base_dir = Pathname(File.dirname(__FILE__))
-  base_dir = base_dir.parent + "vendor" + "local"
-  if base_dir.exist?
-    base_dir = base_dir.to_s.gsub(/\//, "\\")
-    begin
-      require "ruby_installer/runtime"
-    rescue LoadError
-    else
-      RubyInstaller::Runtime.add_dll_directory("#{base_dir}\\bin")
-    end
-    ENV["PATH"] = %w(bin lib).collect do |dir|
-      "#{base_dir}\\#{dir};"
-    end.join("") + ENV["PATH"]
-  else
-    require "rbconfig"
-    ENV["PATH"] = %w(bin lib).collect do |dir|
-      "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
-    end.join("") + ENV["PATH"]
-  end
-end
-
 require "time"
 
 module Cairo
@@ -46,13 +21,7 @@ end
 
 require "cairo/color"
 require "cairo/paper"
-
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/cairo.so"
-rescue LoadError
-  require "cairo.so"
-end
+require "cairo.so"
 require "cairo/constants"
 
 module Cairo

data/test/test_constants.rb

@@ -24,4 +24,16 @@ class ConstantsTest < Test::Unit::TestCase
     send(assertion, Cairo::MimeType, :JBIG2_GLOBAL)
     send(assertion, Cairo::MimeType, :JBIG2_GLOBAL_ID)
   end
+
+  def test_new_constants_since_1_17_8
+    if Cairo.satisfied_version?(1, 17, 8)
+      assert_const_defined(Cairo::ColorMode, :DEFAULT)
+      assert_const_defined(Cairo::ColorMode, :COLOR)
+      assert_const_defined(Cairo::ColorMode, :NO_COLOR)
+      assert_const_defined(Cairo::ColorPalette, :DEFAULT)
+    else
+      assert_not_const_defined(Cairo, :ColorMode)
+      assert_not_const_defined(Cairo, :ColorPalette)
+    end
+  end
 end

data/test/test_context.rb

@@ -105,6 +105,7 @@ class ContextTest < Test::Unit::TestCase
   sub_test_case("#tag") do
     setup do
       only_cairo_version(1, 15, 4)
+      only_not_windows
     end
 
     test("LINK") do

data/test/test_font_options.rb

@@ -62,4 +62,23 @@ class FontOptionsTest < Test::Unit::TestCase
     @options.variations = "wdth=200"
     assert_equal("wdth=200", @options.variations)
   end
+
+  test "color mode" do
+    only_cairo_version(1, 17, 8)
+    assert_equal(Cairo::ColorMode::DEFAULT, @options.color_mode)
+    @options.color_mode = Cairo::ColorMode::COLOR
+    assert_equal(Cairo::ColorMode::COLOR, @options.color_mode)
+  end
+
+  test "color palette" do
+    only_cairo_version(1, 17, 8)
+    assert_equal(Cairo::ColorPalette::DEFAULT, @options.color_palette)
+    @options.set_custom_palette_color(1,
+                                      1.0,
+                                      0.2,
+                                      0.0,
+                                      0.8)
+    @options.color_palette = 1
+    assert_equal(1, @options.color_palette)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.17.7
+  version: 1.17.9
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-31 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: native-package-installer
@@ -219,7 +219,7 @@ metadata:
   mailing_list_uri: https://cairographics.org/cgi-bin/mailman/listinfo/cairo
   source_code_uri: https://github.com/rcairo/rcairo
   msys2_mingw_dependencies: cairo
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cairo >= 1.2.0
-rubygems_version: 3.4.0.dev
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby bindings for cairo
 test_files: