cairo 1.16.4 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931c34c80b0bec428101eec72233a8a79c93280f669b697a6b0e9f75984717a4
-  data.tar.gz: c47c77a46ad816182a80145309577baf179ad518ffc120a41844103f0ba26562
+  metadata.gz: f8697772a6b5b607085779a06a8d9f419cd015fa247a282eb9f68d3f885a33dc
+  data.tar.gz: ae49fe2f767c18a5f5af428d869daf67bf74a6e559d2327d28a5d097c7cf5841
 SHA512:
-  metadata.gz: bad78b7e2cd19631b96108320d086ebfce58caf15d819080ebfa8777d1f126c5a96fc889d9482fa7baa9b8c427a5d732020c59bd5f49e81abca376ee7a407544
-  data.tar.gz: 6c7d14eaabc9562e0bd509faedbe6dac9fc27603ed330b64ecc6067a339bfadfa10d45f1a863fc33bd5b8d099136e9269f056210d893ff414197cd3eac852ddf
+  metadata.gz: 7e52b47179fe0492eec020b6458f43309c1da04f003905ee64ebf8734de7d49eba241ef8343ed18c85d187c0b42d93b1bee91274b441e690f090818bbd3e65a8
+  data.tar.gz: bccb35d0e78ae2c8d6e4a3d7753fd9a5b3ab791cfd533c7a2fbb2294cf2eb6032004d638b9287eccf4fb689ad26b1a7bebe95b37a48f4661224e47844252092e

data/NEWS

@@ -1,3 +1,32 @@
+Release 1.16.5 (2020-02-03) Sutou Kouhei <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added Cairo::Context#raw_address for integration with other
+    libraries.
+    [GitHub#59][Reported by kojix2]
+
+Fixes
+-----
+
+  * Changed to use only ASCII for color name.
+    [GitHub#57][Reported by spoolkitamura]
+
+  * Fixed the number of arguments of the following methods:
+
+    * Cairo::Surface#copy_page
+
+    * Cairo::Surface#show_page
+
+Thanks
+------
+
+  * spoolkitamura
+
+  * kojix2
+
 Release 1.16.4 (2019-03-09) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/ext/cairo/extconf.rb

@@ -48,11 +48,12 @@ 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
 

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

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

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

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/colors.rb

@@ -90,8 +90,6 @@ module Cairo
     AUROMETALSAURUS = RGB.new(0.43137254901960786, 0.4980392156862745, 0.5019607843137255)
     # Avocado: #568203: (86, 130, 3)
     AVOCADO = RGB.new(0.33725490196078434, 0.5098039215686274, 0.011764705882352941)
-    # Awesome: #FF2052: (255, 32, 82)
-    AWESOME = RGB.new(1.0, 0.12549019607843137, 0.3215686274509804)
     # Axolotl: #63775B: (99, 119, 91)
     AXOLOTL = RGB.new(0.38823529411764707, 0.4666666666666667, 0.3568627450980392)
     # Azure: #007FFF: (0, 127, 255)
@@ -141,7 +139,7 @@ module Cairo
     # Beige: #F5F5DC: (245, 245, 220)
     BEIGE = RGB.new(0.9607843137254902, 0.9607843137254902, 0.8627450980392157)
     # Big dip o’ruby: #9C2542: (156, 37, 66)
-    BIG_DIP_O’RUBY = RGB.new(0.611764705882353, 0.1450980392156863, 0.25882352941176473)
+    BIG_DIP_ORUBY = RGB.new(0.611764705882353, 0.1450980392156863, 0.25882352941176473)
     # Big Foot Feet: #E88E5A: (232, 142, 90)
     BIG_FOOT_FEET = RGB.new(0.9098039215686274, 0.5568627450980392, 0.35294117647058826)
     # Bisque: #FFE4C4: (255, 228, 196)
@@ -373,9 +371,9 @@ module Cairo
     # Cadmium violet: #7F3E98: (127, 62, 152)
     CADMIUM_VIOLET = RGB.new(0.4980392156862745, 0.24313725490196078, 0.596078431372549)
     # Café au lait: #A67B5B: (166, 123, 91)
-    CAFÉ_AU_LAIT = RGB.new(0.6509803921568628, 0.4823529411764706, 0.3568627450980392)
+    CAFE_AU_LAIT = RGB.new(0.6509803921568628, 0.4823529411764706, 0.3568627450980392)
     # Café noir: #4B3621: (75, 54, 33)
-    CAFÉ_NOIR = RGB.new(0.29411764705882354, 0.21176470588235294, 0.12941176470588237)
+    CAFE_NOIR = RGB.new(0.29411764705882354, 0.21176470588235294, 0.12941176470588237)
     # Cal Poly Pomona green: #1E4D2B: (30, 77, 43)
     CAL_POLY_POMONA_GREEN = RGB.new(0.11764705882352941, 0.30196078431372547, 0.16862745098039217)
     # Calamansi: #FCFFA4: (252, 255, 164)
@@ -1215,7 +1213,7 @@ module Cairo
     # Guyabano: #F8F8F8: (248, 248, 248)
     GUYABANO = RGB.new(0.9725490196078431, 0.9725490196078431, 0.9725490196078431)
     # Halayà úbe: #663854: (102, 55, 84)
-    HALAYÀ_ÚBE = RGB.new(0.4, 0.21568627450980393, 0.32941176470588235)
+    HALAYA_UBE = RGB.new(0.4, 0.21568627450980393, 0.32941176470588235)
     # Halloween orange: #EB6123: (235, 97, 35)
     HALLOWEEN_ORANGE = RGB.new(0.9215686274509803, 0.3803921568627451, 0.13725490196078433)
     # Han blue: #446CCF: (68, 108, 207)
@@ -2118,6 +2116,8 @@ module Cairo
     PAYNES_GREY = RGB.new(0.3254901960784314, 0.40784313725490196, 0.47058823529411764)
     # Peach: #FFE5B4: (255, 229, 180)
     PEACH = RGB.new(1.0, 0.8980392156862745, 0.7058823529411765)
+    # Peach (Crayola): #FFCBA4: (255, 203, 164)
+    PEACH_CRAYOLA = RGB.new(1.0, 0.796078431372549, 0.6431372549019608)
     # Peach-orange: #FFCC99: (255, 204, 153)
     PEACH_ORANGE = RGB.new(1.0, 0.8, 0.6)
     # Peach puff: #FFDAB9: (255, 218, 185)

data/test/run-test.rb

@@ -7,7 +7,9 @@ test_dir = File.join(base_dir, "test")
 
 if system("which make >/dev/null 2>&1")
   Dir.chdir(base_dir) do
-    system("make > /dev/null") or exit(1)
+    if File.exist?("Makefile")
+      system("make > /dev/null") or exit(1)
+    end
   end
 end
 

data/test/test_colors.rb

@@ -263,12 +263,6 @@ class ColorsTest < Test::Unit::TestCase
                  Cairo::Color::AVOCADO.to_s)
   end
 
-  # Awesome: #FF2052: (255, 32, 82)
-  test("Awesome") do
-    assert_equal("\#%02X%02X%02XFF" % [255, 32, 82],
-                 Cairo::Color::AWESOME.to_s)
-  end
-
   # Axolotl: #63775B: (99, 119, 91)
   test("Axolotl") do
     assert_equal("\#%02X%02X%02XFF" % [99, 119, 91],
@@ -416,7 +410,7 @@ class ColorsTest < Test::Unit::TestCase
   # Big dip o’ruby: #9C2542: (156, 37, 66)
   test("Big dip o\u2019ruby") do
     assert_equal("\#%02X%02X%02XFF" % [156, 37, 66],
-                 Cairo::Color::BIG_DIP_O’RUBY.to_s)
+                 Cairo::Color::BIG_DIP_ORUBY.to_s)
   end
 
   # Big Foot Feet: #E88E5A: (232, 142, 90)
@@ -1112,13 +1106,13 @@ class ColorsTest < Test::Unit::TestCase
   # Café au lait: #A67B5B: (166, 123, 91)
   test("Caf\u00E9 au lait") do
     assert_equal("\#%02X%02X%02XFF" % [166, 123, 91],
-                 Cairo::Color::CAFÉ_AU_LAIT.to_s)
+                 Cairo::Color::CAFE_AU_LAIT.to_s)
   end
 
   # Café noir: #4B3621: (75, 54, 33)
   test("Caf\u00E9 noir") do
     assert_equal("\#%02X%02X%02XFF" % [75, 54, 33],
-                 Cairo::Color::CAFÉ_NOIR.to_s)
+                 Cairo::Color::CAFE_NOIR.to_s)
   end
 
   # Cal Poly Pomona green: #1E4D2B: (30, 77, 43)
@@ -3638,7 +3632,7 @@ class ColorsTest < Test::Unit::TestCase
   # Halayà úbe: #663854: (102, 55, 84)
   test("Halay\u00E0 \u00FAbe") do
     assert_equal("\#%02X%02X%02XFF" % [102, 55, 84],
-                 Cairo::Color::HALAYÀ_ÚBE.to_s)
+                 Cairo::Color::HALAYA_UBE.to_s)
   end
 
   # Halloween orange: #EB6123: (235, 97, 35)
@@ -6347,6 +6341,12 @@ class ColorsTest < Test::Unit::TestCase
                  Cairo::Color::PEACH.to_s)
   end
 
+  # Peach (Crayola): #FFCBA4: (255, 203, 164)
+  test("Peach (Crayola)") do
+    assert_equal("\#%02X%02X%02XFF" % [255, 203, 164],
+                 Cairo::Color::PEACH_CRAYOLA.to_s)
+  end
+
   # Peach-orange: #FFCC99: (255, 204, 153)
   test("Peach-orange") do
     assert_equal("\#%02X%02X%02XFF" % [255, 204, 153],

data/test/test_context.rb

@@ -122,4 +122,11 @@ class ContextTest < Test::Unit::TestCase
                    uris)
     end
   end
+
+  def test_raw_address
+    context = Cairo::Context.new(@surface)
+    assert do
+      context.raw_address > 0
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -215,36 +215,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for cairo
 test_files:
-- test/test_text_cluster.rb
+- test/test_xml_surface.rb
+- test/test_tee_surface.rb
+- test/test_pdf_surface.rb
+- test/test_text_to_glyphs_data.rb
 - test/test_text_extents.rb
-- test/test_font_extents.rb
-- test/test_colors.rb
-- test/test_scaled_font.rb
+- test/test_context.rb
+- test/test_recording_surface.rb
+- test/helper.rb
+- test/run-test.rb
 - test/test_paper.rb
+- test/test_exception.rb
 - test/test_svg_surface.rb
 - test/test_script_device.rb
-- test/test_xml_device.rb
-- test/test_script_surface.rb
-- test/test_context.rb
-- test/helper.rb
+- test/test_font_extents.rb
+- test/test_color.rb
+- test/test_text_cluster.rb
+- test/test_colors.rb
 - test/test_font_face.rb
+- test/test_surface.rb
+- test/test_region.rb
 - test/test_raster_source_pattern.rb
 - test/test_image_surface.rb
 - test/test_quartz_image_surface.rb
-- test/run-test.rb
-- test/test_recording_surface.rb
-- test/test_tee_surface.rb
-- test/test_font_options.rb
-- test/test_color.rb
 - test/test_constants.rb
-- test/test_text_to_glyphs_data.rb
-- test/test_pdf_surface.rb
-- test/test_surface.rb
-- test/test_exception.rb
-- test/test_xml_surface.rb
-- test/test_region.rb
+- test/test_xml_device.rb
+- test/test_script_surface.rb
+- test/test_scaled_font.rb
+- test/test_font_options.rb