cairo 1.15.10-x86-mingw32 → 1.15.11-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20fa92dc92920e16c89b014f9c25e50f655f38e8
-  data.tar.gz: d6605d13fa525782c1b217101626a2ce51923820
+  metadata.gz: 8bab33d2692b135861df57eaeaaf732b9583327b
+  data.tar.gz: aaeac71634de1afede71ec13730eeaaefb6bea6d
 SHA512:
-  metadata.gz: bc14ca9b87c823ca8fff927fba373a27ecf294a28e66bce30f45eeaee0d30fd4348586a62a24189d2a154dd26e5d3fdff2df07f4f17aa69bba2a1edd8554228c
-  data.tar.gz: e1c5e7caca2c4fdc7e5062dc48b9f6ac4d7e23b92cb4a8365466d847a62fbd28fefa2ca6a63670f661e7297fb62635fc3933ccbfd6caa24d8dd2ad1732cdb82f
+  metadata.gz: ceec6215b74e40fceec1db580aa50a8ed25d62a7c3d8f73e85e710fb22996f280267982f2bbaf0dfdb5d5b009ee9fabcecb1b2dc717d5d8ae3e489a5457ab887
+  data.tar.gz: e29cace75ff643877b35b773dae0d462f8dd18b5bd536dffc6cd3e50c645e8d0c3f3ca521a4f02a3e7e6d6839bee696e4269b897836e43c9eb2b0082ad7d8de2

data/NEWS

@@ -1,3 +1,41 @@
+Release 1.15.11 (2017-12-14) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added cairo 1.15.10 support.
+
+    * Added Cairo::SVGUnit
+
+    * Added Cairo::SVGSurface#document_unit
+
+    * Added Cairo::SVGSurface#document_unit=
+
+    * Added Cairo::MIMEType::CCITT_FAX
+
+    * Added Cairo::MIMEType::CCITT_FAX_PARAMS
+
+    * Added Cairo::MIMEType::EPS
+
+    * Added Cairo::MIMEType::EPS_PARAMS
+
+  * test: Updated expected value for cairo 1.15.
+    [GitHub#50][Reported by Mamoru TASAKA]
+
+  * Windows: Updated bundled libraries:
+
+    * libpng: 1.6.32 -> 1.6.34
+
+    * libxml2: 2.9.6 -> 2.9.7
+
+    * cairo: 1.15.8 -> 1.15.10
+
+Thanks
+------
+
+  * Mamoru TASAKA
+
 Release 1.15.10 (2017-10-15) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/Rakefile

@@ -444,7 +444,7 @@ end
 
 windows_task = WindowsTask.new(spec) do |task|
   zlib_version = "1.2.11"
-  libpng_version = "1.6.32"
+  libpng_version = "1.6.34"
   freetype_version = "2.8.1"
   task.packages = [
     {
@@ -477,7 +477,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libxml2",
-      :version => "2.9.6",
+      :version => "2.9.7",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -511,7 +511,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.15.8",
+      :version => "1.15.10",
       :download_site => :cairo_snapshots,
       :windows => {
         :built_file => "bin/libcairo-2.dll",

data/ext/cairo/cairo.def

@@ -85,6 +85,10 @@ EXPORTS
     rb_mCairo_TextClusterFlag DATA
     rb_mCairo_ScriptMode      DATA
     rb_mCairo_MimeType        DATA
+    rb_mCairo_RegionOverlap   DATA
+    rb_mCairo_PDFOutlineFlags DATA
+    rb_mCairo_PDFMetadata     DATA
+    rb_mCairo_SVGUnit         DATA
 
     rb_mCairo_Color           DATA
     rb_cCairo_Color_Base      DATA

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 10
+#define RB_CAIRO_VERSION_MICRO 11
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -163,6 +163,7 @@ RB_CAIRO_VAR VALUE rb_mCairo_MimeType;
 RB_CAIRO_VAR VALUE rb_mCairo_RegionOverlap;
 RB_CAIRO_VAR VALUE rb_mCairo_PDFOutlineFlags;
 RB_CAIRO_VAR VALUE rb_mCairo_PDFMetadata;
+RB_CAIRO_VAR VALUE rb_mCairo_SVGUnit;
 RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 RB_CAIRO_VAR VALUE rb_cCairo_Paper;
@@ -305,6 +306,9 @@ VALUE                 rb_cairo_device_to_ruby_object         (cairo_device_t *de
 #define RVAL2CRPDFOUTLINEFLAGS(obj) (rb_cairo_pdf_outline_flags_from_ruby_object(obj))
 #define RVAL2CRPDFMETADATA(obj) (rb_cairo_pdf_metadata_from_ruby_object(obj))
 #endif
+#if CAIRO_CHECK_VERSION(1, 15, 10)
+#define RVAL2CRSVGUNIT(obj) (rb_cairo_svg_unit_from_ruby_object(obj))
+#endif
 
 cairo_operator_t       rb_cairo_operator_from_ruby_object       (VALUE obj);
 cairo_antialias_t      rb_cairo_antialias_from_ruby_object      (VALUE obj);
@@ -347,6 +351,9 @@ cairo_region_overlap_t  rb_cairo_region_overlap_from_ruby_object(VALUE obj);
 cairo_pdf_outline_flags_t rb_cairo_pdf_outline_flags_from_ruby_object(VALUE obj);
 cairo_pdf_metadata_t rb_cairo_pdf_metadata_from_ruby_object(VALUE obj);
 #endif
+#if CAIRO_CHECK_VERSION(1, 15, 10)
+cairo_svg_unit_t rb_cairo_svg_unit_from_ruby_object(VALUE obj);
+#endif
 
 void rb_cairo_check_status (cairo_status_t status);
 void rb_cairo_surface_check_status (cairo_surface_t *surface);

data/ext/cairo/rb_cairo_constants.c

@@ -41,6 +41,7 @@ VALUE rb_mCairo_MimeType = Qnil;
 VALUE rb_mCairo_RegionOverlap = Qnil;
 VALUE rb_mCairo_PDFOutlineFlags = Qnil;
 VALUE rb_mCairo_PDFMetadata = Qnil;
+VALUE rb_mCairo_SVGUnit = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
 #if CAIRO_CHECK_VERSION(1, 10, 0)
@@ -138,6 +139,9 @@ VALUE rb_mCairo_PDFMetadata = Qnil;
 #define CAIRO_PDF_METADATA_MIN CAIRO_PDF_METADATA_TITLE
 #define CAIRO_PDF_METADATA_MAX CAIRO_PDF_METADATA_MOD_DATE
 
+#define CAIRO_SVG_UNIT_MIN CAIRO_SVG_UNIT_USER
+#define CAIRO_SVG_UNIT_MAX CAIRO_SVG_UNIT_PERCENT
+
 #define DEFINE_RVAL2ENUM(name, const_name)                      \
 cairo_ ## name ## _t                                            \
 rb_cairo_ ## name ## _from_ruby_object (VALUE rb_ ## name)      \
@@ -212,6 +216,10 @@ DEFINE_RVAL2ENUM(pdf_outline_flags, PDF_OUTLINE_FLAGS)
 DEFINE_RVAL2ENUM(pdf_metadata, PDF_METADATA)
 #endif
 
+#if CAIRO_CHECK_VERSION(1, 15, 10)
+DEFINE_RVAL2ENUM(svg_unit, SVG_UNIT)
+#endif
+
 #if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(PS_LEVEL_ENUM_DEFINED)
 void
 rb_cairo_ps_level_from_ruby_object (VALUE rb_ps_level)
@@ -677,6 +685,16 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_MimeType, "JBIG2_GLOBAL_ID",
                    rb_str_new2 (CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID));
 #endif
+#if CAIRO_CHECK_VERSION(1, 15, 10)
+  rb_define_const (rb_mCairo_MimeType, "CCITT_FAX",
+                   rb_str_new_cstr (CAIRO_MIME_TYPE_CCITT_FAX));
+  rb_define_const (rb_mCairo_MimeType, "CCITT_FAX_PARAMS",
+                   rb_str_new_cstr (CAIRO_MIME_TYPE_CCITT_FAX_PARAMS));
+  rb_define_const (rb_mCairo_MimeType, "EPS",
+                   rb_str_new_cstr (CAIRO_MIME_TYPE_EPS));
+  rb_define_const (rb_mCairo_MimeType, "EPS_PARAMS",
+                   rb_str_new_cstr (CAIRO_MIME_TYPE_EPS_PARAMS));
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
   rb_mCairo_RegionOverlap = rb_define_module_under (rb_mCairo, "RegionOverlap");
@@ -725,4 +743,29 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_PDFMetadata, "MOD_DATE",
                    INT2NUM (CAIRO_PDF_METADATA_MOD_DATE));
 #endif
+
+#if CAIRO_CHECK_VERSION(1, 15, 10)
+  rb_mCairo_SVGUnit =
+    rb_define_module_under (rb_mCairo, "SVGUnit");
+  rb_define_const (rb_mCairo_SVGUnit, "USER",
+                   INT2NUM (CAIRO_SVG_UNIT_USER));
+  rb_define_const (rb_mCairo_SVGUnit, "EM",
+                   INT2NUM (CAIRO_SVG_UNIT_EM));
+  rb_define_const (rb_mCairo_SVGUnit, "EX",
+                   INT2NUM (CAIRO_SVG_UNIT_EX));
+  rb_define_const (rb_mCairo_SVGUnit, "PX",
+                   INT2NUM (CAIRO_SVG_UNIT_PX));
+  rb_define_const (rb_mCairo_SVGUnit, "IN",
+                   INT2NUM (CAIRO_SVG_UNIT_IN));
+  rb_define_const (rb_mCairo_SVGUnit, "CM",
+                   INT2NUM (CAIRO_SVG_UNIT_CM));
+  rb_define_const (rb_mCairo_SVGUnit, "MM",
+                   INT2NUM (CAIRO_SVG_UNIT_MM));
+  rb_define_const (rb_mCairo_SVGUnit, "PT",
+                   INT2NUM (CAIRO_SVG_UNIT_PT));
+  rb_define_const (rb_mCairo_SVGUnit, "PC",
+                   INT2NUM (CAIRO_SVG_UNIT_PC));
+  rb_define_const (rb_mCairo_SVGUnit, "PERCENT",
+                   INT2NUM (CAIRO_SVG_UNIT_PERCENT));
+#endif
 }

data/ext/cairo/rb_cairo_surface.c

@@ -1443,7 +1443,7 @@ cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
         format = arg2;
         width = arg3;
         height = arg4;
-        win32_hdc = NIL_P (hdc) ? NULL : (HDC) NUM2UINT (hdc);
+        win32_hdc = NIL_P (hdc) ? NULL : (HDC) (UINT_PTR) NUM2UINT (hdc);
         surface = cairo_win32_surface_create_with_ddb (win32_hdc,
                                                        RVAL2CRFORMAT (format),
                                                        NUM2INT (width),
@@ -1504,6 +1504,27 @@ cr_svg_surface_restrict_to_version (VALUE self, VALUE version)
   rb_cairo_surface_check_status (_SELF);
   return Qnil;
 }
+
+#  if CAIRO_CHECK_VERSION(1, 15, 10)
+static VALUE
+cr_svg_surface_get_document_unit (VALUE self)
+{
+  cairo_svg_unit_t unit;
+  unit = cairo_svg_surface_get_document_unit (_SELF);
+  rb_cairo_surface_check_status (_SELF);
+  return INT2NUM (unit);
+}
+
+static VALUE
+cr_svg_surface_set_document_unit (VALUE self, VALUE rb_unit)
+{
+  cairo_svg_unit_t unit;
+  unit = RVAL2CRSVGUNIT (rb_unit);
+  cairo_svg_surface_set_document_unit (_SELF, unit);
+  rb_cairo_surface_check_status (_SELF);
+  return Qnil;
+}
+#  endif
 #endif
 
 #ifdef RB_CAIRO_HAS_WIN32_PRINTING_SURFACE
@@ -2180,6 +2201,12 @@ Init_cairo_surface (void)
                     cr_svg_surface_initialize, -1);
   rb_define_method (rb_cCairo_SVGSurface, "restrict_to_version",
                     cr_svg_surface_restrict_to_version, 1);
+#  if CAIRO_CHECK_VERSION(1, 15, 10)
+  rb_define_method (rb_cCairo_SVGSurface, "document_unit",
+                    cr_svg_surface_get_document_unit, 0);
+  rb_define_method (rb_cCairo_SVGSurface, "set_document_unit",
+                    cr_svg_surface_set_document_unit, 1);
+#  endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_SVGSurface);
 #endif

data/test/test_pdf_surface.rb

@@ -25,11 +25,11 @@ class PDFSurfaceTest < Test::Unit::TestCase
       end
       id = surface.add_outline(Cairo::PDFOutline::ROOT,
                                "top-level",
-                               "destination",
+                               "dest='destination'",
                                Cairo::PDFOutlineFlags::OPEN)
       sub_id = surface.add_outline(sub_id,
                                    "sub",
-                                   "destination",
+                                   "dest='destination'",
                                    Cairo::PDFOutlineFlags::OPEN)
       assert_equal(2, sub_id)
     end

data/test/test_recording_surface.rb

@@ -15,6 +15,10 @@ class RecordingSurfaceTest < Test::Unit::TestCase
       context.line_to(80, 100)
       context.stroke
     end
-    assert_equal([10.0, 20.0, 61.0, 61.0], surface.ink_extents)
+    if Cairo.satisfied_version?(1, 15)
+      assert_equal([14.0, 29.0, 67.0, 72.0], surface.ink_extents)
+    else
+      assert_equal([10.0, 20.0, 61.0, 61.0], surface.ink_extents)
+    end
   end
 end

data/test/test_svg_surface.rb

@@ -5,4 +5,13 @@ class SVGSurfaceTest < Test::Unit::TestCase
     surface = Cairo::SVGSurface.new(nil, 10, 20)
     surface.finish
   end
+
+  def test_unit
+    only_cairo_version(1, 15, 10)
+    output = StringIO.new
+    surface = Cairo::SVGSurface.new(output, 10, 20)
+    assert_equal(Cairo::SVGUnit::PT, surface.document_unit)
+    surface.document_unit = Cairo::SVGUnit::CM
+    assert_equal(Cairo::SVGUnit::CM, surface.document_unit)
+  end
 end

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.32"
+version="1.6.34"
 prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.32"
+version="1.6.34"
 prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/xml2-config

@@ -58,7 +58,7 @@ while test $# -gt 0; do
       ;;
 
     --version)
-	echo 2.9.6
+	echo 2.9.7
 	exit 0
 	;;
 

data/vendor/local/include/cairo/cairo-features.h

@@ -25,6 +25,7 @@
 /*#undef CAIRO_HAS_EGL_FUNCTIONS */
 /*#undef CAIRO_HAS_GALLIUM_SURFACE */
 /*#undef CAIRO_HAS_GLESV2_SURFACE */
+/*#undef CAIRO_HAS_GLESV3_SURFACE */
 /*#undef CAIRO_HAS_GLX_FUNCTIONS */
 /*#undef CAIRO_HAS_GL_SURFACE */
 /*#undef CAIRO_HAS_OS2_SURFACE */

data/vendor/local/include/cairo/cairo-svg.h

@@ -53,6 +53,46 @@ typedef enum _cairo_svg_version {
     CAIRO_SVG_VERSION_1_2
 } cairo_svg_version_t;
 
+/**
+ * cairo_svg_version_t:
+ *
+ * @CAIRO_SVG_UNIT_USER: User unit, a value in the current coordinate system.
+ *   If used in the root element for the initial coordinate systems it
+ *   corresponds to pixels. (Since 1.16)
+ * @CAIRO_SVG_UNIT_EM: The size of the element's font. (Since 1.16)
+ * @CAIRO_SVG_UNIT_EX: The x-height of the element’s font. (Since 1.16)
+ * @CAIRO_SVG_UNIT_PX: Pixels (1px = 1/96th of 1in). (Since 1.16)
+ * @CAIRO_SVG_UNIT_IN: Inches (1in = 2.54cm = 96px). (Since 1.16)
+ * @CAIRO_SVG_UNIT_CM: Centimeters (1cm = 96px/2.54). (Since 1.16)
+ * @CAIRO_SVG_UNIT_MM: Millimeters (1mm = 1/10th of 1cm). (Since 1.16)
+ * @CAIRO_SVG_UNIT_PT: Points (1pt = 1/72th of 1in). (Since 1.16)
+ * @CAIRO_SVG_UNIT_PC: Picas (1pc = 1/6th of 1in). (Since 1.16)
+ * @CAIRO_SVG_UNIT_PERCENT: Percent, a value that is some fraction of another
+ *   reference value. (Since 1.16)
+ *
+ * #cairo_svg_unit_t is used to describe the units valid for coordinates and
+ * lengths in the SVG specification.
+ *
+ * See also:
+ * https://www.w3.org/TR/SVG/coords.html#Units
+ * https://www.w3.org/TR/SVG/types.html#DataTypeLength
+ * https://www.w3.org/TR/css-values-3/#lengths
+ *
+ * Since: 1.16
+ **/
+typedef enum _cairo_svg_unit {
+    CAIRO_SVG_UNIT_USER = 0,
+    CAIRO_SVG_UNIT_EM,
+    CAIRO_SVG_UNIT_EX,
+    CAIRO_SVG_UNIT_PX,
+    CAIRO_SVG_UNIT_IN,
+    CAIRO_SVG_UNIT_CM,
+    CAIRO_SVG_UNIT_MM,
+    CAIRO_SVG_UNIT_PT,
+    CAIRO_SVG_UNIT_PC,
+    CAIRO_SVG_UNIT_PERCENT
+} cairo_svg_unit_t;
+
 cairo_public cairo_surface_t *
 cairo_svg_surface_create (const char   *filename,
 			  double	width_in_points,
@@ -75,6 +115,13 @@ cairo_svg_get_versions (cairo_svg_version_t const	**versions,
 cairo_public const char *
 cairo_svg_version_to_string (cairo_svg_version_t version);
 
+cairo_public void
+cairo_svg_surface_set_document_unit (cairo_surface_t	*surface,
+				     cairo_svg_unit_t	 unit);
+
+cairo_public cairo_svg_unit_t
+cairo_svg_surface_get_document_unit (cairo_surface_t	*surface);
+
 CAIRO_END_DECLS
 
 #else  /* CAIRO_HAS_SVG_SURFACE */

data/vendor/local/include/cairo/cairo-version.h

@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 15
-#define CAIRO_VERSION_MICRO 8
+#define CAIRO_VERSION_MICRO 10
 
 #endif