cairo 1.16.1 → 1.16.6

data/ext/cairo/cairo.def

@@ -50,7 +50,6 @@ EXPORTS
     rb_cCairo_DRMSurface      DATA
     rb_cCairo_TeeSurface      DATA
     rb_cCairo_XMLSurface      DATA
-    rb_cCairo_SkiaSurface     DATA
     rb_cCairo_SubSurface      DATA
     rb_cCairo_CoglSurface     DATA
 

data/ext/cairo/extconf.rb

@@ -22,21 +22,11 @@ package = "cairo"
 module_name = "cairo"
 major, minor, micro = 1, 2, 0
 
-base_dir = Pathname(__FILE__).dirname.parent.parent
-checking_for(checking_message("Win32 OS")) do
-  case RUBY_PLATFORM
-  when /mingw|mswin32/
-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
-    import_library_name = "libruby-#{module_name}.a"
-    $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
-    $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    if with_config('vendor-override', binary_base_dir.exist?)
-      $CFLAGS += " -I#{binary_base_dir}/include"
-      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-      PKGConfig.add_path(pkg_config_dir.to_s)
-      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
-    end
+checking_for(checking_message("Homebrew")) do
+  platform = NativePackageInstaller::Platform.detect
+  if platform.is_a?(NativePackageInstaller::Platform::Homebrew)
+    libffi_prefix = `brew --prefix libffi`.chomp
+    PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
     true
   else
     false
@@ -58,17 +48,18 @@ def required_pkg_config_package(package_info, native_package_info=nil)
 end
 
 unless required_pkg_config_package([package, major, minor, micro],
+                                   :arch_linux => "cairo",
                                    :debian => "libcairo2-dev",
-                                   :redhat => "cairo-devel",
                                    :homebrew => "cairo",
                                    :macports => "cairo",
-                                   :msys2 => "cairo")
+                                   :msys2 => "cairo",
+                                   :redhat => "cairo-devel")
   exit(false)
 end
 
 PKGConfig.have_package("cairo-ft")
 
-checking_for(checking_message("Mac OS X")) do
+checking_for(checking_message("macOS")) do
   case RUBY_PLATFORM
   when /darwin/
     if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2018 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2020 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -53,17 +53,9 @@
 
 RB_CAIRO_BEGIN_DECLS
 
-#if defined(RUBY_CAIRO_PLATFORM_WIN32) && !defined(RB_CAIRO_PLATFORM_WIN32)
-#  define RB_CAIRO_PLATFORM_WIN32 RUBY_CAIRO_PLATFORM_WIN32
-#endif
-
-#if defined(RUBY_CAIRO_STATIC_COMPILATION) && !defined(RB_CAIRO_STATIC_COMPILATION)
-#  define RB_CAIRO_STATIC_COMPILATION RUBY_CAIRO_STATIC_COMPILATION
-#endif
-
-#if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(RB_CAIRO_STATIC_COMPILATION)
+#ifdef __WIN32__
 #  ifdef RB_CAIRO_COMPILATION
-#    define RB_CAIRO_VAR __declspec(dllexport)
+#    define RB_CAIRO_VAR extern __declspec(dllexport)
 #  else
 #    define RB_CAIRO_VAR extern __declspec(dllimport)
 #  endif
@@ -73,7 +65,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 16
-#define RB_CAIRO_VERSION_MICRO 1
+#define RB_CAIRO_VERSION_MICRO 6
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -125,7 +117,6 @@ RB_CAIRO_VAR VALUE rb_cCairo_GLTextureSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_DRMSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_TeeSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_XMLSurface;
-RB_CAIRO_VAR VALUE rb_cCairo_SkiaSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_SubSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_Device;
 RB_CAIRO_VAR VALUE rb_cCairo_DRMDevice;

data/ext/cairo/rb_cairo_constants.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -92,7 +92,9 @@ VALUE rb_mCairo_SVGUnit = Qnil;
 #else
 #  define CAIRO_FORMAT_MIN CAIRO_FORMAT_ARGB32
 #endif
-#if CAIRO_CHECK_VERSION(1, 11, 4)
+#if CAIRO_CHECK_VERSION(1, 17, 2)
+#  define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGBA128F
+#elif CAIRO_CHECK_VERSION(1, 11, 4)
 #  define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB30
 #else
 #  define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
@@ -566,6 +568,12 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_Format,    "RGB30",
                    INT2FIX (CAIRO_FORMAT_RGB30));
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 2)
+  rb_define_const (rb_mCairo_Format,    "RGB96F",
+                   INT2FIX (CAIRO_FORMAT_RGB96F));
+  rb_define_const (rb_mCairo_Format,    "RGBA128F",
+                   INT2FIX (CAIRO_FORMAT_RGBA128F));
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 5, 8)
   rb_define_singleton_method (rb_mCairo_Format, "stride_for_width",

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -240,6 +240,12 @@ cr_to_ptr (VALUE self)
                      1, PTR2NUM (_SELF));
 }
 
+static VALUE
+cr_raw_address (VALUE self)
+{
+  return PTR2NUM (_SELF);
+}
+
 
 static VALUE
 cr_restore (VALUE self)
@@ -351,7 +357,7 @@ cr_set_source_rgb (int argc, VALUE *argv, VALUE self)
   if (n == 1 && rb_cairo__is_kind_of (red, rb_cArray))
     {
       VALUE ary = red;
-      n = RARRAY_LEN (ary);
+      n = (int) RARRAY_LEN (ary);
       red = rb_ary_entry (ary, 0);
       green = rb_ary_entry (ary, 1);
       blue = rb_ary_entry (ary, 2);
@@ -388,7 +394,7 @@ cr_set_source_rgba (int argc, VALUE *argv, VALUE self)
   if (n == 1 && rb_cairo__is_kind_of (red, rb_cArray))
     {
       VALUE ary = red;
-      n = RARRAY_LEN (ary);
+      n = (int) RARRAY_LEN (ary);
       red = rb_ary_entry (ary, 0);
       green = rb_ary_entry (ary, 1);
       blue = rb_ary_entry (ary, 2);
@@ -567,7 +573,7 @@ cr_set_dash (int argc, VALUE *argv, VALUE self)
     {
       int i, length;
       double *values;
-      length = RARRAY_LEN (dash_array);
+      length = (int) RARRAY_LEN (dash_array);
       values = ALLOCA_N (double, length);
       if (!values)
         {
@@ -1323,7 +1329,7 @@ cr_show_text_glyphs (VALUE self, VALUE rb_utf8, VALUE rb_glyphs,
 
   cr = _SELF;
   utf8 = RSTRING_PTR (rb_utf8);
-  utf8_len = RSTRING_LEN (rb_utf8);
+  utf8_len = (int) RSTRING_LEN (rb_utf8);
   rb_cairo__glyphs_from_ruby_object (rb_glyphs, &glyphs, &num_glyphs);
   rb_cairo__text_clusters_from_ruby_object (rb_clusters,
                                             &clusters, &num_clusters);
@@ -1874,6 +1880,8 @@ Init_cairo_context (void)
 
   rb_define_method (rb_cCairo_Context, "to_ptr", cr_to_ptr, 0);
 
+  rb_define_method (rb_cCairo_Context, "raw_address", cr_raw_address, 0);
+
 #if CAIRO_CHECK_VERSION(1, 15, 4)
   /* Logical structure tagging functions */
   {

data/ext/cairo/rb_cairo_device.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2010-2012 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2010-2019 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -343,7 +343,7 @@ cr_script_device_write_comment (VALUE self, VALUE comment)
   device = _SELF;
   cairo_script_write_comment (device,
                               StringValuePtr (comment),
-                              RSTRING_LEN (comment));
+                              (int) RSTRING_LEN (comment));
   cr_device_check_status (device);
   return Qnil;
 }

data/ext/cairo/rb_cairo_font_face.c

@@ -5,6 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 14:13:58 $
  *
+ * Copyright 2003-2019 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -148,7 +149,11 @@ cr_font_face_freetype_supported_p (VALUE klass)
 
 #ifdef CAIRO_HAS_FT_FONT
 static VALUE
-cr_freetype_done_library (VALUE data)
+cr_freetype_done_library (VALUE yielded_arg,
+                          VALUE callback_arg,
+                          int argc,
+                          const VALUE *argv,
+                          VALUE block_arg)
 {
   cr_freetype_finishing = CR_TRUE;
   if (cr_freetype_n_faces == 0)

data/ext/cairo/rb_cairo_io.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -44,11 +44,11 @@ rb_cairo__io_closure_free (void *closure)
 }
 
 static VALUE
-rb_cairo__io_func_rescue (VALUE io_closure)
+rb_cairo__io_func_rescue (VALUE io_closure, VALUE error)
 {
   rb_cairo__io_callback_closure_t *closure;
   closure = (rb_cairo__io_callback_closure_t *)io_closure;
-  closure->error = RB_ERRINFO;
+  closure->error = error;
   return Qnil;
 }
 
@@ -70,7 +70,7 @@ rb_cairo__io_write_func_invoke (VALUE write_closure)
   VALUE output, data;
   long written_bytes;
   rb_cairo__io_callback_closure_t *closure;
-  unsigned int length;
+  long length;
 
   closure = (rb_cairo__io_callback_closure_t *)write_closure;
 
@@ -118,7 +118,7 @@ rb_cairo__io_read_func_invoke (VALUE read_closure)
 {
   VALUE input, result;
   rb_cairo__io_callback_closure_t *closure;
-  unsigned int length, rest;
+  long length, rest;
 
   closure = (rb_cairo__io_callback_closure_t *)read_closure;
   input = closure->target;
@@ -133,7 +133,7 @@ rb_cairo__io_read_func_invoke (VALUE read_closure)
                                  rb_cairo__io_id_read, 1, INT2NUM (rest)));
     }
 
-  memcpy ((void *)closure->data, (const void *)StringValuePtr (result), length);
+  memcpy ((void *)closure->data, (const void *) StringValuePtr (result), length);
 
   return Qnil;
 }

data/ext/cairo/rb_cairo_pattern.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-06-12 10:59:54 $
  *
- * Copyright 2012 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2012-2019 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -208,7 +208,7 @@ cr_solid_pattern_initialize (int argc, VALUE *argv, VALUE self)
       (RARRAY_LEN (red) == 3 || RARRAY_LEN (red) == 4))
     {
       VALUE ary = red;
-      n = RARRAY_LEN (ary);
+      n = (int) RARRAY_LEN (ary);
 
       red = rb_ary_entry (ary, 0);
       green = rb_ary_entry (ary, 1);
@@ -315,7 +315,7 @@ cr_gradient_pattern_add_color_stop_generic (int argc, VALUE *argv, VALUE self)
   if (n == 2 && rb_cairo__is_kind_of (red, rb_cArray))
     {
       VALUE ary = red;
-      n = RARRAY_LEN (ary) + 1;
+      n = (int) RARRAY_LEN (ary) + 1;
 
       red = rb_ary_entry (ary, 0);
       green = rb_ary_entry (ary, 1);

data/ext/cairo/rb_cairo_private.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -64,9 +64,8 @@ rb_cairo__const_get (VALUE name, const char *prefix)
   normalized_name_len = strlen (normalized_name);
 
   const_name = ALLOCA_N (char, prefix_len + normalized_name_len + 1);
-  strncpy (const_name, prefix, prefix_len);
-  strncpy (const_name + prefix_len, normalized_name, normalized_name_len);
-  const_name[prefix_len + normalized_name_len] = '\0';
+  strcpy (const_name, prefix);
+  strcpy (const_name + prefix_len, normalized_name);
 
   return rb_const_get (rb_mCairo, rb_intern (const_name));
 }
@@ -160,7 +159,7 @@ rb_cairo__glyphs_from_ruby_object (VALUE rb_glyphs,
       return;
     }
 
-  len = RARRAY_LEN (rb_glyphs);
+  len = (int) RARRAY_LEN (rb_glyphs);
   if (*num_glyphs < len)
     *glyphs = cairo_glyph_allocate (len);
   *num_glyphs = len;
@@ -202,7 +201,7 @@ rb_cairo__text_clusters_from_ruby_object (VALUE rb_clusters,
       return;
     }
 
-  len = RARRAY_LEN (rb_clusters);
+  len = (int) RARRAY_LEN (rb_clusters);
   if (*num_clusters < len)
     *clusters = cairo_text_cluster_allocate (len);
   *num_clusters = len;

data/ext/cairo/rb_cairo_private.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -78,7 +78,7 @@ extern void Init_cairo_text_cluster (void);
 do                                                              \
   {                                                             \
     Check_Type (rb_array, T_ARRAY);                             \
-    length = RARRAY_LEN (rb_array);                             \
+    length = (int) RARRAY_LEN (rb_array);                       \
     glyphs = ALLOCA_N (cairo_glyph_t, length);                  \
                                                                 \
     if (!glyphs)                                                \

data/ext/cairo/rb_cairo_scaled_font.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -132,7 +132,7 @@ cr_scaled_font_text_to_glyphs (VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_utf8
   x = NUM2DBL (rb_x);
   y = NUM2DBL (rb_y);
   utf8 = RSTRING_PTR (rb_utf8);
-  utf8_len = RSTRING_LEN (rb_utf8);
+  utf8_len = (int) RSTRING_LEN (rb_utf8);
 
   status = cairo_scaled_font_text_to_glyphs (_SELF (self),
                                              x, y, utf8, utf8_len,

data/ext/cairo/rb_cairo_surface.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2019 Kouhei Sutou <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>
@@ -2107,9 +2107,9 @@ Init_cairo_surface (void)
 #endif
 #if CAIRO_CHECK_VERSION(1, 5, 2)
   rb_define_method (rb_cCairo_Surface, "copy_page",
-                    cr_surface_copy_page, 2);
+                    cr_surface_copy_page, 0);
   rb_define_method (rb_cCairo_Surface, "show_page",
-                    cr_surface_show_page, 2);
+                    cr_surface_show_page, 0);
 #endif
 
 #ifdef CAIRO_HAS_PNG_FUNCTIONS

data/lib/cairo/color.rb

@@ -14,7 +14,7 @@ module Cairo
           _, *value = value if [:rgb, :rgba].include?(value.first)
           RGB.new(*value)
         end
-      when /\A#/ #
+      when /\A\#/
         parse_hex_color(value)
       when String, Symbol
         name = Cairo.normalize_const_name(value)
@@ -34,16 +34,16 @@ module Cairo
     HEX_RE = "(?i:[a-f\\d])"
     def parse_hex_color(value)
       case value
-      when /\A#((?:#{HEX_RE}){3,4})\z/ #
+      when /\A\#((?:#{HEX_RE}){3,4})\z/
         RGB.new(*$1.scan(/./).collect {|part| part.hex / 15.0})
-      when /\A#((?:#{HEX_RE}{2,2}){3,4})\z/ #
+      when /\A\#((?:#{HEX_RE}{2,2}){3,4})\z/
         RGB.new(*$1.scan(/.{2,2}/).collect {|part| part.hex / 255.0})
-      when /\A#((?:#{HEX_RE}{4,4}){3,4})\z/ #
+      when /\A\#((?:#{HEX_RE}{4,4}){3,4})\z/
         RGB.new(*$1.scan(/.{4,4}/).collect {|part| part.hex / 65535.0})
       else
         message = "invalid hex color format: #{value} should be "
-        message << "#RGB, #RGBA, #RRGGBB, #RRGGBBAA, #RRRRGGGGBBBB "
-        message << "or #RRRRGGGGBBBBAAAA"
+        message << "\#RGB, \#RGBA, \#RRGGBB, \#RRGGBBAA, \#RRRRGGGGBBBB "
+        message << "or \#RRRRGGGGBBBBAAAA"
         raise ArgumentError, message
       end
     end
@@ -106,7 +106,7 @@ module Cairo
       alias_method :to_ary, :to_a
 
       def to_s
-        "#%02X%02X%02X%02X" % to_a.collect {|v| (v * 255).ceil}
+        "#%02X%02X%02X%02X" % to_a.collect {|v| (v * 255).round(1)}
       end
 
       def to_rgb