cairo-1.14.6

git-svn-id: svn://tug.org/texlive/trunk@39210 c570f23f-e606-0410-a88d-b1316a301751

385 files changed, 430 insertions, 223 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 7a310ebd24f..79f932fbc4b 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -9,7 +9,7 @@ bypassing or using the original one.
 
 See also comments in ../texk/README.
 
-cairo 1.14.2 - checked 11mar15
+cairo 1.14.6 - checked 28dec15
   http://cairographics.org/releases/
 
 freetype2 2.6.1 - checked 4sep15
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 32528dfeaa2..0ba6bad3174 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import cairo-1.14.6.
+	* configure.ac: new source-tree-naming convention per Karl.
+	* version.ac: Adapted.
+
 2015-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/libs/cairo/README b/Build/source/libs/cairo/README
index 5afa338803a..853dc23241a 100644
--- a/Build/source/libs/cairo/README
+++ b/Build/source/libs/cairo/README
@@ -1,14 +1,15 @@
-	Building cairo-1.10.2 as part of the TL tree
+	Building cairo-1.14.6 as part of the TL tree
 	============================================
 
 This directory libs/cairo/ uses a proxy Makefile.am to build the cairo
 library 'libcairo' from the unmodified source tree in
-libs/cairo/cairo-x.y.z/, bypassing the original build system.
+libs/cairo/cairo-src/, bypassing the original build system.
 
-As far as applicable, the tests in libs/cairo/cairo-x.y.z/configure have
+As far as applicable, the tests in libs/cairo/cairo-src/configure have
 been translated into equivalent test in libs/cairo/configure.ac.
 
 =============================
 
 2012-11-10	Taco Hoekwater <taco@metatex.org>
 2013-04-15	Peter Breitenlohner <peb@mppmu.mpg.de>
+2015-12-28	Akira Kakuto <kakuto@fuk.kindai.ac.jp>
diff --git a/Build/source/libs/cairo/cairo-1.14.2-PATCHES/ChangeLog b/Build/source/libs/cairo/cairo-src-PATCHES/ChangeLog
index ca926256712..d8fa743af03 100644
--- a/Build/source/libs/cairo/cairo-1.14.2-PATCHES/ChangeLog
+++ b/Build/source/libs/cairo/cairo-src-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import cairo-1.14.6.
+
 2015-03-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import cairo-1.14.2.
diff --git a/Build/source/libs/cairo/cairo-1.14.2-PATCHES/TL-Changes b/Build/source/libs/cairo/cairo-src-PATCHES/TL-Changes
index 9d7307107cf..07117c82d20 100644
--- a/Build/source/libs/cairo/cairo-1.14.2-PATCHES/TL-Changes
+++ b/Build/source/libs/cairo/cairo-src-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the cairo-1.14.2/ tree as obtained from:
-	http://cairographics.org/releases/cairo-1.14.2.tar.xz
+Changes applied to the cairo-1.14.6/ tree as obtained from:
+	http://cairographics.org/releases/cairo-1.14.6.tar.xz
 
 Removed:
 	Makefile.in
@@ -31,4 +31,3 @@ Removed unused dirs:
 	src/win32
 	test
 	util
-
diff --git a/Build/source/libs/cairo/cairo-1.14.2/AUTHORS b/Build/source/libs/cairo/cairo-src/AUTHORS
index d85696fa81c..d85696fa81c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/AUTHORS
+++ b/Build/source/libs/cairo/cairo-src/AUTHORS
diff --git a/Build/source/libs/cairo/cairo-1.14.2/BIBLIOGRAPHY b/Build/source/libs/cairo/cairo-src/BIBLIOGRAPHY
index 90a6cef205b..90a6cef205b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/BIBLIOGRAPHY
+++ b/Build/source/libs/cairo/cairo-src/BIBLIOGRAPHY
diff --git a/Build/source/libs/cairo/cairo-1.14.2/BUGS b/Build/source/libs/cairo/cairo-src/BUGS
index ef044046d3e..ef044046d3e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/BUGS
+++ b/Build/source/libs/cairo/cairo-src/BUGS
diff --git a/Build/source/libs/cairo/cairo-1.14.2/CODING_STYLE b/Build/source/libs/cairo/cairo-src/CODING_STYLE
index 95ceac04d84..95ceac04d84 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/CODING_STYLE
+++ b/Build/source/libs/cairo/cairo-src/CODING_STYLE
diff --git a/Build/source/libs/cairo/cairo-1.14.2/COPYING b/Build/source/libs/cairo/cairo-src/COPYING
index f54969f1c94..f54969f1c94 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/COPYING
+++ b/Build/source/libs/cairo/cairo-src/COPYING
diff --git a/Build/source/libs/cairo/cairo-1.14.2/COPYING-LGPL-2.1 b/Build/source/libs/cairo/cairo-src/COPYING-LGPL-2.1
index f1ed6182c52..f1ed6182c52 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/COPYING-LGPL-2.1
+++ b/Build/source/libs/cairo/cairo-src/COPYING-LGPL-2.1
diff --git a/Build/source/libs/cairo/cairo-1.14.2/COPYING-MPL-1.1 b/Build/source/libs/cairo/cairo-src/COPYING-MPL-1.1
index 7714141d154..7714141d154 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/COPYING-MPL-1.1
+++ b/Build/source/libs/cairo/cairo-src/COPYING-MPL-1.1
diff --git a/Build/source/libs/cairo/cairo-1.14.2/HACKING b/Build/source/libs/cairo/cairo-src/HACKING
index aba2c545bb9..aba2c545bb9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/HACKING
+++ b/Build/source/libs/cairo/cairo-src/HACKING
diff --git a/Build/source/libs/cairo/cairo-1.14.2/INSTALL b/Build/source/libs/cairo/cairo-src/INSTALL
index 9db68dee2ba..9db68dee2ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/INSTALL
+++ b/Build/source/libs/cairo/cairo-src/INSTALL
diff --git a/Build/source/libs/cairo/cairo-1.14.2/KNOWN_ISSUES b/Build/source/libs/cairo/cairo-src/KNOWN_ISSUES
index c367f918ea3..c367f918ea3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/KNOWN_ISSUES
+++ b/Build/source/libs/cairo/cairo-src/KNOWN_ISSUES
diff --git a/Build/source/libs/cairo/cairo-1.14.2/Makefile.am b/Build/source/libs/cairo/cairo-src/Makefile.am
index 03fa3523649..03fa3523649 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/Makefile.am
+++ b/Build/source/libs/cairo/cairo-src/Makefile.am
diff --git a/Build/source/libs/cairo/cairo-1.14.2/Makefile.win32 b/Build/source/libs/cairo/cairo-src/Makefile.win32
index fbad7f3e4c9..fbad7f3e4c9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/Makefile.win32
+++ b/Build/source/libs/cairo/cairo-src/Makefile.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.2/NEWS b/Build/source/libs/cairo/cairo-src/NEWS
index 93b650ef59f..3ec0e6c898e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/NEWS
+++ b/Build/source/libs/cairo/cairo-src/NEWS
@@ -1,3 +1,122 @@
+Release 1.14.6    (2015-12-09  Bryce Harrington <bryce@osg.samsung.com>)
+========================================================================
+Simple bugfix release to fix one Windows issue.
+
+For a complete log of changes since 1.14.4, please see:
+
+    http://cairographics.org/releases/ChangeLog.1.14.6
+
+Features
+--------
+None
+
+API Changes
+-----------
+None
+
+Dependency Changes
+------------------
+None
+
+Performance Optimizations
+-------------------------
+None
+
+Bug Fixes
+---------
+* Fix failure on Windows due to reference of the function
+  cairo_win32_surface_create_with_format(), which isn't included in the
+  1.14.4 release. (Bug #92771)
+
+
+Release 1.14.4    (2015-10-28  Bryce Harrington <bryce@osg.samsung.com>)
+========================================================================
+Just in time for Halloween we see another bug-fix release for Cairo.
+This brings a few dozen straightforward bug fixes with no API changes.
+
+In addition, this includes a typical assortment of fixes to tests,
+cleanup of warnings and memory leaks, correction of misspellings,
+updates to documentation, etc.
+
+For a complete log of changes since 1.14.2, please see:
+
+    http://cairographics.org/releases/ChangeLog.cairo-1.14.4
+
+
+Features
+--------
+None
+
+API Changes
+-----------
+None
+
+Dependency Changes
+------------------
+None
+
+Performance Optimizations
+-------------------------
+None
+
+Bug Fixes
+---------
+* Avoid appending empty slots to user data arrays.  Fixes a memory
+  consumption regression since commit 9341c254a.
+
+* Return a better error (file-not-found) when setting up pango on
+  devices where the font files don't have read permissions.
+
+* Fix regression in the font size of canvas text in Inkscape when
+  compiled with the Quartz backend.  (Bug #84324)
+
+* Fix _cairo_gl_shader_bind_matrix() to maintain compatibility with
+  OpenGL ES 2.0.  Manually transpose the matrix.
+
+* Fix incorrect font descriptor conversion when the font matrix yy is
+  negative. (Bug #90538)
+
+* Fix crash when using a complex path for clip and stroke due to
+  discarding the intersection exactly at the top edge.
+  (Bug #74779)
+
+* Fix cairo_get_locale_decimal_point() on Android
+
+* Fix compilation problem on AIX due to conflicting usage of symbol
+  'jmpbuf'.  (Bug #89339)
+
+* Fix broken rendering with XCB due to snapshotting of uploaded part of
+  surfaces.  (Bug #67505)
+
+* Fix loss of alpha when copying a mask for a cairo recording surface,
+  resulting in a double copy.  (Bugs #73038, #73901)
+
+* Fix incorrect recording of certain paths with script surfaces.
+  (Bug #91054)
+
+* Fix typo in definition of MAYBE_WARN in configure script.
+  (Bug #89750)
+
+* Fix use of filename variable after it's been freed.
+  (Bug #91206)
+
+* Fix out of bounds access when printing pattern.
+  (Bug #91266)
+
+* Fix incorrect size calculation in glyph cache unlocking for Cairo GL
+  compositor.
+  (Bug #91321)
+
+* Fix memory leak in _cairo_gl_pattern_texture_setup()
+  (Bug #91537)
+
+* Fix transparent images in win32-print.
+  (Bug #91835)
+
+* Fix _put_shm_image_boxes and _put_image_boxes when no SHM available
+  with XCB.
+
+
 Release 1.14.2 (2014-03-09 Bryce Harrington <bryce@osg.samsung.com>)
 ====================================================================
 This release provides collected bug fixes, along with one feature
@@ -520,7 +639,7 @@ Release 1.12.4 (2012-10-05 Chris Wilson <chris@chris-wilson.co.uk>)
 ===================================================================
 More bugs, and more importantly, more fixes. On the cairo-gl side, we
 have refinements to the MSAA compositor which enables hardware
-acceleration of comparitively low-quality antialiasing - which is useful
+acceleration of comparatively low-quality antialiasing - which is useful
 in animations and on very high density screens. For cairo-xlib, we have
 finally enabled SHM transport for image transfers to and from the X
 server. A long standing required feature, SHM transport offers a notable
@@ -1457,7 +1576,7 @@ Optimisations:
   image in the final output. This is unlike previous versions of cairo
   which would generate very large PDF files with multiple copies of
   the same image. Adrian says that the PDF is not quite working as
-  well as it should yet, so we hope for futher improvements before
+  well as it should yet, so we hope for further improvements before
   cairo 1.10.
 
 Bug fixes:
@@ -2209,7 +2328,7 @@ cairo_font_options_set_lcd_filter
 cairo_font_options_get_lcd_filter
 
   These add the possibility to choose between various available LCD subpixel
-  filters.  The available filter values are modeled after what FreeType
+  filters.  The available filter values are modelled after what FreeType
   provides.
 
 
@@ -5834,7 +5953,7 @@ General bug fixes
 	  (Richard Stellingwerff, Owen Taylor)
 
  * 4231
- * 4298 - Accomodate gentoo and Mandriva versions in X server vendor string check
+ * 4298 - Accommodate gentoo and Mandriva versions in X server vendor string check
 	  (Billy Biggs, Frederic Crozat, Owen Taylor)
 
 win32-specific fixes
diff --git a/Build/source/libs/cairo/cairo-1.14.2/PORTING_GUIDE b/Build/source/libs/cairo/cairo-src/PORTING_GUIDE
index 7488173c46b..7488173c46b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/PORTING_GUIDE
+++ b/Build/source/libs/cairo/cairo-src/PORTING_GUIDE
diff --git a/Build/source/libs/cairo/cairo-1.14.2/README b/Build/source/libs/cairo/cairo-src/README
index 0be9947d548..0be9947d548 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/README
+++ b/Build/source/libs/cairo/cairo-src/README
diff --git a/Build/source/libs/cairo/cairo-1.14.2/README.win32 b/Build/source/libs/cairo/cairo-src/README.win32
index ff962b72a68..ff962b72a68 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/README.win32
+++ b/Build/source/libs/cairo/cairo-src/README.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.2/RELEASING b/Build/source/libs/cairo/cairo-src/RELEASING
index f6f5eeb5125..641ac1fc4a5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/RELEASING
+++ b/Build/source/libs/cairo/cairo-src/RELEASING
@@ -113,7 +113,7 @@ Here are the steps to follow to create a new cairo release:
 8) Push the newly created tag out to the central tree with a command
    something like:
 
-	git push upstream master X.Y.Z
+	git push origin master X.Y.Z
 
 9) Edit the cairo bugzilla product and add the new version numbers. Note
    that you need to add two versions.  One for the release/snapshot (with
@@ -121,12 +121,13 @@ Here are the steps to follow to create a new cairo release:
    odd micro version).
 
 10) Send a message to cairo-announce@cairographics.org and CC
-    gnome-announce-list@gnome.org and ftp-release@lists.freedesktop.org
-    (pr@lwn.net as well for major releases) to announce the new release
-    using the text provided from "make release-publish", adding the excerpt
-    from NEWS, your signature, followed by the standard "What is cairo" and
-    "Where to get more information about cairo" blurbs from README, and
-    finally the shortlog of all changes since last release, generated by:
+    cairo@cairographics.org, gnome-announce-list@gnome.org and
+    ftp-release@lists.freedesktop.org (pr@lwn.net as well for major
+    releases) to announce the new release using the text provided from
+    "make release-publish", adding the excerpt from NEWS, your
+    signature, followed by the standard "What is cairo" and "Where to
+    get more information about cairo" blurbs from README, and finally
+    the shortlog of all changes since last release, generated by:
 
 	git shortlog X.Y.Z...
 
@@ -135,8 +136,3 @@ Here are the steps to follow to create a new cairo release:
 11) Edit the cairo wiki to add the announcement to the NEWS page and
     the front page. (just the parts before your signature).
 
-12) For minor releases (no X.Y change), notify desktop-devel-list@gnome.org
-    or update the ExternalDependencies page for the current cycle if you
-    know where it is.  Currently it's:
-
-	http://live.gnome.org/TwoPointNineteen/ExternalDependencies
diff --git a/Build/source/libs/cairo/cairo-1.14.2/acinclude.m4 b/Build/source/libs/cairo/cairo-src/acinclude.m4
index dcf54f9357d..dcf54f9357d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/acinclude.m4
+++ b/Build/source/libs/cairo/cairo-src/acinclude.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/autogen.sh b/Build/source/libs/cairo/cairo-src/autogen.sh
index 4d113f8be5f..4d113f8be5f 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/autogen.sh
+++ b/Build/source/libs/cairo/cairo-src/autogen.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.analysis b/Build/source/libs/cairo/cairo-src/build/Makefile.am.analysis
index a44077ab453..a44077ab453 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.analysis
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.am.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.changelog b/Build/source/libs/cairo/cairo-src/build/Makefile.am.changelog
index 07e603695cf..07e603695cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.changelog
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.am.changelog
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.common b/Build/source/libs/cairo/cairo-src/build/Makefile.am.common
index b955af58fdf..b955af58fdf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.common
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.am.common
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.gtk-doc b/Build/source/libs/cairo/cairo-src/build/Makefile.am.gtk-doc
index c3d642b097b..c3d642b097b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.gtk-doc
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.am.gtk-doc
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.releasing b/Build/source/libs/cairo/cairo-src/build/Makefile.am.releasing
index b17faabce2f..b17faabce2f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.releasing
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.am.releasing
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.common b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.common
index 7d7e9735f15..7d7e9735f15 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.common
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.common
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.features
index 8cb155dc084..8cb155dc084 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.features
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features-h b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.features-h
index 13904cfa9f0..13904cfa9f0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features-h
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.features-h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.inform b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.inform
index ba11165050a..ba11165050a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.inform
+++ b/Build/source/libs/cairo/cairo-src/build/Makefile.win32.inform
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.cairo.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.cairo.m4
index 2f4873b043f..44ba5fdf6f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.cairo.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.cairo.m4
@@ -168,6 +168,13 @@ int atomic_cmpxchg(int i, int j, int k) { return __sync_val_compare_and_swap (&i
 		  cairo_cv_atomic_primitives="Intel"
 		  )
 
+		AC_TRY_LINK([
+int atomic_add(int i) { return __atomic_fetch_add(&i, 1, __ATOMIC_SEQ_CST); }
+int atomic_cmpxchg(int i, int j, int k) { return __atomic_compare_exchange_n(&i, &j, k, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); }
+], [],
+		   cairo_cv_atomic_primitives="cxx11"
+		   )
+
 		if test "x$cairo_cv_atomic_primitives" = "xnone"; then
 			AC_CHECK_HEADER([atomic_ops.h],
 					cairo_cv_atomic_primitives="libatomic-ops")
@@ -178,6 +185,11 @@ int atomic_cmpxchg(int i, int j, int k) { return __sync_val_compare_and_swap (&i
 					cairo_cv_atomic_primitives="OSAtomic")
 		fi
 	])
+	if test "x$cairo_cv_atomic_primitives" = xcxx11; then
+		AC_DEFINE(HAVE_CXX11_ATOMIC_PRIMITIVES, 1,
+			  [Enable if your compiler supports the GCC __atomic_* atomic primitives])
+	fi
+
 	if test "x$cairo_cv_atomic_primitives" = xIntel; then
 		AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1,
 			  [Enable if your compiler supports the Intel __sync_* atomic primitives])
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.compare.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.compare.m4
index bd6c51b289d..bd6c51b289d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.compare.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.compare.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.enable.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.enable.m4
index f3522b9832c..f3522b9832c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.enable.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.enable.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.float.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.float.m4
index 8f85f0862ba..8f85f0862ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.float.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.float.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.makefile.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.makefile.m4
index 70777810d14..70777810d14 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.makefile.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.makefile.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.pkg.m4 b/Build/source/libs/cairo/cairo-src/build/aclocal.pkg.m4
index cf90a967880..cf90a967880 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.pkg.m4
+++ b/Build/source/libs/cairo/cairo-src/build/aclocal.pkg.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.analysis b/Build/source/libs/cairo/cairo-src/build/configure.ac.analysis
index 11c52e70d6e..11c52e70d6e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.analysis
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.features b/Build/source/libs/cairo/cairo-src/build/configure.ac.features
index e4a2aafcc82..77f20358889 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.features
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.features
@@ -241,7 +241,7 @@ CAIRO_FEATURE_HOOK_REGISTER(*,!no,!,dnl
 ])dnl
 dnl Collect list of all supported disabled public features
 CAIRO_ACCUMULATORS_REGISTER(NO_FEATURES,[ ])dnl
-CAIRO_FEATURE_HOOK_REGISTER(no,!no,!,
+CAIRO_FEATURE_HOOK_REGISTER(no,*,!,
 [dnl
 	CAIRO_ACCUMULATE(NO_FEATURES, cr_feature_tag)
 ])dnl
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.noversion b/Build/source/libs/cairo/cairo-src/build/configure.ac.noversion
index 18c4bd5f7ae..18c4bd5f7ae 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.noversion
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.noversion
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.pthread b/Build/source/libs/cairo/cairo-src/build/configure.ac.pthread
index 29c930da932..29c930da932 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.pthread
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.pthread
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.system b/Build/source/libs/cairo/cairo-src/build/configure.ac.system
index b9d71c8d783..b9d71c8d783 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.system
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.system
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.tools b/Build/source/libs/cairo/cairo-src/build/configure.ac.tools
index a24dbcecb91..a24dbcecb91 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.tools
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.tools
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.version b/Build/source/libs/cairo/cairo-src/build/configure.ac.version
index a91cee39eef..a91cee39eef 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.version
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.version
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.warnings b/Build/source/libs/cairo/cairo-src/build/configure.ac.warnings
index 74e6634b29c..96c7f6f6d03 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.warnings
+++ b/Build/source/libs/cairo/cairo-src/build/configure.ac.warnings
@@ -12,7 +12,7 @@ dnl MAYBE_WARN in an ignorable way (like adding whitespace)
 
 MAYBE_WARN="-Wall -Wextra \
 -Wmissing-declarations -Werror-implicit-function-declaration \
--Wpointer-arith -Wwrite-strings -Wsign-compare -Wpacked
+-Wpointer-arith -Wwrite-strings -Wsign-compare -Wpacked \
 -Wswitch-enum -Wmissing-format-attribute -Wvolatile-register-var \
 -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
 -Wno-missing-field-initializers -Wno-unused-parameter \
diff --git a/Build/source/libs/cairo/cairo-1.14.2/build/gtk-doc.m4 b/Build/source/libs/cairo/cairo-src/build/gtk-doc.m4
index 36755432b50..36755432b50 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/build/gtk-doc.m4
+++ b/Build/source/libs/cairo/cairo-src/build/gtk-doc.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.2/cairo-version.h b/Build/source/libs/cairo/cairo-src/cairo-version.h
index 516999ee6c3..4c1de000c1c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/cairo-version.h
+++ b/Build/source/libs/cairo/cairo-src/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 14
-#define CAIRO_VERSION_MICRO 2
+#define CAIRO_VERSION_MICRO 6
 
 #endif
diff --git a/Build/source/libs/cairo/cairo-1.14.2/config.h.in b/Build/source/libs/cairo/cairo-src/config.h.in
index 14e3f444003..96345a8df65 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/config.h.in
+++ b/Build/source/libs/cairo/cairo-src/config.h.in
@@ -74,6 +74,9 @@
 /* Define to 1 if you have the `ctime_r' function. */
 #undef HAVE_CTIME_R
 
+/* Enable if your compiler supports the GCC __atomic_* atomic primitives */
+#undef HAVE_CXX11_ATOMIC_PRIMITIVES
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
diff --git a/Build/source/libs/cairo/cairo-1.14.2/configure.ac b/Build/source/libs/cairo/cairo-src/configure.ac
index 2ce19599e30..2ce19599e30 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/configure.ac
+++ b/Build/source/libs/cairo/cairo-src/configure.ac
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am b/Build/source/libs/cairo/cairo-src/src/Makefile.am
index acf0a828100..acf0a828100 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.am
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.analysis b/Build/source/libs/cairo/cairo-src/src/Makefile.am.analysis
index fab4cf7a514..fab4cf7a514 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.analysis
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.am.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.features b/Build/source/libs/cairo/cairo-src/src/Makefile.am.features
index c58ac23da4e..c58ac23da4e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.features
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.am.features
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.sources b/Build/source/libs/cairo/cairo-src/src/Makefile.sources
index fac24d79d8a..fac24d79d8a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.sources
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.sources
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32 b/Build/source/libs/cairo/cairo-src/src/Makefile.win32
index 864791f377b..864791f377b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32.features b/Build/source/libs/cairo/cairo-src/src/Makefile.win32.features
index 2274f4ad6cf..2274f4ad6cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32.features
+++ b/Build/source/libs/cairo/cairo-src/src/Makefile.win32.features
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/README b/Build/source/libs/cairo/cairo-src/src/README
index 03e4455ea58..03e4455ea58 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/README
+++ b/Build/source/libs/cairo/cairo-src/src/README
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-analysis-surface-private.h
index 1e054c209ab..1e054c209ab 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-analysis-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-analysis-surface.c
index 8516094c200..8516094c200 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-analysis-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-arc-private.h
index a22c01ac90b..a22c01ac90b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-arc-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc.c b/Build/source/libs/cairo/cairo-src/src/cairo-arc.c
index 390397bae10..390397bae10 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-arc.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-array-private.h
index 35b29e5fc07..35b29e5fc07 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-array-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array.c b/Build/source/libs/cairo/cairo-src/src/cairo-array.c
index 4f3c082ff6b..58c9a388fa4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-array.c
@@ -485,6 +485,9 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t     *array,
 	return CAIRO_STATUS_SUCCESS;
     }
 
+    if (user_data == NULL)
+	return CAIRO_STATUS_SUCCESS;
+
     status = _cairo_array_append (array, &new_slot);
     if (unlikely (status))
 	return status;
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-atomic-private.h
index 327fed1d928..11b2887a147 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-atomic-private.h
@@ -53,6 +53,96 @@
 
 CAIRO_BEGIN_DECLS
 
+/* C++11 atomic primitives were designed to be more flexible than the
+ * __sync_* family of primitives.  Despite the name, they are available
+ * in C as well as C++.  The motivating reason for using them is that
+ * for _cairo_atomic_{int,ptr}_get, the compiler is able to see that
+ * the load is intended to be atomic, as opposed to the __sync_*
+ * version, below, where the load looks like a plain load.  Having
+ * the load appear atomic to the compiler is particular important for
+ * tools like ThreadSanitizer so they don't report false positives on
+ * memory operations that we intend to be atomic.
+ */
+#if HAVE_CXX11_ATOMIC_PRIMITIVES
+
+#define HAS_ATOMIC_OPS 1
+
+typedef int cairo_atomic_int_t;
+
+static cairo_always_inline cairo_atomic_int_t
+_cairo_atomic_int_get (cairo_atomic_int_t *x)
+{
+    return __atomic_load_n(x, __ATOMIC_SEQ_CST);
+}
+
+static cairo_always_inline void *
+_cairo_atomic_ptr_get (void **x)
+{
+    return __atomic_load_n(x, __ATOMIC_SEQ_CST);
+}
+
+# define _cairo_atomic_int_inc(x) ((void) __atomic_fetch_add(x, 1, __ATOMIC_SEQ_CST))
+# define _cairo_atomic_int_dec(x) ((void) __atomic_fetch_sub(x, 1, __ATOMIC_SEQ_CST))
+# define _cairo_atomic_int_dec_and_test(x) (__atomic_fetch_sub(x, 1, __ATOMIC_SEQ_CST) == 1)
+
+#if SIZEOF_VOID_P==SIZEOF_INT
+typedef int cairo_atomic_intptr_t;
+#elif SIZEOF_VOID_P==SIZEOF_LONG
+typedef long cairo_atomic_intptr_t;
+#elif SIZEOF_VOID_P==SIZEOF_LONG_LONG
+typedef long long cairo_atomic_intptr_t;
+#else
+#error No matching integer pointer type
+#endif
+
+static cairo_always_inline cairo_bool_t
+_cairo_atomic_int_cmpxchg_impl(cairo_atomic_int_t *x,
+			       cairo_atomic_int_t oldv,
+			       cairo_atomic_int_t newv)
+{
+    cairo_atomic_int_t expected = oldv;
+    return __atomic_compare_exchange_n(x, &expected, newv, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+}
+
+#define _cairo_atomic_int_cmpxchg(x, oldv, newv) \
+  _cairo_atomic_int_cmpxchg_impl(x, oldv, newv)
+
+static cairo_always_inline cairo_atomic_int_t
+_cairo_atomic_int_cmpxchg_return_old_impl(cairo_atomic_int_t *x,
+					  cairo_atomic_int_t oldv,
+					  cairo_atomic_int_t newv)
+{
+    cairo_atomic_int_t expected = oldv;
+    (void) __atomic_compare_exchange_n(x, &expected, newv, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+    return expected;
+}
+
+#define _cairo_atomic_int_cmpxchg_return_old(x, oldv, newv) \
+  _cairo_atomic_int_cmpxchg_return_old_impl(x, oldv, newv)
+
+static cairo_always_inline cairo_bool_t
+_cairo_atomic_ptr_cmpxchg_impl(void **x, void *oldv, void *newv)
+{
+    void *expected = oldv;
+    return __atomic_compare_exchange_n(x, &expected, newv, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+}
+
+#define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
+  _cairo_atomic_ptr_cmpxchg_impl(x, oldv, newv)
+
+static cairo_always_inline void *
+_cairo_atomic_ptr_cmpxchg_return_old_impl(void **x, void *oldv, void *newv)
+{
+    void *expected = oldv;
+    (void) __atomic_compare_exchange_n(x, &expected, newv, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+    return expected;
+}
+
+#define _cairo_atomic_ptr_cmpxchg_return_old(x, oldv, newv) \
+  _cairo_atomic_ptr_cmpxchg_return_old_impl(x, oldv, newv)
+
+#endif
+
 #if HAVE_INTEL_ATOMIC_PRIMITIVES
 
 #define HAS_ATOMIC_OPS 1
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic.c b/Build/source/libs/cairo/cairo-src/src/cairo-atomic.c
index 909cfea4925..909cfea4925 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-atomic.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-backend-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-backend-private.h
index b05eca59ab3..b05eca59ab3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-backend-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-backend-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base64-stream.c b/Build/source/libs/cairo/cairo-src/src/cairo-base64-stream.c
index 636431372b5..636431372b5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base64-stream.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-base64-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base85-stream.c b/Build/source/libs/cairo/cairo-src/src/cairo-base85-stream.c
index f81affb49ea..f81affb49ea 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base85-stream.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-base85-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectangular.c b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann-rectangular.c
index 5541bdc3a2d..5541bdc3a2d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectangular.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann-rectangular.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectilinear.c b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann-rectilinear.c
index 7c0be69b712..7c0be69b712 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectilinear.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann-rectilinear.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann.c b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann.c
index 91e41f9c3cb..91e41f9c3cb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-bentley-ottmann.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos-surface.cpp b/Build/source/libs/cairo/cairo-src/src/cairo-beos-surface.cpp
index c97641685fc..c97641685fc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos-surface.cpp
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-beos-surface.cpp
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos.h b/Build/source/libs/cairo/cairo-src/src/cairo-beos.h
index fdb89a6c4dc..fdb89a6c4dc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-beos.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-botor-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-botor-scan-converter.c
index 515305bf24e..515305bf24e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-botor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-botor-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-box-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-box-inline.h
index d6b994127e3..d6b994127e3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-box-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-box-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-intersect.c b/Build/source/libs/cairo/cairo-src/src/cairo-boxes-intersect.c
index 96ae66334e6..96ae66334e6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-intersect.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-boxes-intersect.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-boxes-private.h
index d1f9dfcd1e5..d1f9dfcd1e5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-boxes-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes.c b/Build/source/libs/cairo/cairo-src/src/cairo-boxes.c
index 63b68ddfb90..63b68ddfb90 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-cache-private.h
index 24b6d0b2092..24b6d0b2092 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cache-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache.c b/Build/source/libs/cairo/cairo-src/src/cairo-cache.c
index 5c4e4caa3d0..5c4e4caa3d0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cache.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cff-subset.c b/Build/source/libs/cairo/cairo-src/src/cairo-cff-subset.c
index f15deb5ea6b..3ffe6f663f7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cff-subset.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cff-subset.c
@@ -1163,8 +1163,8 @@ cairo_cff_font_read_font_metrics (cairo_cff_font_t *font, cairo_hash_table_t  *t
         if (p < end)
             p = decode_number (p, &yy);
     }
-    /* Freetype uses 1/yy to get units per EM */
-    font->units_per_em = _cairo_round(1.0/yy);
+    /* Freetype uses 1/abs(yy) to get units per EM */
+    font->units_per_em = _cairo_round(1.0/fabs(yy));
 }
 
 static cairo_int_status_t
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-boxes.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip-boxes.c
index 7bcbeb1918a..7bcbeb1918a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-boxes.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-clip-inline.h
index a9f23269223..a9f23269223 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-polygon.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip-polygon.c
index f40faefba80..f40faefba80 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-polygon.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-clip-private.h
index 5fc05a64e93..5fc05a64e93 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-region.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip-region.c
index e3f4891e3f2..e3f4891e3f2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-region.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-region.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip-surface.c
index 85feaa649eb..85feaa649eb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-tor-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip-tor-scan-converter.c
index e32a5a9d9c7..e32a5a9d9c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-tor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip-tor-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip.c b/Build/source/libs/cairo/cairo-src/src/cairo-clip.c
index 0df9b06bf60..0df9b06bf60 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-clip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-context-private.h
index 0a7185ef1f5..0a7185ef1f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-context-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context.c b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-context.c
index 0116b0a5a93..0116b0a5a93 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-gradient-private.h
index fa684d2c6b0..fa684d2c6b0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-gradient-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient.c b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-gradient.c
index f8c80041629..f8c80041629 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-gradient.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-private.h
index 13fe5a8dc76..13fe5a8dc76 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-surface.c
index c57fd7f433c..c57fd7f433c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-utils-private.h
index ee77f3034c3..ee77f3034c3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-utils-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils.c b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-utils.c
index 4f02aaa52da..4f02aaa52da 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl-utils.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl.h b/Build/source/libs/cairo/cairo-src/src/cairo-cogl.h
index f270d74d307..f270d74d307 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-cogl.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-color.c b/Build/source/libs/cairo/cairo-src/src/cairo-color.c
index c2a11a17738..c2a11a17738 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-color.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-color.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-combsort-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-combsort-inline.h
index d359faeb5b8..d359faeb5b8 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-combsort-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-combsort-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compiler-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-compiler-private.h
index 216e71b4ec3..216e71b4ec3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compiler-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-compiler-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-composite-rectangles-private.h
index fd7728995de..fd7728995de 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-composite-rectangles-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles.c b/Build/source/libs/cairo/cairo-src/src/cairo-composite-rectangles.c
index 6c3e97d4a97..6c3e97d4a97 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-composite-rectangles.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-compositor-private.h
index 019972333f3..019972333f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-compositor-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-compositor.c
index b31413b9964..b31413b9964 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-contour-inline.h
index 7972c1ac5e0..7972c1ac5e0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-contour-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-contour-private.h
index 1dfc46f3acd..1dfc46f3acd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-contour-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour.c b/Build/source/libs/cairo/cairo-src/src/cairo-contour.c
index 9ad75bdbf8d..9ad75bdbf8d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-contour.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-damage-private.h
index 97b177e86b4..97b177e86b4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-damage-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage.c b/Build/source/libs/cairo/cairo-src/src/cairo-damage.c
index 63191fee95d..63191fee95d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-damage.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-debug.c b/Build/source/libs/cairo/cairo-src/src/cairo-debug.c
index 33d46aa3f79..33d46aa3f79 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-debug.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-debug.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-default-context-private.h
index fd159b49670..fd159b49670 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-default-context-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context.c b/Build/source/libs/cairo/cairo-src/src/cairo-default-context.c
index 1e5067bf1b8..1e5067bf1b8 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-default-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deflate-stream.c b/Build/source/libs/cairo/cairo-src/src/cairo-deflate-stream.c
index ae23bda9472..ae23bda9472 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deflate-stream.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-deflate-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deprecated.h b/Build/source/libs/cairo/cairo-src/src/cairo-deprecated.h
index 7a56aadbfe1..7a56aadbfe1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deprecated.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-deprecated.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-device-private.h
index 6eb44f3b634..6eb44f3b634 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-device-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device.c b/Build/source/libs/cairo/cairo-src/src/cairo-device.c
index 585a9c1c41f..585a9c1c41f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-device.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-directfb-surface.c
index 5ac64ba98ee..5ac64ba98ee 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-directfb-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb.h b/Build/source/libs/cairo/cairo-src/src/cairo-directfb.h
index e3d818c6687..e3d818c6687 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-directfb.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-drm.h b/Build/source/libs/cairo/cairo-src/src/cairo-drm.h
index 907610dcde8..907610dcde8 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-drm.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-drm.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-egl-context.c b/Build/source/libs/cairo/cairo-src/src/cairo-egl-context.c
index bf704c630fb..bf704c630fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-egl-context.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-egl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-error-inline.h
index 9126c5e61eb..9126c5e61eb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-error-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-error-private.h
index 178078ad614..178078ad614 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-error-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error.c b/Build/source/libs/cairo/cairo-src/src/cairo-error.c
index 1b9bd76be13..1b9bd76be13 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-error.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fallback-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-fallback-compositor.c
index 3f6199fe2bb..3f6199fe2bb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fallback-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-fallback-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features-uninstalled.pc.in b/Build/source/libs/cairo/cairo-src/src/cairo-features-uninstalled.pc.in
index b9cd9d3ad2b..b9cd9d3ad2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features-uninstalled.pc.in
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-features-uninstalled.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features.pc.in b/Build/source/libs/cairo/cairo-src/src/cairo-features.pc.in
index 9a4b657c8da..9a4b657c8da 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features.pc.in
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-features.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-fixed-private.h
index 9ff8f750392..9ff8f750392 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-fixed-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-type-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-fixed-type-private.h
index e9f26f61539..e9f26f61539 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-type-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-fixed-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed.c b/Build/source/libs/cairo/cairo-src/src/cairo-fixed.c
index 03e05592354..03e05592354 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-fixed.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin-data.c b/Build/source/libs/cairo/cairo-src/src/cairo-font-face-twin-data.c
index ff09cb2be10..ff09cb2be10 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin-data.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-font-face-twin-data.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin.c b/Build/source/libs/cairo/cairo-src/src/cairo-font-face-twin.c
index 2ad26302849..2ad26302849 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-font-face-twin.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face.c b/Build/source/libs/cairo/cairo-src/src/cairo-font-face.c
index 3bcd2a1e6b3..795951b1420 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-font-face.c
@@ -67,6 +67,13 @@ const cairo_font_face_t _cairo_font_face_nil = {
     { 0, 0, 0, NULL },			/* user_data */
     NULL
 };
+const cairo_font_face_t _cairo_font_face_nil_file_not_found = {
+    { 0 },				/* hash_entry */
+    CAIRO_STATUS_FILE_NOT_FOUND,	/* status */
+    CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
+    { 0, 0, 0, NULL },			/* user_data */
+    NULL
+};
 
 cairo_status_t
 _cairo_font_face_set_error (cairo_font_face_t *font_face,
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-options.c b/Build/source/libs/cairo/cairo-src/src/cairo-font-options.c
index ad28745e6b9..ad28745e6b9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-options.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-font-options.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fontconfig-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-fontconfig-private.h
index ea873abe7e4..ea873abe7e4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fontconfig-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-fontconfig-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-freed-pool-private.h
index 0ec6de3d1f1..0ec6de3d1f1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-freed-pool-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool.c b/Build/source/libs/cairo/cairo-src/src/cairo-freed-pool.c
index cfdc8e96b05..cfdc8e96b05 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-freed-pool.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-freelist-private.h
index 8fe6516f385..8fe6516f385 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-freelist-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-type-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-freelist-type-private.h
index 4dd05646107..4dd05646107 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-type-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-freelist-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist.c b/Build/source/libs/cairo/cairo-src/src/cairo-freelist.c
index d596eab81dc..d596eab81dc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-freelist.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-font.c b/Build/source/libs/cairo/cairo-src/src/cairo-ft-font.c
index 87e733bb769..3e485c5b74c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-font.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ft-font.c
@@ -216,6 +216,17 @@ _cairo_ft_resolve_pattern (FcPattern		      *pattern,
 
 #endif
 
+static cairo_status_t
+_ft_to_cairo_error (FT_Error error)
+{
+  /* Currently we don't get many (any?) useful statuses here.
+   * Populate as needed. */
+  switch (error)
+  {
+  default:		return CAIRO_STATUS_NO_MEMORY;
+  }
+}
+
 /*
  * We maintain a hash table to map file/id => #cairo_ft_unscaled_font_t.
  * The hash table itself isn't limited in size. However, we limit the
@@ -645,6 +656,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
 {
     cairo_ft_unscaled_font_map_t *font_map;
     FT_Face face = NULL;
+    FT_Error error;
 
     CAIRO_MUTEX_LOCK (unscaled->mutex);
     unscaled->lock_count++;
@@ -674,14 +686,15 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
     }
     _cairo_ft_unscaled_font_map_unlock ();
 
-    if (FT_New_Face (font_map->ft_library,
-		     unscaled->filename,
-		     unscaled->id,
-		     &face) != FT_Err_Ok)
+    error = FT_New_Face (font_map->ft_library,
+			 unscaled->filename,
+			 unscaled->id,
+			 &face);
+    if (error)
     {
 	unscaled->lock_count--;
 	CAIRO_MUTEX_UNLOCK (unscaled->mutex);
-	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
+	_cairo_error_throw (_ft_to_cairo_error (error));
 	return NULL;
     }
 
@@ -835,7 +848,7 @@ _cairo_ft_unscaled_font_set_scale (cairo_ft_unscaled_font_t *unscaled,
 			      sf.y_scale * 64.0 + .5,
 			      0, 0);
     if (error)
-      return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+      return _cairo_error (_ft_to_cairo_error (error));
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1240,6 +1253,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
 
 	    FT_Bitmap  tmp;
 	    FT_Int     align;
+	    FT_Error   error;
 
 	    format = CAIRO_FORMAT_A8;
 
@@ -1247,8 +1261,9 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
 
 	    FT_Bitmap_New( &tmp );
 
-	    if (FT_Bitmap_Convert( library, bitmap, &tmp, align ))
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    error = FT_Bitmap_Convert( library, bitmap, &tmp, align );
+	    if (error)
+		return _cairo_error (_ft_to_cairo_error (error));
 
 	    FT_Bitmap_Done( library, bitmap );
 	    *bitmap = tmp;
@@ -1277,7 +1292,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
     default:
 	if (own_buffer)
 	    free (bitmap->buffer);
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     }
 
     /* XXX */
@@ -1328,7 +1343,7 @@ _render_glyph_outline (FT_Face                    face,
     FT_BBox cbox;
     unsigned int width, height;
     cairo_status_t status;
-    FT_Error fterror;
+    FT_Error error;
     FT_Library library = glyphslot->library;
     FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL;
 
@@ -1441,20 +1456,20 @@ _render_glyph_outline (FT_Face                    face,
 	FT_Library_SetLcdFilter (library, lcd_filter);
 #endif
 
-	fterror = FT_Render_Glyph (face->glyph, render_mode);
+	error = FT_Render_Glyph (face->glyph, render_mode);
 
 #if HAVE_FT_LIBRARY_SETLCDFILTER
 	FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
 #endif
 
-	if (fterror != 0)
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	if (error)
+	    return _cairo_error (_ft_to_cairo_error (error));
 
 	bitmap_size = _compute_xrender_bitmap_size (&bitmap,
 						    face->glyph,
 						    render_mode);
 	if (bitmap_size < 0)
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
 
 	bitmap.buffer = calloc (1, bitmap_size);
 	if (bitmap.buffer == NULL)
@@ -3284,8 +3299,12 @@ cairo_ft_font_face_create_for_pattern (FcPattern *pattern)
     cairo_status_t status;
 
     status = _cairo_ft_unscaled_font_create_for_pattern (pattern, &unscaled);
-    if (unlikely (status))
+    if (unlikely (status)) {
+      if (status == CAIRO_STATUS_FILE_NOT_FOUND)
+	return (cairo_font_face_t *) &_cairo_font_face_nil_file_not_found;
+      else
 	return (cairo_font_face_t *) &_cairo_font_face_nil;
+    }
     if (unlikely (unscaled == NULL)) {
 	/* Store the pattern.  We will resolve it and create unscaled
 	 * font when creating scaled fonts */
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-ft-private.h
index 0dc8114726f..0dc8114726f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ft-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft.h b/Build/source/libs/cairo/cairo-src/src/cairo-ft.h
index 29c43c9655b..29c43c9655b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ft.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-composite.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-composite.c
index b50f9a76c52..5b1411472d0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-composite.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-composite.c
@@ -861,7 +861,7 @@ _cairo_gl_composite_flush (cairo_gl_context_t *ctx)
 	_cairo_gl_composite_draw_triangles_with_clip_region (ctx, count);
     }
 
-    for (i = 0; i < ARRAY_LENGTH (&ctx->glyph_cache); i++)
+    for (i = 0; i < ARRAY_LENGTH (ctx->glyph_cache); i++)
 	_cairo_gl_glyph_cache_unlock (&ctx->glyph_cache[i]);
 }
 
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-device.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-device.c
index 7235d9ae123..7235d9ae123 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-device.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-device.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-gl-dispatch-private.h
index cabf76f0d6b..cabf76f0d6b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-dispatch-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-dispatch.c
index 76c3115ba37..76c3115ba37 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-dispatch.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-ext-def-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-gl-ext-def-private.h
index a261947bef0..a261947bef0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-ext-def-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-ext-def-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-glyphs.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-glyphs.c
index 8a1a548d939..8a1a548d939 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-glyphs.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-glyphs.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-gl-gradient-private.h
index 77f9bbdc5f5..77f9bbdc5f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-gradient-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-gradient.c
index ac3292101ec..ac3292101ec 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-gradient.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-info.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-info.c
index acefbb91059..acefbb91059 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-info.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-info.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-msaa-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-msaa-compositor.c
index 83e8eb2d160..83e8eb2d160 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-msaa-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-msaa-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-operand.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-operand.c
index 40157471747..1d1465a0be9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-operand.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-operand.c
@@ -301,8 +301,10 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
        so we need to release this device while we paint it to the image. */
     if (src_is_gl_surface) {
 	status = _cairo_gl_context_release (ctx, status);
-	if (unlikely (status))
+	if (unlikely (status)) {
+	    _cairo_surface_unmap_image (&surface->base, image);
 	    goto fail;
+	}
     }
 
     status = _cairo_surface_offset_paint (&image->base, extents->x, extents->y,
@@ -310,8 +312,10 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
 
     if (src_is_gl_surface) {
 	status = _cairo_gl_context_acquire (dst->base.device, &ctx);
-	if (unlikely (status))
+	if (unlikely (status)) {
+	    _cairo_surface_unmap_image (&surface->base, image);
 	    goto fail;
+	}
     }
 
     status = _cairo_surface_unmap_image (&surface->base, image);
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-gl-private.h
index cb915c8cf25..cb915c8cf25 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-shaders.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-shaders.c
index 27106066650..fe975d2d7c9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-shaders.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-shaders.c
@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx,
 {
     cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
     float gl_m[9] = {
-	m->xx, m->xy, m->x0,
-	m->yx, m->yy, m->y0,
-	0,     0,     1
+	m->xx, m->yx, 0,
+	m->xy, m->yy, 0,
+	m->x0, m->y0, 1
     };
     assert (location != -1);
-    dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m);
+    dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m);
 }
 
 void
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-source.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-source.c
index 12235295f40..12235295f40 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-source.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-source.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-spans-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-spans-compositor.c
index 4317ccd074a..4317ccd074a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-spans-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-spans-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-surface.c
index cfccf4dfda5..cfccf4dfda5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-traps-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-gl-traps-compositor.c
index 125ed4eabcb..125ed4eabcb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-traps-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl-traps-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl.h b/Build/source/libs/cairo/cairo-src/src/cairo-gl.h
index 9fd7608f5cf..9fd7608f5cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gl.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-glx-context.c b/Build/source/libs/cairo/cairo-src/src/cairo-glx-context.c
index 3761b9079a4..3761b9079a4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-glx-context.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-glx-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-gstate-private.h
index b2ccc76d145..b2ccc76d145 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gstate-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate.c b/Build/source/libs/cairo/cairo-src/src/cairo-gstate.c
index b4e988e96d8..b4e988e96d8 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-gstate.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-hash-private.h
index 30e51ffe669..30e51ffe669 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-hash-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash.c b/Build/source/libs/cairo/cairo-src/src/cairo-hash.c
index 928c74b8bd6..928c74b8bd6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-hash.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hull.c b/Build/source/libs/cairo/cairo-src/src/cairo-hull.c
index c65593327f6..c65593327f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hull.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-hull.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-image-compositor.c
index 48072f81bd0..48072f81bd0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-image-info-private.h
index e64928e40ec..e64928e40ec 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-info-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info.c b/Build/source/libs/cairo/cairo-src/src/cairo-image-info.c
index 26e7ae5afd1..26e7ae5afd1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-info.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-source.c b/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
index 950053db2c1..950053db2c1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-source.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface-inline.h
index 743d5fd3e75..743d5fd3e75 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface-private.h
index 8ca694c5e3e..8ca694c5e3e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface.c
index 1fd563d1c34..1fd563d1c34 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-line-inline.h
index 71cc5e7ebf4..71cc5e7ebf4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-line-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-line-private.h
index 08bf4b3587c..08bf4b3587c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-line-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line.c b/Build/source/libs/cairo/cairo-src/src/cairo-line.c
index cb13927bdce..cb13927bdce 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-line.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-list-inline.h
index 0955178d24f..0955178d24f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-list-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-list-private.h
index 9f39b668f82..9f39b668f82 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-list-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-lzw.c b/Build/source/libs/cairo/cairo-src/src/cairo-lzw.c
index de7f9998376..de7f9998376 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-lzw.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-lzw.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-malloc-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-malloc-private.h
index 1e2c67f8d9a..1e2c67f8d9a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-malloc-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-malloc-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mask-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-mask-compositor.c
index 4d6b118dda5..4d6b118dda5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mask-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mask-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-matrix.c b/Build/source/libs/cairo/cairo-src/src/cairo-matrix.c
index ae498f5151a..ae498f5151a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-matrix.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-matrix.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-mempool-private.h
index a09f6ce51f6..a09f6ce51f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mempool-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool.c b/Build/source/libs/cairo/cairo-src/src/cairo-mempool.c
index 751ede320f3..751ede320f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mempool.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mesh-pattern-rasterizer.c b/Build/source/libs/cairo/cairo-src/src/cairo-mesh-pattern-rasterizer.c
index 1b63ca8a660..1b63ca8a660 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mesh-pattern-rasterizer.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mesh-pattern-rasterizer.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-misc.c b/Build/source/libs/cairo/cairo-src/src/cairo-misc.c
index df8a4efc940..3c7c959862d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-misc.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-misc.c
@@ -774,7 +774,7 @@ cairo_get_locale_decimal_point (void)
 const char *
 cairo_get_locale_decimal_point (void)
 {
-    return '.';
+    return ".";
 }
 #endif
 
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mono-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-mono-scan-converter.c
index 2a9546cf82a..2a9546cf82a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mono-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mono-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-impl-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-impl-private.h
index 25223f3eac0..25223f3eac0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-impl-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-impl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-list-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-list-private.h
index f46afadb04b..f46afadb04b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-list-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-list-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-private.h
index 61a7160a066..61a7160a066 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-type-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-type-private.h
index e8c493985c9..e8c493985c9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-type-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mutex-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex.c b/Build/source/libs/cairo/cairo-src/src/cairo-mutex.c
index 0a31dced3e1..0a31dced3e1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-mutex.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-no-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-no-compositor.c
index 1602a12f63a..1602a12f63a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-no-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-no-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-observer.c b/Build/source/libs/cairo/cairo-src/src/cairo-observer.c
index 36d6b93bd63..36d6b93bd63 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-observer.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-observer.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-os2-private.h
index 829dd3c8d41..829dd3c8d41 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-os2-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-os2-surface.c
index 1ab50f97798..1ab50f97798 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-os2-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2.h b/Build/source/libs/cairo/cairo-src/src/cairo-os2.h
index d23f2dec42a..d23f2dec42a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-os2.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-output-stream-private.h
index 2542646b860..2542646b860 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-output-stream-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream.c b/Build/source/libs/cairo/cairo-src/src/cairo-output-stream.c
index 369a59bfba8..369a59bfba8 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-output-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-private.h
index b827faba0ef..b827faba0ef 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-surface-private.h
index ebf4b342492..ebf4b342492 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-surface.c
index 68e4e0e34fd..68e4e0e34fd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-paginated-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-bounds.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-bounds.c
index 9c7222426d3..9c7222426d3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-bounds.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-bounds.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fill.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-fill.c
index 4000c9c586e..4000c9c586e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fill.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-fill.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-path-fixed-private.h
index cf7cd0836fb..cf7cd0836fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-fixed-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-fixed.c
index 4bbf496f075..4bbf496f075 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-fixed.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-in-fill.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-in-fill.c
index 1787fb1a3ba..1787fb1a3ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-in-fill.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-in-fill.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-path-private.h
index 7b54317e20e..7b54317e20e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-boxes.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-boxes.c
index 7f25bf76cf7..7f25bf76cf7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-boxes.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-polygon.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-polygon.c
index e5082bbec68..e5082bbec68 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-polygon.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-traps.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-traps.c
index da54e5a358f..da54e5a358f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-traps.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-traps.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-tristrip.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-tristrip.c
index 6ce4131cc0f..6ce4131cc0f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-tristrip.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke-tristrip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke.c b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke.c
index 4d4ede81361..4d4ede81361 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path-stroke.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path.c b/Build/source/libs/cairo/cairo-src/src/cairo-path.c
index 43cd175a3c5..43cd175a3c5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-path.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-pattern-inline.h
index 97e8ea034e4..97e8ea034e4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pattern-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-pattern-private.h
index be8ab9fc239..be8ab9fc239 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pattern-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern.c b/Build/source/libs/cairo/cairo-src/src/cairo-pattern.c
index ac5d7af20a2..ac5d7af20a2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pattern.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-operators-private.h
index 4314a042e81..4314a042e81 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-operators-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators.c b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-operators.c
index dcee25f0c23..dcee25f0c23 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-operators.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-shading-private.h
index 0ca8cb7d518..0ca8cb7d518 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-shading-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading.c b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-shading.c
index 646e2cd4902..646e2cd4902 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-shading.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-surface-private.h
index 618ca4ede9f..618ca4ede9f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-surface.c
index fd52b0d3ed6..4bc2947964e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf-surface.c
@@ -136,7 +136,7 @@
  * %CAIRO_MIME_TYPE_JBIG2, %CAIRO_MIME_TYPE_JBIG2_GLOBAL,
  * %CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID.
  *
- * JBIG2 data in PDF must be in the embedded format as descibed in
+ * JBIG2 data in PDF must be in the embedded format as described in
  * ISO/IEC 11544. Image specific JBIG2 data must be in
  * %CAIRO_MIME_TYPE_JBIG2.  Any global segments in the JBIG2 data
  * (segments with page association field set to 0) must be in
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf.h b/Build/source/libs/cairo/cairo-src/src/cairo-pdf.h
index 1bc8524f2b1..1bc8524f2b1 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pdf.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pen.c b/Build/source/libs/cairo/cairo-src/src/cairo-pen.c
index 61be0e8299d..61be0e8299d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pen.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pen.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pixman-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-pixman-private.h
index d705025c8ee..d705025c8ee 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pixman-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-pixman-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-png.c b/Build/source/libs/cairo/cairo-src/src/cairo-png.c
index 068617d588d..068617d588d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-png.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-png.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-intersect.c b/Build/source/libs/cairo/cairo-src/src/cairo-polygon-intersect.c
index 2cd73d2e56b..8cb8fb1208b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-intersect.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-polygon-intersect.c
@@ -42,11 +42,10 @@
 #include "cairo-freelist-private.h"
 #include "cairo-combsort-inline.h"
 
-typedef cairo_point_t cairo_bo_point32_t;
 
 typedef struct _cairo_bo_intersect_ordinate {
     int32_t ordinate;
-    enum { EXACT, INEXACT } exactness;
+    enum { EXCESS = -1, EXACT = 0, DEFAULT = 1 } approx;
 } cairo_bo_intersect_ordinate_t;
 
 typedef struct _cairo_bo_intersect_point {
@@ -77,25 +76,25 @@ struct _cairo_bo_edge {
 #define PQ_LEFT_CHILD_INDEX(i) ((i) << 1)
 
 typedef enum {
-    CAIRO_BO_EVENT_TYPE_STOP,
+    CAIRO_BO_EVENT_TYPE_STOP = -1,
     CAIRO_BO_EVENT_TYPE_INTERSECTION,
     CAIRO_BO_EVENT_TYPE_START
 } cairo_bo_event_type_t;
 
 typedef struct _cairo_bo_event {
     cairo_bo_event_type_t type;
-    cairo_point_t point;
+    cairo_bo_intersect_point_t point;
 } cairo_bo_event_t;
 
 typedef struct _cairo_bo_start_event {
     cairo_bo_event_type_t type;
-    cairo_point_t point;
+    cairo_bo_intersect_point_t point;
     cairo_bo_edge_t edge;
 } cairo_bo_start_event_t;
 
 typedef struct _cairo_bo_queue_event {
     cairo_bo_event_type_t type;
-    cairo_point_t point;
+    cairo_bo_intersect_point_t point;
     cairo_bo_edge_t *e1;
     cairo_bo_edge_t *e2;
 } cairo_bo_queue_event_t;
@@ -142,16 +141,20 @@ _line_compute_intersection_x_for_y (const cairo_line_t *line,
 }
 
 static inline int
-_cairo_bo_point32_compare (cairo_bo_point32_t const *a,
-			   cairo_bo_point32_t const *b)
+_cairo_bo_point32_compare (cairo_bo_intersect_point_t const *a,
+			   cairo_bo_intersect_point_t const *b)
 {
     int cmp;
 
-    cmp = a->y - b->y;
+    cmp = a->y.ordinate - b->y.ordinate;
     if (cmp)
 	return cmp;
 
-    return a->x - b->x;
+    cmp = a->y.approx - b->y.approx;
+    if (cmp)
+	return cmp;
+
+    return a->x.ordinate - b->x.ordinate;
 }
 
 /* Compare the slope of a to the slope of b, returning 1, 0, -1 if the
@@ -525,6 +528,30 @@ det64x32_128 (cairo_int64_t a, int32_t       b,
 			      _cairo_int64x32_128_mul (c, b));
 }
 
+static inline cairo_bo_intersect_ordinate_t
+round_to_nearest (cairo_quorem64_t d,
+		  cairo_int64_t    den)
+{
+    cairo_bo_intersect_ordinate_t ordinate;
+    int32_t quo = d.quo;
+    cairo_int64_t drem_2 = _cairo_int64_mul (d.rem, _cairo_int32_to_int64 (2));
+
+    /* assert (! _cairo_int64_negative (den));*/
+
+    if (_cairo_int64_lt (drem_2, _cairo_int64_negate (den))) {
+	quo -= 1;
+	drem_2 = _cairo_int64_negate (drem_2);
+    } else if (_cairo_int64_le (den, drem_2)) {
+	quo += 1;
+	drem_2 = _cairo_int64_negate (drem_2);
+    }
+
+    ordinate.ordinate = quo;
+    ordinate.approx = _cairo_int64_is_zero (drem_2) ? EXACT : _cairo_int64_negative (drem_2) ? EXCESS : DEFAULT;
+
+    return ordinate;
+}
+
 /* Compute the intersection of two lines as defined by two edges. The
  * result is provided as a coordinate pair of 128-bit integers.
  *
@@ -578,24 +605,14 @@ intersect_lines (cairo_bo_edge_t		*a,
     R = det32_64 (dx2, dy2,
 		  b->edge.line.p1.x - a->edge.line.p1.x,
 		  b->edge.line.p1.y - a->edge.line.p1.y);
-    if (_cairo_int64_negative (den_det)) {
-	if (_cairo_int64_ge (den_det, R))
-	    return FALSE;
-    } else {
 	if (_cairo_int64_le (den_det, R))
 	    return FALSE;
-    }
 
     R = det32_64 (dy1, dx1,
 		  a->edge.line.p1.y - b->edge.line.p1.y,
 		  a->edge.line.p1.x - b->edge.line.p1.x);
-    if (_cairo_int64_negative (den_det)) {
-	if (_cairo_int64_ge (den_det, R))
-	    return FALSE;
-    } else {
 	if (_cairo_int64_le (den_det, R))
 	    return FALSE;
-    }
 
     /* We now know that the two lines should intersect within range. */
 
@@ -610,22 +627,8 @@ intersect_lines (cairo_bo_edge_t		*a,
 					 den_det);
     if (_cairo_int64_eq (qr.rem, den_det))
 	return FALSE;
-#if 0
-    intersection->x.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
-#else
-    intersection->x.exactness = EXACT;
-    if (! _cairo_int64_is_zero (qr.rem)) {
-	if (_cairo_int64_negative (den_det) ^ _cairo_int64_negative (qr.rem))
-	    qr.rem = _cairo_int64_negate (qr.rem);
-	qr.rem = _cairo_int64_mul (qr.rem, _cairo_int32_to_int64 (2));
-	if (_cairo_int64_ge (qr.rem, den_det)) {
-	    qr.quo = _cairo_int64_add (qr.quo,
-				       _cairo_int32_to_int64 (_cairo_int64_negative (qr.quo) ? -1 : 1));
-	} else
-	    intersection->x.exactness = INEXACT;
-    }
-#endif
-    intersection->x.ordinate = _cairo_int64_to_int32 (qr.quo);
+
+    intersection->x = round_to_nearest (qr, den_det);
 
     /* y = det (a_det, dy1, b_det, dy2) / den_det */
     qr = _cairo_int_96by64_32x64_divrem (det64x32_128 (a_det, dy1,
@@ -633,22 +636,8 @@ intersect_lines (cairo_bo_edge_t		*a,
 					 den_det);
     if (_cairo_int64_eq (qr.rem, den_det))
 	return FALSE;
-#if 0
-    intersection->y.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
-#else
-    intersection->y.exactness = EXACT;
-    if (! _cairo_int64_is_zero (qr.rem)) {
-	if (_cairo_int64_negative (den_det) ^ _cairo_int64_negative (qr.rem))
-	    qr.rem = _cairo_int64_negate (qr.rem);
-	qr.rem = _cairo_int64_mul (qr.rem, _cairo_int32_to_int64 (2));
-	if (_cairo_int64_ge (qr.rem, den_det)) {
-	    qr.quo = _cairo_int64_add (qr.quo,
-				       _cairo_int32_to_int64 (_cairo_int64_negative (qr.quo) ? -1 : 1));
-	} else
-	    intersection->y.exactness = INEXACT;
-    }
-#endif
-    intersection->y.ordinate = _cairo_int64_to_int32 (qr.quo);
+
+    intersection->y = round_to_nearest (qr, den_det);
 
     return TRUE;
 }
@@ -662,9 +651,8 @@ _cairo_bo_intersect_ordinate_32_compare (cairo_bo_intersect_ordinate_t	a,
 	return +1;
     if (a.ordinate < b)
 	return -1;
-    /* With quotient identical, if remainder is 0 then compare equal */
-    /* Otherwise, the non-zero remainder makes a > b */
-    return INEXACT == a.exactness;
+
+    return a.approx; /* == EXCESS ? -1 : a.approx == EXACT ? 0 : 1;*/
 }
 
 /* Does the given edge contain the given point. The point must already
@@ -688,54 +676,8 @@ static cairo_bool_t
 _cairo_bo_edge_contains_intersect_point (cairo_bo_edge_t		*edge,
 					 cairo_bo_intersect_point_t	*point)
 {
-    int cmp_top, cmp_bottom;
-
-    /* XXX: When running the actual algorithm, we don't actually need to
-     * compare against edge->top at all here, since any intersection above
-     * top is eliminated early via a slope comparison. We're leaving these
-     * here for now only for the sake of the quadratic-time intersection
-     * finder which needs them.
-     */
-
-    cmp_top = _cairo_bo_intersect_ordinate_32_compare (point->y,
-						       edge->edge.top);
-    cmp_bottom = _cairo_bo_intersect_ordinate_32_compare (point->y,
-							  edge->edge.bottom);
-
-    if (cmp_top < 0 || cmp_bottom > 0)
-    {
-	return FALSE;
-    }
-
-    if (cmp_top > 0 && cmp_bottom < 0)
-    {
-	return TRUE;
-    }
-
-    /* At this stage, the point lies on the same y value as either
-     * edge->top or edge->bottom, so we have to examine the x value in
-     * order to properly determine containment. */
-
-    /* If the y value of the point is the same as the y value of the
-     * top of the edge, then the x value of the point must be greater
-     * to be considered as inside the edge. Similarly, if the y value
-     * of the point is the same as the y value of the bottom of the
-     * edge, then the x value of the point must be less to be
-     * considered as inside. */
-
-    if (cmp_top == 0) {
-	cairo_fixed_t top_x;
-
-	top_x = _line_compute_intersection_x_for_y (&edge->edge.line,
-						    edge->edge.top);
-	return _cairo_bo_intersect_ordinate_32_compare (point->x, top_x) > 0;
-    } else { /* cmp_bottom == 0 */
-	cairo_fixed_t bot_x;
-
-	bot_x = _line_compute_intersection_x_for_y (&edge->edge.line,
-						    edge->edge.bottom);
-	return _cairo_bo_intersect_ordinate_32_compare (point->x, bot_x) < 0;
-    }
+    return _cairo_bo_intersect_ordinate_32_compare (point->y,
+						    edge->edge.bottom) < 0;
 }
 
 /* Compute the intersection of two edges. The result is provided as a
@@ -757,27 +699,17 @@ _cairo_bo_edge_contains_intersect_point (cairo_bo_edge_t		*edge,
 static cairo_bool_t
 _cairo_bo_edge_intersect (cairo_bo_edge_t	*a,
 			  cairo_bo_edge_t	*b,
-			  cairo_bo_point32_t	*intersection)
+			  cairo_bo_intersect_point_t *intersection)
 {
-    cairo_bo_intersect_point_t quorem;
-
-    if (! intersect_lines (a, b, &quorem))
+    if (! intersect_lines (a, b, intersection))
 	return FALSE;
 
-    if (! _cairo_bo_edge_contains_intersect_point (a, &quorem))
+    if (! _cairo_bo_edge_contains_intersect_point (a, intersection))
 	return FALSE;
 
-    if (! _cairo_bo_edge_contains_intersect_point (b, &quorem))
+    if (! _cairo_bo_edge_contains_intersect_point (b, intersection))
 	return FALSE;
 
-    /* Now that we've correctly compared the intersection point and
-     * determined that it lies within the edge, then we know that we
-     * no longer need any more bits of storage for the intersection
-     * than we do for our edge coordinates. We also no longer need the
-     * remainder from the division. */
-    intersection->x = quorem.x.ordinate;
-    intersection->y = quorem.y.ordinate;
-
     return TRUE;
 }
 
@@ -795,7 +727,7 @@ cairo_bo_event_compare (const cairo_bo_event_t *a,
     if (cmp)
 	return cmp;
 
-    return a - b;
+    return a < b ? -1 : a == b ? 0 : 1;
 }
 
 static inline void
@@ -907,7 +839,7 @@ _cairo_bo_event_queue_insert (cairo_bo_event_queue_t	*queue,
 			      cairo_bo_event_type_t	 type,
 			      cairo_bo_edge_t		*e1,
 			      cairo_bo_edge_t		*e2,
-			      const cairo_point_t	 *point)
+			      const cairo_bo_intersect_point_t  *point)
 {
     cairo_bo_queue_event_t *event;
 
@@ -975,11 +907,14 @@ static cairo_status_t
 event_queue_insert_stop (cairo_bo_event_queue_t	*event_queue,
 			 cairo_bo_edge_t		*edge)
 {
-    cairo_bo_point32_t point;
+    cairo_bo_intersect_point_t point;
+
+    point.y.ordinate = edge->edge.bottom;
+    point.y.approx   = EXACT;
+    point.x.ordinate = _line_compute_intersection_x_for_y (&edge->edge.line,
+							   point.y.ordinate);
+    point.x.approx   = EXACT;
 
-    point.y = edge->edge.bottom;
-    point.x = _line_compute_intersection_x_for_y (&edge->edge.line,
-						  point.y);
     return _cairo_bo_event_queue_insert (event_queue,
 					 CAIRO_BO_EVENT_TYPE_STOP,
 					 edge, NULL,
@@ -998,7 +933,7 @@ event_queue_insert_if_intersect_below_current_y (cairo_bo_event_queue_t	*event_q
 						 cairo_bo_edge_t	*left,
 						 cairo_bo_edge_t *right)
 {
-    cairo_bo_point32_t intersection;
+    cairo_bo_intersect_point_t intersection;
 
     if (_line_equal (&left->edge.line, &right->edge.line))
 	return CAIRO_STATUS_SUCCESS;
@@ -1267,11 +1202,11 @@ intersection_sweep (cairo_bo_event_t   **start_events,
     _cairo_bo_sweep_line_init (&sweep_line);
 
     while ((event = _cairo_bo_event_dequeue (&event_queue))) {
-	if (event->point.y != sweep_line.current_y) {
+	if (event->point.y.ordinate != sweep_line.current_y) {
 	    active_edges (sweep_line.head,
 			  sweep_line.current_y,
 			  polygon);
-	    sweep_line.current_y = event->point.y;
+	    sweep_line.current_y = event->point.y.ordinate;
 	}
 
 	switch (event->type) {
@@ -1418,10 +1353,12 @@ _cairo_polygon_intersect (cairo_polygon_t *a, int winding_a,
 	event_ptrs[j] = (cairo_bo_event_t *) &events[j];
 
 	events[j].type = CAIRO_BO_EVENT_TYPE_START;
-	events[j].point.y = a->edges[i].top;
-	events[j].point.x =
+	events[j].point.y.ordinate = a->edges[i].top;
+	events[j].point.y.approx = EXACT;
+	events[j].point.x.ordinate =
 	    _line_compute_intersection_x_for_y (&a->edges[i].line,
-						events[j].point.y);
+						events[j].point.y.ordinate);
+	events[j].point.x.approx = EXACT;
 
 	events[j].edge.a_or_b = 0;
 	events[j].edge.edge = a->edges[i];
@@ -1435,10 +1372,12 @@ _cairo_polygon_intersect (cairo_polygon_t *a, int winding_a,
 	event_ptrs[j] = (cairo_bo_event_t *) &events[j];
 
 	events[j].type = CAIRO_BO_EVENT_TYPE_START;
-	events[j].point.y = b->edges[i].top;
-	events[j].point.x =
+	events[j].point.y.ordinate = b->edges[i].top;
+	events[j].point.y.approx = EXACT;
+	events[j].point.x.ordinate =
 	    _line_compute_intersection_x_for_y (&b->edges[i].line,
-						events[j].point.y);
+						events[j].point.y.ordinate);
+	events[j].point.x.approx = EXACT;
 
 	events[j].edge.a_or_b = 1;
 	events[j].edge.edge = b->edges[i];
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-reduce.c b/Build/source/libs/cairo/cairo-src/src/cairo-polygon-reduce.c
index ea457fe4edf..ea457fe4edf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-reduce.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-polygon-reduce.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon.c b/Build/source/libs/cairo/cairo-src/src/cairo-polygon.c
index b0424f6e72e..b0424f6e72e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-private.h
index 9f4f55b7cea..9f4f55b7cea 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-ps-surface-private.h
index 1d5d27d4910..1d5d27d4910 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ps-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-ps-surface.c
index 03eba62db5d..03eba62db5d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ps-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps.h b/Build/source/libs/cairo/cairo-src/src/cairo-ps.h
index 33d0e0d941b..33d0e0d941b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-ps.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt-surface.cpp b/Build/source/libs/cairo/cairo-src/src/cairo-qt-surface.cpp
index 7ddad77df37..7ddad77df37 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt-surface.cpp
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-qt-surface.cpp
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt.h b/Build/source/libs/cairo/cairo-src/src/cairo-qt.h
index c20bbb18d0b..c20bbb18d0b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-qt.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-font.c b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-font.c
index 02f34267b18..feee61a0d86 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-font.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-font.c
@@ -560,7 +560,7 @@ _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
 					-font->base.scale.yy,
 					0, 0);
 
-    ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+    ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 1.0, NULL, NULL);
     glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
     CFRelease (ctFont);
     if (!glyphPath)
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-image-surface.c
index 498a7b06436..498a7b06436 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-image-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image.h b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-image.h
index dae234dacae..dae234dacae 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-image.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-private.h
index 3ef14c3ae60..3ef14c3ae60 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-surface.c
index 1116ff94c1e..1116ff94c1e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz.h b/Build/source/libs/cairo/cairo-src/src/cairo-quartz.h
index 9be5f9ae5cf..9be5f9ae5cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-quartz.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-raster-source-pattern.c b/Build/source/libs/cairo/cairo-src/src/cairo-raster-source-pattern.c
index 64520feae52..64520feae52 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-raster-source-pattern.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-raster-source-pattern.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface-inline.h
index 9002ccd6938..9002ccd6938 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface-private.h
index 456c63389b7..456c63389b7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface.c
index ce29b936630..78e7cfa7efc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-recording-surface.c
@@ -1165,7 +1165,7 @@ _cairo_recording_surface_copy__mask (cairo_recording_surface_t *surface,
 	goto err_command;
 
     status = _cairo_pattern_init_copy (&command->mask.base,
-				       &src->mask.source.base);
+				       &src->mask.mask.base);
     if (unlikely (status))
 	goto err_source;
 
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangle.c b/Build/source/libs/cairo/cairo-src/src/cairo-rectangle.c
index 2d51d7b10a4..2d51d7b10a4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangle.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-rectangle.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangular-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-rectangular-scan-converter.c
index e353b34e853..e353b34e853 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangular-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-rectangular-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-reference-count-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-reference-count-private.h
index 75fdf3538f5..75fdf3538f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-reference-count-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-reference-count-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-region-private.h
index 549e5087898..549e5087898 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-region-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region.c b/Build/source/libs/cairo/cairo-src/src/cairo-region.c
index ccfb2200e14..ccfb2200e14 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-region.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-rtree-private.h
index 27806cab603..27806cab603 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-rtree-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree.c b/Build/source/libs/cairo/cairo-src/src/cairo-rtree.c
index dbc040929af..dbc040929af 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-rtree.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-private.h
index da7b3469834..da7b3469834 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-subsets-private.h
index 866e63d7bca..866e63d7bca 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-subsets-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets.c b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-subsets.c
index 2121761839e..196fa999aa7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font-subsets.c
@@ -1206,10 +1206,12 @@ _cairo_scaled_font_subset_create_glyph_names (cairo_scaled_font_subset_t *subset
 
 	if (utf16_len == 1) {
 	    int ch = _cairo_unicode_to_winansi (utf16[0]);
-	    if (ch > 0 && _cairo_winansi_to_glyphname (ch))
+	    if (ch > 0 && _cairo_winansi_to_glyphname (ch)) {
 		strncpy (buf, _cairo_winansi_to_glyphname (ch), sizeof (buf));
-	    else
+		buf[sizeof (buf)-1] = '\0';
+	    } else {
 		snprintf (buf, sizeof (buf), "uni%04X", (int) utf16[0]);
+	    }
 
 	    _cairo_string_init_key (&key, buf);
 	    entry = _cairo_hash_table_lookup (names, &key.base);
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font.c b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font.c
index ac80c97d1c5..ac80c97d1c5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-scaled-font.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-script-private.h
index 5b506f500cd..5b506f500cd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-script-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-script-surface.c
index b84aed976f3..a4cefdebb4b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-script-surface.c
@@ -50,7 +50,7 @@
  *
  * The script surface provides the ability to render to a native
  * script that matches the cairo drawing model. The scripts can
- * be replayed using tools under the util/cairo-script directoriy,
+ * be replayed using tools under the util/cairo-script directory,
  * or with cairo-perf-trace.
  **/
 
@@ -1837,7 +1837,7 @@ _emit_path_boxes (cairo_script_surface_t *surface,
 
     if (! _cairo_path_fixed_iter_at_end (&iter)) {
 	_cairo_boxes_fini (&boxes);
-	return FALSE;
+	return CAIRO_STATUS_INVALID_PATH_DATA;
     }
 
     for (chunk = &boxes.chunks; chunk; chunk = chunk->next) {
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script.h b/Build/source/libs/cairo/cairo-src/src/cairo-script.h
index b5a8cf32d0b..b5a8cf32d0b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-script.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-shape-mask-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-shape-mask-compositor.c
index 3117267cccf..3117267cccf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-shape-mask-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-shape-mask-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-skia.h b/Build/source/libs/cairo/cairo-src/src/cairo-skia.h
index 99b92865699..99b92865699 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-skia.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-skia.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-slope-private.h
index 6a58c9f456d..6a58c9f456d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-slope-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope.c b/Build/source/libs/cairo/cairo-src/src/cairo-slope.c
index cc5f30cb0b3..cc5f30cb0b3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-slope.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-spans-compositor-private.h
index 0babebd26b5..0babebd26b5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-spans-compositor-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-spans-compositor.c
index efbae254bf4..efbae254bf4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-spans-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-spans-private.h
index b158f4d360a..b158f4d360a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-spans-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans.c b/Build/source/libs/cairo/cairo-src/src/cairo-spans.c
index 182390c205a..182390c205a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-spans.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spline.c b/Build/source/libs/cairo/cairo-src/src/cairo-spline.c
index 44634faec85..44634faec85 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spline.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-spline.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-dash-private.h
index 75c000cd73a..75c000cd73a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-dash-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash.c b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-dash.c
index 9494010f561..9494010f561 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-dash.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-style.c b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-style.c
index 51c9414c042..51c9414c042 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-style.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-stroke-style.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-backend-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-backend-private.h
index 955a79ff5c3..955a79ff5c3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-backend-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-backend-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-clipper-private.h
index e5b00af7c66..e5b00af7c66 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-clipper-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-clipper.c
index 5309362c68f..5309362c68f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-clipper.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-fallback-private.h
index ecf7b0edf2b..ecf7b0edf2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-fallback-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-fallback.c
index a0af1596921..a0af1596921 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-fallback.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-inline.h
index 85fbc9192bd..85fbc9192bd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer-inline.h
index 07b94770d4b..07b94770d4b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer-private.h
index 70c87db8283..6ed0c18d17c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer-private.h
@@ -62,7 +62,7 @@ struct extents {
 };
 
 struct pattern {
-    unsigned int type[7]; /* native/record/other surface/gradients */
+    unsigned int type[8]; /* native/record/other surface/gradients */
 };
 
 struct path {
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer.c
index 52b013644db..52b013644db 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-observer.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-offset-private.h
index 310ba5691cd..310ba5691cd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-offset-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-offset.c
index 98f57f29804..98f57f29804 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-offset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-private.h
index f20ab073932..f20ab073932 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot-inline.h
index bf89c772b42..bf89c772b42 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot-private.h
index 58bee7b49dd..58bee7b49dd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot.c
index 68bf9054ecd..68bf9054ecd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-snapshot.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-inline.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface-inline.h
index 0cd09e63e70..0cd09e63e70 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-inline.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface-private.h
index 89c5cc01b9d..89c5cc01b9d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface.c
index b7dfd9d9e0c..b7dfd9d9e0c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-subsurface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-surface-wrapper-private.h
index 6529ebc1115..6529ebc1115 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-wrapper-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface-wrapper.c
index 9236c8bf42e..9236c8bf42e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface-wrapper.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-surface.c
index 89345f593d6..bfe3fa1064c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-surface.c
@@ -1554,12 +1554,12 @@ _cairo_surface_flush (cairo_surface_t *surface, unsigned flags)
  * cairo_surface_flush:
  * @surface: a #cairo_surface_t
  *
- * Do any pending drawing for the surface and also restore any
- * temporary modifications cairo has made to the surface's
- * state. This function must be called before switching from
- * drawing on the surface with cairo to drawing on it directly
- * with native APIs. If the surface doesn't support direct access,
- * then this function does nothing.
+ * Do any pending drawing for the surface and also restore any temporary
+ * modifications cairo has made to the surface's state. This function
+ * must be called before switching from drawing on the surface with
+ * cairo to drawing on it directly with native APIs, or accessing its
+ * memory outside of Cairo. If the surface doesn't support direct
+ * access, then this function does nothing.
  *
  * Since: 1.0
  **/
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-svg-surface-private.h
index ddbf464b1d2..ddbf464b1d2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-svg-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-svg-surface.c
index 372ef45b86e..372ef45b86e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-svg-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg.h b/Build/source/libs/cairo/cairo-src/src/cairo-svg.h
index 592c645f627..592c645f627 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-svg.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-tee-surface-private.h
index a83cfc959db..a83cfc959db 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tee-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-tee-surface.c
index 294e5f162e2..294e5f162e2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tee-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee.h b/Build/source/libs/cairo/cairo-src/src/cairo-tee.h
index 9125a3a4a2b..9125a3a4a2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tee.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-time-private.h
index 06dc912b431..06dc912b431 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-time-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time.c b/Build/source/libs/cairo/cairo-src/src/cairo-time.c
index a0003fbfc2c..a0003fbfc2c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-time.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-tor-scan-converter.c
index b1b51872b19..b1b51872b19 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tor-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor22-scan-converter.c b/Build/source/libs/cairo/cairo-src/src/cairo-tor22-scan-converter.c
index 4cec5ee4f37..4cec5ee4f37 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor22-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tor22-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-toy-font-face.c b/Build/source/libs/cairo/cairo-src/src/cairo-toy-font-face.c
index 4fe94ab0919..4fe94ab0919 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-toy-font-face.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-toy-font-face.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-traps-compositor.c
index 3414fc2684a..3414fc2684a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-traps-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-traps-private.h
index dcaf40d1863..dcaf40d1863 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-traps-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps.c b/Build/source/libs/cairo/cairo-src/src/cairo-traps.c
index 3aa0052f91f..3aa0052f91f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-traps.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-tristrip-private.h
index ccd28799e82..ccd28799e82 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tristrip-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip.c b/Build/source/libs/cairo/cairo-src/src/cairo-tristrip.c
index bb4972f5003..bb4972f5003 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-tristrip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-truetype-subset-private.h
index dc9573216f3..dc9573216f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-truetype-subset-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset.c b/Build/source/libs/cairo/cairo-src/src/cairo-truetype-subset.c
index 645a89abf21..645a89abf21 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-truetype-subset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-fallback.c b/Build/source/libs/cairo/cairo-src/src/cairo-type1-fallback.c
index 4a657413e48..4a657413e48 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-fallback.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type1-fallback.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-glyph-names.c b/Build/source/libs/cairo/cairo-src/src/cairo-type1-glyph-names.c
index 80ccb96269e..80ccb96269e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-glyph-names.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type1-glyph-names.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-type1-private.h
index 1630397bca6..1630397bca6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type1-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-subset.c b/Build/source/libs/cairo/cairo-src/src/cairo-type1-subset.c
index b15663509d3..b15663509d3 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-subset.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type1-subset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-type3-glyph-surface-private.h
index 6f40f1c25b4..6f40f1c25b4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type3-glyph-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-type3-glyph-surface.c
index c99d461066c..c99d461066c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-type3-glyph-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-types-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-types-private.h
index 3d15d968e4b..3d15d968e4b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-types-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-types-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-unicode.c b/Build/source/libs/cairo/cairo-src/src/cairo-unicode.c
index 88de39516b6..88de39516b6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-unicode.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-unicode.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-uninstalled.pc.in b/Build/source/libs/cairo/cairo-src/src/cairo-uninstalled.pc.in
index 9dc3231ae45..9dc3231ae45 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-uninstalled.pc.in
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-uninstalled.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-user-font-private.h
index d54ef78b44e..d54ef78b44e 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-user-font-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font.c b/Build/source/libs/cairo/cairo-src/src/cairo-user-font.c
index 6d2de2097d5..6d2de2097d5 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-user-font.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.c b/Build/source/libs/cairo/cairo-src/src/cairo-version.c
index a94cef6819d..a94cef6819d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-version.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.h b/Build/source/libs/cairo/cairo-src/src/cairo-version.h
index 51008003f98..51008003f98 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-version.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-vg-surface.c
index 6e0d9a0ed69..6e0d9a0ed69 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-vg-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg.h b/Build/source/libs/cairo/cairo-src/src/cairo-vg.h
index f9a62e51c69..f9a62e51c69 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-vg.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wgl-context.c b/Build/source/libs/cairo/cairo-src/src/cairo-wgl-context.c
index 48723744648..48723744648 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wgl-context.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-wgl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-wideint-private.h
index 3f5491bb1c0..3f5491bb1c0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-wideint-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-type-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-wideint-type-private.h
index 84a3cbab0d2..84a3cbab0d2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-type-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-wideint-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint.c b/Build/source/libs/cairo/cairo-src/src/cairo-wideint.c
index 2e056fa36a2..2e056fa36a2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-wideint.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-win32.h b/Build/source/libs/cairo/cairo-src/src/cairo-win32.h
index 3d2e1c60169..3d2e1c60169 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-win32.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-win32.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-core.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-core.c
index e01dc1a8361..e01dc1a8361 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-core.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-core.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-render.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-render.c
index 61119653e9a..61119653e9a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-render.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-render.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-shm.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-shm.c
index 7720bbbd25b..7720bbbd25b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-shm.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection-shm.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection.c
index 67897fa4ecc..67897fa4ecc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-connection.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-private.h
index f5d5a4c81c7..f5d5a4c81c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-resources.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-resources.c
index 1877758c25a..1877758c25a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-resources.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-resources.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-screen.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-screen.c
index d0019f9cdff..d0019f9cdff 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-screen.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-screen.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-shm.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-shm.c
index 2be2dac5bf9..2be2dac5bf9 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-shm.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-shm.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-core.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface-core.c
index 9c0c0a0957d..9c0c0a0957d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-core.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface-core.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-render.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface-render.c
index 1a086a24fa1..044339bce8f 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-render.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface-render.c
@@ -1292,9 +1292,12 @@ _cairo_xcb_surface_picture (cairo_xcb_surface_t *target,
 	    return picture;
     }
 
+    /* XXX: This causes too many problems and bugs, let's skip it for now. */
+#if 0
     _cairo_surface_attach_snapshot (source,
 				    &picture->base,
 				    NULL);
+#endif
 
     _cairo_xcb_surface_setup_surface_picture (picture, pattern, extents);
     return picture;
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface.c
index d7e0d734ea5..d4d60ad7285 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb-surface.c
@@ -646,9 +646,8 @@ _put_shm_image_boxes (cairo_xcb_surface_t    *surface,
 						     shm_info->offset);
 	    }
 	}
+	return CAIRO_INT_STATUS_SUCCESS;
     }
-
-    return CAIRO_INT_STATUS_SUCCESS;
 #endif
 
     return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -692,15 +691,15 @@ _put_image_boxes (cairo_xcb_surface_t    *surface,
 			    int y = _cairo_fixed_integer_part (b->p1.y);
 			    int width = _cairo_fixed_integer_part (b->p2.x - b->p1.x);
 			    int height = _cairo_fixed_integer_part (b->p2.y - b->p1.y);
-			    _cairo_xcb_connection_put_image (surface->connection,
-							     surface->drawable, gc,
-							     width, height,
-							     x, y,
-							     image->depth,
-							     image->stride,
-							     image->data +
-							     x * PIXMAN_FORMAT_BPP (image->pixman_format) / 8 +
-							     y * image->stride);
+			    _cairo_xcb_connection_put_subimage (surface->connection,
+								surface->drawable, gc,
+								x, y,
+								width, height,
+								PIXMAN_FORMAT_BPP (image->pixman_format) / 8,
+								image->stride,
+								x, y,
+								image->depth,
+								image->data);
 
 		    }
 	    }
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb.h b/Build/source/libs/cairo/cairo-src/src/cairo-xcb.h
index e321d8482c2..e321d8482c2 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xcb.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-core-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-core-compositor.c
index 5babcc81bed..5babcc81bed 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-core-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-core-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-display.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-display.c
index a2a3bc7924b..a2a3bc7924b 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-display.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-display.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-fallback-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-fallback-compositor.c
index ed2845db57d..ed2845db57d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-fallback-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-fallback-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-private.h
index 0f2f2e1faa0..0f2f2e1faa0 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-render-compositor.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-render-compositor.c
index 8a1ec7bd731..8a1ec7bd731 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-render-compositor.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-render-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-screen.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-screen.c
index 57beeaab426..57beeaab426 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-screen.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-screen.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-source.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-source.c
index 1591f5874f6..1591f5874f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-source.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-source.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface-private.h
index 83d9b63cc4c..83d9b63cc4c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-shm.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface-shm.c
index fb40699dc1d..fb40699dc1d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-shm.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface-shm.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface.c
index 029a542b946..029a542b946 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-visual.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-visual.c
index 863822eebbd..863822eebbd 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-visual.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-visual.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xcb-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xcb-surface.c
index af3e1557899..af3e1557899 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xcb-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xcb-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender-private.h b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xrender-private.h
index 90769467b2d..90769467b2d 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xrender-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender.h b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xrender.h
index b34b057de4c..b34b057de4c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib-xrender.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib.h b/Build/source/libs/cairo/cairo-src/src/cairo-xlib.h
index ecf8d6c86be..ecf8d6c86be 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xlib.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml-surface.c b/Build/source/libs/cairo/cairo-src/src/cairo-xml-surface.c
index 6dbafdba2ba..6dbafdba2ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xml-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml.h b/Build/source/libs/cairo/cairo-src/src/cairo-xml.h
index 9ae76e90aae..9ae76e90aae 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-xml.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.c b/Build/source/libs/cairo/cairo-src/src/cairo.c
index e3acf4d46c7..e3acf4d46c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.h b/Build/source/libs/cairo/cairo-src/src/cairo.h
index 3104d47e4c4..3104d47e4c4 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairo.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.pc.in b/Build/source/libs/cairo/cairo-src/src/cairo.pc.in
index b361edf18fb..b361edf18fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairo.pc.in
+++ b/Build/source/libs/cairo/cairo-src/src/cairo.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/cairoint.h b/Build/source/libs/cairo/cairo-src/src/cairoint.h
index 5bca0038953..555aa899030 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/cairoint.h
+++ b/Build/source/libs/cairo/cairo-src/src/cairoint.h
@@ -814,6 +814,7 @@ _cairo_color_get_content (const cairo_color_t *color) cairo_pure;
 /* cairo-font-face.c */
 
 extern const cairo_private cairo_font_face_t _cairo_font_face_nil;
+extern const cairo_private cairo_font_face_t _cairo_font_face_nil_file_not_found;
 
 cairo_private void
 _cairo_font_face_init (cairo_font_face_t               *font_face,
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-def.sh b/Build/source/libs/cairo/cairo-src/src/check-def.sh
index beefb46a333..beefb46a333 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-def.sh
+++ b/Build/source/libs/cairo/cairo-src/src/check-def.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.awk b/Build/source/libs/cairo/cairo-src/src/check-doc-syntax.awk
index 1fa8b8d2232..1fa8b8d2232 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.awk
+++ b/Build/source/libs/cairo/cairo-src/src/check-doc-syntax.awk
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.sh b/Build/source/libs/cairo/cairo-src/src/check-doc-syntax.sh
index 762a48429b0..762a48429b0 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.sh
+++ b/Build/source/libs/cairo/cairo-src/src/check-doc-syntax.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-has-hidden-symbols.c b/Build/source/libs/cairo/cairo-src/src/check-has-hidden-symbols.c
index 12041277692..12041277692 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-has-hidden-symbols.c
+++ b/Build/source/libs/cairo/cairo-src/src/check-has-hidden-symbols.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-headers.sh b/Build/source/libs/cairo/cairo-src/src/check-headers.sh
index 61232954bae..61232954bae 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-headers.sh
+++ b/Build/source/libs/cairo/cairo-src/src/check-headers.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-link.c b/Build/source/libs/cairo/cairo-src/src/check-link.c
index 66ca1b2413c..66ca1b2413c 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-link.c
+++ b/Build/source/libs/cairo/cairo-src/src/check-link.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-plt.sh b/Build/source/libs/cairo/cairo-src/src/check-plt.sh
index 5a9dae1269d..5a9dae1269d 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-plt.sh
+++ b/Build/source/libs/cairo/cairo-src/src/check-plt.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/check-preprocessor-syntax.sh b/Build/source/libs/cairo/cairo-src/src/check-preprocessor-syntax.sh
index b718f604ee7..b718f604ee7 100755
--- a/Build/source/libs/cairo/cairo-1.14.2/src/check-preprocessor-syntax.sh
+++ b/Build/source/libs/cairo/cairo-src/src/check-preprocessor-syntax.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-base-compositor-surface.c b/Build/source/libs/cairo/cairo-src/src/test-base-compositor-surface.c
index ff84b10aff7..ff84b10aff7 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-base-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/test-base-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface-private.h b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface-private.h
index 491f241bacc..491f241bacc 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface-private.h
+++ b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.c b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface.c
index 1cc5f692120..1cc5f692120 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.h b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface.h
index 8d8af2d5409..8d8af2d5409 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.h
+++ b/Build/source/libs/cairo/cairo-src/src/test-compositor-surface.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.c b/Build/source/libs/cairo/cairo-src/src/test-null-compositor-surface.c
index 2301055e30a..2301055e30a 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/test-null-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.h b/Build/source/libs/cairo/cairo-src/src/test-null-compositor-surface.h
index 52d864b28df..52d864b28df 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.h
+++ b/Build/source/libs/cairo/cairo-src/src/test-null-compositor-surface.h
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.c b/Build/source/libs/cairo/cairo-src/src/test-paginated-surface.c
index 0a7c79b37bf..0a7c79b37bf 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.c
+++ b/Build/source/libs/cairo/cairo-src/src/test-paginated-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.h b/Build/source/libs/cairo/cairo-src/src/test-paginated-surface.h
index 2bd98aa5eee..2bd98aa5eee 100644
--- a/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.h
+++ b/Build/source/libs/cairo/cairo-src/src/test-paginated-surface.h
diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure
index 1c761b1c4fc..38af7a522eb 100755
--- a/Build/source/libs/cairo/configure
+++ b/Build/source/libs/cairo/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cairo (TeX Live) 1.14.2.
+# Generated by GNU Autoconf 2.69 for cairo (TeX Live) 1.14.6.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cairo (TeX Live)'
 PACKAGE_TARNAME='cairo--tex-live-'
-PACKAGE_VERSION='1.14.2'
-PACKAGE_STRING='cairo (TeX Live) 1.14.2'
+PACKAGE_VERSION='1.14.6'
+PACKAGE_STRING='cairo (TeX Live) 1.14.6'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="cairo-1.14.2/src/cairo.h"
+ac_unique_file="cairo-src/src/cairo.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1349,7 +1349,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cairo (TeX Live) 1.14.2 to adapt to many kinds of systems.
+\`configure' configures cairo (TeX Live) 1.14.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1420,7 +1420,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cairo (TeX Live) 1.14.2:";;
+     short | recursive ) echo "Configuration of cairo (TeX Live) 1.14.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,7 +1523,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cairo (TeX Live) configure 1.14.2
+cairo (TeX Live) configure 1.14.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2129,7 +2129,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cairo (TeX Live) $as_me 1.14.2, which was
+It was created by cairo (TeX Live) $as_me 1.14.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4383,7 +4383,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cairo--tex-live-'
- VERSION='1.14.2'
+ VERSION='1.14.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6616,7 +6616,7 @@ LIBS=$kpse_save_LIBS
 echo timestamp >config.force
 fi
 
-CAIRO_TREE=cairo-1.14.2
+CAIRO_TREE=cairo-src
 
 
 ac_config_files="$ac_config_files Makefile cairo/Makefile"
@@ -7273,7 +7273,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cairo (TeX Live) $as_me 1.14.2, which was
+This file was extended by cairo (TeX Live) $as_me 1.14.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7339,7 +7339,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cairo (TeX Live) config.status 1.14.2
+cairo (TeX Live) config.status 1.14.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac
index 8818bcc142b..147aa8c8ea6 100644
--- a/Build/source/libs/cairo/configure.ac
+++ b/Build/source/libs/cairo/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define cairo_version
 AC_INIT([cairo (TeX Live)], cairo_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([cairo-]cairo_version[/src/cairo.h])
+AC_CONFIG_SRCDIR([cairo-src/src/cairo.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIRS([../../m4 m4])
 
@@ -92,7 +92,7 @@ KPSE_RESTORE_FLAGS
 echo timestamp >config.force
 fi
 
-AC_SUBST([CAIRO_TREE], [cairo-]cairo_version)
+AC_SUBST([CAIRO_TREE], [cairo-src])
 
 AC_CONFIG_FILES([Makefile cairo/Makefile])
 
diff --git a/Build/source/libs/cairo/version.ac b/Build/source/libs/cairo/version.ac
index 56690adf0de..711b9a9c961 100644
--- a/Build/source/libs/cairo/version.ac
+++ b/Build/source/libs/cairo/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current cairo version
-m4_define([cairo_version], [1.14.2])
+m4_define([cairo_version], [1.14.6])