cairo 1.17.7 → 1.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ac730747ea5dada591e534a7c0653a0d1ad3fa3962dfdd01173e0074ff835c
-  data.tar.gz: 2fbccb304f8b4dbd3a89df42c9f1779b45a84b2f4c9be5ab591992eb9d7c3d31
+  metadata.gz: dffa934fa956305e9ed3ba9a9a5c92956c61c09277ea1723ceb69c1bee1b5c72
+  data.tar.gz: c4a6b1aa7bc5e3e00ca1bb388272d75c726fb20a1366dcbc2f15513d06177cbd
 SHA512:
-  metadata.gz: 389eeca0e8c453e3c1b2ebe10053a1713c1c1ae93b22e46100b5bc1c39d566f00f60a1c676ae288e06fa9fdea6f24db8e107d53355bd52bc0e067e5b8b4fe073
-  data.tar.gz: d107b587d530433a0288f73a5b8d85710e2923213347f88e09de92562645dbcd9e501f8f9ab1bd74bb9ae13559ee94999e94c7555cd96a345b9d1d75965b961c
+  metadata.gz: 163b19b0d0fdbfadd8117629b95fbd51f97a84617bc77366eb5083b4e631bc3eb863c1daa51ce6e79fd0cfbe462f69215b6bc3548c9a3960e95861c799f53515
+  data.tar.gz: c266cd0dc3e254bccecae19b9f8dfb688c55404cd348446d2e34d67d263e07b1244851292aa1d8c1140e30bfa8162af1135855b99eb1da7af54c9d67d77aefba

data/NEWS

@@ -1,3 +1,17 @@
+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/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 8
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

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_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

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

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;

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.17.7
+  version: 1.17.8
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-31 00:00:00.000000000 Z
+date: 2022-09-01 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
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - cairo >= 1.2.0
 rubygems_version: 3.4.0.dev
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby bindings for cairo
 test_files: