384 files changed, 426 insertions, 215 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index ad90fb5e0d2..ff7f90ea879 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.0 - checked 15oct14
+cairo 1.14.2 - checked 11mar15
   http://cairographics.org/releases/
 
 freetype2 2.5.5 - checked 7jan15
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index c74dc0e3a95..133dce4fe42 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import cairo-1.14.2.
+	* Makefile.am, version.ac: Adapted.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/libs/cairo/cairo-1.14.0/KNOWN_ISSUES b/Build/source/libs/cairo/cairo-1.14.0/KNOWN_ISSUES
deleted file mode 100644
index 5fda6838929..00000000000
--- a/Build/source/libs/cairo/cairo-1.14.0/KNOWN_ISSUES
+++ /dev/null
@@ -1,10 +0,0 @@
-There are a few known bugs in 1.10 that have been fixed in master, but
-appear to be non-trivial to backport without fear of causing other
-regressions. The impact of these bugs is considered to be less than of a
-risk than rewriting the code.
-
-Zero Path Extents
------------------
-A closed degenerate path is reported as having extents (0, 0) x (0, 0),
-whereas the expected value is (x, y) x (0, 0). This regression has existed
-since at least 1.2.
diff --git a/Build/source/libs/cairo/cairo-1.14.0-PATCHES/ChangeLog b/Build/source/libs/cairo/cairo-1.14.2-PATCHES/ChangeLog
index 599599d6022..ca926256712 100644
--- a/Build/source/libs/cairo/cairo-1.14.0-PATCHES/ChangeLog
+++ b/Build/source/libs/cairo/cairo-1.14.2-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import cairo-1.14.2.
+
 2014-10-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import cairo-1.14.0.
diff --git a/Build/source/libs/cairo/cairo-1.14.0-PATCHES/TL-Changes b/Build/source/libs/cairo/cairo-1.14.2-PATCHES/TL-Changes
index 81aedbfe337..9d7307107cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0-PATCHES/TL-Changes
+++ b/Build/source/libs/cairo/cairo-1.14.2-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the cairo-1.14.0/ tree as obtained from:
-	http://cairographics.org/releases/cairo-1.14.0.tar.xz
+Changes applied to the cairo-1.14.2/ tree as obtained from:
+	http://cairographics.org/releases/cairo-1.14.2.tar.xz
 
 Removed:
 	Makefile.in
@@ -18,6 +18,7 @@ Removed:
 	build/ltversion.m4
 	build/lt~obsolete.m4
 	build/missing
+	build/test-driver
 	configure
 	src/Makefile.in
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/AUTHORS b/Build/source/libs/cairo/cairo-1.14.2/AUTHORS
index d85696fa81c..d85696fa81c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/AUTHORS
+++ b/Build/source/libs/cairo/cairo-1.14.2/AUTHORS
diff --git a/Build/source/libs/cairo/cairo-1.14.0/BIBLIOGRAPHY b/Build/source/libs/cairo/cairo-1.14.2/BIBLIOGRAPHY
index 90a6cef205b..90a6cef205b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/BIBLIOGRAPHY
+++ b/Build/source/libs/cairo/cairo-1.14.2/BIBLIOGRAPHY
diff --git a/Build/source/libs/cairo/cairo-1.14.0/BUGS b/Build/source/libs/cairo/cairo-1.14.2/BUGS
index ef044046d3e..ef044046d3e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/BUGS
+++ b/Build/source/libs/cairo/cairo-1.14.2/BUGS
diff --git a/Build/source/libs/cairo/cairo-1.14.0/CODING_STYLE b/Build/source/libs/cairo/cairo-1.14.2/CODING_STYLE
index 95ceac04d84..95ceac04d84 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/CODING_STYLE
+++ b/Build/source/libs/cairo/cairo-1.14.2/CODING_STYLE
diff --git a/Build/source/libs/cairo/cairo-1.14.0/COPYING b/Build/source/libs/cairo/cairo-1.14.2/COPYING
index f54969f1c94..f54969f1c94 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/COPYING
+++ b/Build/source/libs/cairo/cairo-1.14.2/COPYING
diff --git a/Build/source/libs/cairo/cairo-1.14.0/COPYING-LGPL-2.1 b/Build/source/libs/cairo/cairo-1.14.2/COPYING-LGPL-2.1
index f1ed6182c52..f1ed6182c52 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/COPYING-LGPL-2.1
+++ b/Build/source/libs/cairo/cairo-1.14.2/COPYING-LGPL-2.1
diff --git a/Build/source/libs/cairo/cairo-1.14.0/COPYING-MPL-1.1 b/Build/source/libs/cairo/cairo-1.14.2/COPYING-MPL-1.1
index 7714141d154..7714141d154 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/COPYING-MPL-1.1
+++ b/Build/source/libs/cairo/cairo-1.14.2/COPYING-MPL-1.1
diff --git a/Build/source/libs/cairo/cairo-1.14.0/HACKING b/Build/source/libs/cairo/cairo-1.14.2/HACKING
index 752efbab227..aba2c545bb9 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/HACKING
+++ b/Build/source/libs/cairo/cairo-1.14.2/HACKING
@@ -73,9 +73,9 @@ We use /git/ for version control.  See:
 
 	http://cairographics.org/download/
 
-TODO:
-Add links to some git tutorials or better, write a few paragraphs
-about how to use git to efficiently hack on cairo.
+For more information on using git, see:
+
+	http://freedesktop.org/wiki/Infrastructure/git/
 
 
 Build System
@@ -103,10 +103,9 @@ No manual ChangeLog writing is necessary.
 Copyrights and Licensing
 ------------------------
 
-The cairo library is dual-licensed under LGPL and MPL.  See file named
-COPYING for details.  The test suites are more liberal.  For example,
-GPL code is allowed in the test suites, though it's always better to
-keep things simple.
+The cairo library is dual-licensed under LGPL and MPL.  See the file
+named COPYING for details.  The test suites are more liberal, and are
+allowed to include GPL code.
 
 When writing new code, update the file headers to add your (or your
 employers) copyright line and contributor line.  If adding new files
@@ -174,9 +173,8 @@ Some of those should gradually be moved to doc/.
 Utilities
 ---------
 
-There are a few useful utilities we have developed that are either
-useful when writing code using cairo, or writing cairo, or useful in
-general.  These tools can be found under the util/ directory.
+We have developed several utilities useful for writing cairo or code
+that uses cairo.  These tools can be found under the util/ directory.
 See util/README for more information.
 
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/INSTALL b/Build/source/libs/cairo/cairo-1.14.2/INSTALL
index 9db68dee2ba..9db68dee2ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/INSTALL
+++ b/Build/source/libs/cairo/cairo-1.14.2/INSTALL
diff --git a/Build/source/libs/cairo/cairo-1.14.2/KNOWN_ISSUES b/Build/source/libs/cairo/cairo-1.14.2/KNOWN_ISSUES
new file mode 100644
index 00000000000..c367f918ea3
--- /dev/null
+++ b/Build/source/libs/cairo/cairo-1.14.2/KNOWN_ISSUES
@@ -0,0 +1,3 @@
+Known Issues
+------------
+None
diff --git a/Build/source/libs/cairo/cairo-1.14.0/Makefile.am b/Build/source/libs/cairo/cairo-1.14.2/Makefile.am
index 03fa3523649..03fa3523649 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/Makefile.am
+++ b/Build/source/libs/cairo/cairo-1.14.2/Makefile.am
diff --git a/Build/source/libs/cairo/cairo-1.14.0/Makefile.win32 b/Build/source/libs/cairo/cairo-1.14.2/Makefile.win32
index fbad7f3e4c9..fbad7f3e4c9 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/Makefile.win32
+++ b/Build/source/libs/cairo/cairo-1.14.2/Makefile.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.0/NEWS b/Build/source/libs/cairo/cairo-1.14.2/NEWS
index 2370dfd5814..93b650ef59f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/NEWS
+++ b/Build/source/libs/cairo/cairo-1.14.2/NEWS
@@ -1,3 +1,78 @@
+Release 1.14.2 (2014-03-09 Bryce Harrington <bryce@osg.samsung.com>)
+====================================================================
+This release provides collected bug fixes, along with one feature
+enhancement for the xcb backend, and a small performance improvement for
+fonts.
+
+The running theme of the bug fixes is platform-specific issues, both
+build and run-time.  Platforms with fixes include Sparc, AIX, Windows
+(mingw), and Windows (MSVC8).  Memory leaks, valgrind issues, and PDF
+issues round out our list.
+
+It's come to light that changes in cairo 1.14 resulted in breakage on
+MacOS X 10.4.  We've not yet determined whether to fix up the support,
+or excise the 10.4-specific code and support only OS X 10.5 or newer.
+Meantime, we'll only advertise cairo as working on OS X 10.5.
+
+Features
+--------
+ * Improve xcb's handling of per-screen subpixel ordering.  If no
+   Xft.rgba property is specified, default to the screen's subpixel
+   order.
+
+API Changes
+-----------
+None
+
+Dependency Changes
+------------------
+None
+
+Performance Optimizations
+-------------------------
+ * Improve performance of cpu_to_be32 and be32_to_cpu, making truetype
+   subsetting of large fonts run about 15% faster.
+
+Bug Fixes
+---------
+ * Fix unaligned access on sparc with the compact font format (CFF).
+   Unlike truetype, all data in CFF is not aligned.
+   (Debian bug #712836)
+ * Fix unaligned access on sparc with tor-scan-converter's memory pool.
+ * Fix crash when loading a PDF with a transformed image.
+   (fdo bug #85151)
+ * Fix regression on mingw for bigendian test due to removal of file
+   extension for executables.
+   (fdo bug #85120)
+ * Fix handling of backslash in PDF interpreter
+   (fdo bug #85662)
+ * Fix crash in xlib and xcb renderers when swapping a 0-sized glyph
+ * Fix bug with RTL text in PDF operators
+   (fdo bug #86461)
+ * Fix compilation 'cairo-path-stroke-traps.c' with MSVC8
+   (fdo bug #84908)
+ * Fix crash in _fill_xrgb32_lerp_opaque_spans when a span length is
+   negative.
+ * Fix valgrind error by releasing pattern created by
+   cairo_pattern_create_rgb().
+ * Fix valgrind errors when running cairo-test-suite.
+ * Fix memory leak in recording surface replays
+   (fdo bug #87898)
+ * Fix destruction of fonts in api-special-cases test.
+   (fdo bug #87567)
+ * Fix duplicated surface push on similar-image, preventing trivial GTK3
+   program traces from being replayable, with an error message about
+   invalid values for the size of the input.
+   (fdo bug #73580)
+ * Fix crash when win32 surface's image size does not cover the entire
+   surface.
+   (fdo bug #53121)
+ * Fix crash due to obsolete CGFontGetGlyphPath call
+   (fdo bug #84324)
+ * Fix several build issues on AIX
+   (fdo bugs #89338, #89340, #89356, #89354)
+ * Fix various documentation warnings and errors
+
 Release 1.14.0 (2014-10-13 Bryce Harrington <bryce@osg.samsung.com>)
 ====================================================================
 Hard to believe it's been over a year since our last release, but it's
diff --git a/Build/source/libs/cairo/cairo-1.14.0/PORTING_GUIDE b/Build/source/libs/cairo/cairo-1.14.2/PORTING_GUIDE
index 7488173c46b..7488173c46b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/PORTING_GUIDE
+++ b/Build/source/libs/cairo/cairo-1.14.2/PORTING_GUIDE
diff --git a/Build/source/libs/cairo/cairo-1.14.0/README b/Build/source/libs/cairo/cairo-1.14.2/README
index 592643067ac..0be9947d548 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/README
+++ b/Build/source/libs/cairo/cairo-1.14.2/README
@@ -121,7 +121,7 @@ Supported, "platform" surface backends
 
 	quartz backend
 	--------------
-	MacOS X >= 10.4 with Xcode >= 2.4
+	MacOS X >= 10.5 with Xcode >= 3.0
 
 	win32 backend
 	-------------
diff --git a/Build/source/libs/cairo/cairo-1.14.0/README.win32 b/Build/source/libs/cairo/cairo-1.14.2/README.win32
index ff962b72a68..ff962b72a68 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/README.win32
+++ b/Build/source/libs/cairo/cairo-1.14.2/README.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.0/RELEASING b/Build/source/libs/cairo/cairo-1.14.2/RELEASING
index 60e3e9e41b2..f6f5eeb5125 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/RELEASING
+++ b/Build/source/libs/cairo/cairo-1.14.2/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 cairo X.Y.Z
+	git push upstream 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
diff --git a/Build/source/libs/cairo/cairo-1.14.0/acinclude.m4 b/Build/source/libs/cairo/cairo-1.14.2/acinclude.m4
index dcf54f9357d..dcf54f9357d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/acinclude.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/acinclude.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/autogen.sh b/Build/source/libs/cairo/cairo-1.14.2/autogen.sh
index 4d113f8be5f..4d113f8be5f 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/autogen.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/autogen.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.analysis b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.analysis
index a44077ab453..a44077ab453 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.analysis
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.changelog b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.changelog
index 07e603695cf..07e603695cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.changelog
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.changelog
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.common b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.common
index b955af58fdf..b955af58fdf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.common
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.common
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.gtk-doc b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.gtk-doc
index c3d642b097b..c3d642b097b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.gtk-doc
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.gtk-doc
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.releasing b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.releasing
index b17faabce2f..b17faabce2f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.am.releasing
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.am.releasing
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.common b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.common
index 7d7e9735f15..7d7e9735f15 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.common
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.common
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.features b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features
index 8cb155dc084..8cb155dc084 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.features
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.features-h b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features-h
index 13904cfa9f0..13904cfa9f0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.features-h
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.features-h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.inform b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.inform
index ba11165050a..ba11165050a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/Makefile.win32.inform
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/Makefile.win32.inform
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.cairo.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.cairo.m4
index 2f4873b043f..2f4873b043f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.cairo.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.cairo.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.compare.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.compare.m4
index bd6c51b289d..bd6c51b289d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.compare.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.compare.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.enable.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.enable.m4
index f3522b9832c..f3522b9832c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.enable.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.enable.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.float.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.float.m4
index bc0a91c6047..8f85f0862ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.float.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.float.m4
@@ -31,10 +31,10 @@ int main() { return 0; }
 
 ]])], [
 
-if strings - conftest | grep noonsees >/dev/null ; then
+if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then
   ax_cv_c_float_words_bigendian=yes
 fi
-if strings - conftest | grep seesnoon >/dev/null ; then
+if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then
   if test "$ax_cv_c_float_words_bigendian" = unknown; then
     ax_cv_c_float_words_bigendian=no
   else
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.makefile.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.makefile.m4
index 70777810d14..70777810d14 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.makefile.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.makefile.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.pkg.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.pkg.m4
index cf90a967880..cf90a967880 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/aclocal.pkg.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/aclocal.pkg.m4
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.analysis b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.analysis
index 11c52e70d6e..11c52e70d6e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.analysis
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.features b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.features
index e4a2aafcc82..e4a2aafcc82 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.features
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.features
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.noversion b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.noversion
index 18c4bd5f7ae..18c4bd5f7ae 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.noversion
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.noversion
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.pthread b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.pthread
index 29c930da932..29c930da932 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.pthread
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.pthread
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.system b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.system
index b9d71c8d783..b9d71c8d783 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.system
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.system
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.tools b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.tools
index a24dbcecb91..a24dbcecb91 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.tools
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.tools
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.version b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.version
index a91cee39eef..a91cee39eef 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.version
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.version
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.warnings b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.warnings
index 74e6634b29c..74e6634b29c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/configure.ac.warnings
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/configure.ac.warnings
diff --git a/Build/source/libs/cairo/cairo-1.14.0/build/gtk-doc.m4 b/Build/source/libs/cairo/cairo-1.14.2/build/gtk-doc.m4
index 0ada151935f..36755432b50 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/build/gtk-doc.m4
+++ b/Build/source/libs/cairo/cairo-1.14.2/build/gtk-doc.m4
@@ -1,6 +1,6 @@
 dnl -*- mode: autoconf -*-
 
-# serial 1
+# serial 2
 
 dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
@@ -10,8 +10,24 @@ AC_DEFUN([GTK_DOC_CHECK],
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
+  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+  AC_MSG_CHECKING([for gtk-doc])
+  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+  AC_MSG_RESULT($have_gtk_doc)
+
+  if test "$have_gtk_doc" = "no"; then
+      AC_MSG_WARN([
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found.])
+  fi
+
   dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
 
@@ -28,22 +44,22 @@ AC_DEFUN([GTK_DOC_CHECK],
                    [use gtk-doc to build documentation [[default=no]]]),,
     [enable_gtk_doc=no])
 
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-    dnl don't check for glib if we build glib
-    if test "x$PACKAGE_NAME" != "xglib"; then
-      dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
-    fi
-  fi
-
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
   AC_MSG_RESULT($enable_gtk_doc)
 
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    AC_MSG_ERROR([
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '[$]0'.])
+  fi
+
+  dnl don't check for glib if we build glib
+  if test "x$PACKAGE_NAME" != "xglib"; then
+    dnl don't fail if someone does not have glib
+    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
+  fi
+
   dnl enable/disable output formats
   AC_ARG_ENABLE([gtk-doc-html],
     AS_HELP_STRING([--enable-gtk-doc-html],
@@ -58,7 +74,12 @@ AC_DEFUN([GTK_DOC_CHECK],
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+  AC_SUBST([AM_DEFAULT_VERBOSITY])
 
+  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
diff --git a/Build/source/libs/cairo/cairo-1.14.0/cairo-version.h b/Build/source/libs/cairo/cairo-1.14.2/cairo-version.h
index c65a5ffc609..516999ee6c3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/cairo-version.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 14
-#define CAIRO_VERSION_MICRO 0
+#define CAIRO_VERSION_MICRO 2
 
 #endif
diff --git a/Build/source/libs/cairo/cairo-1.14.0/config.h.in b/Build/source/libs/cairo/cairo-1.14.2/config.h.in
index d804988498f..14e3f444003 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/config.h.in
+++ b/Build/source/libs/cairo/cairo-1.14.2/config.h.in
@@ -292,9 +292,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -388,6 +385,11 @@
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/configure.ac b/Build/source/libs/cairo/cairo-1.14.2/configure.ac
index 2ce19599e30..2ce19599e30 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/configure.ac
+++ b/Build/source/libs/cairo/cairo-1.14.2/configure.ac
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am
index acf0a828100..acf0a828100 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am.analysis b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.analysis
index fab4cf7a514..fab4cf7a514 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am.analysis
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.analysis
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am.features b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.features
index c58ac23da4e..c58ac23da4e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.am.features
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.am.features
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.sources b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.sources
index fac24d79d8a..fac24d79d8a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.sources
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.sources
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.win32 b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32
index 864791f377b..864791f377b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.win32
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.win32.features b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32.features
index 2274f4ad6cf..2274f4ad6cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/Makefile.win32.features
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/Makefile.win32.features
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/README b/Build/source/libs/cairo/cairo-1.14.2/src/README
index 03e4455ea58..03e4455ea58 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/README
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/README
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-analysis-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface-private.h
index 1e054c209ab..1e054c209ab 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-analysis-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-analysis-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface.c
index 8516094c200..8516094c200 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-analysis-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-analysis-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-arc-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc-private.h
index a22c01ac90b..a22c01ac90b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-arc-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-arc.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc.c
index 390397bae10..390397bae10 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-arc.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-arc.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-array-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array-private.h
index 35b29e5fc07..35b29e5fc07 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-array-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-array.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array.c
index 4f3c082ff6b..4f3c082ff6b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-array.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-array.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-atomic-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic-private.h
index 327fed1d928..327fed1d928 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-atomic-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-atomic.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic.c
index 909cfea4925..909cfea4925 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-atomic.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-atomic.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-backend-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-backend-private.h
index b05eca59ab3..b05eca59ab3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-backend-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-backend-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-base64-stream.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base64-stream.c
index 636431372b5..636431372b5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-base64-stream.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base64-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-base85-stream.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base85-stream.c
index f81affb49ea..f81affb49ea 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-base85-stream.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-base85-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann-rectangular.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectangular.c
index 5541bdc3a2d..5541bdc3a2d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann-rectangular.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectangular.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann-rectilinear.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectilinear.c
index 7c0be69b712..7c0be69b712 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann-rectilinear.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann-rectilinear.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann.c
index 91e41f9c3cb..91e41f9c3cb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-bentley-ottmann.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-bentley-ottmann.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-beos-surface.cpp b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos-surface.cpp
index c97641685fc..c97641685fc 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-beos-surface.cpp
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos-surface.cpp
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-beos.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos.h
index fdb89a6c4dc..fdb89a6c4dc 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-beos.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-beos.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-botor-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-botor-scan-converter.c
index 515305bf24e..515305bf24e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-botor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-botor-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-box-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-box-inline.h
index d6b994127e3..d6b994127e3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-box-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-box-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes-intersect.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-intersect.c
index 96ae66334e6..96ae66334e6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes-intersect.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-intersect.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-private.h
index d1f9dfcd1e5..d1f9dfcd1e5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes.c
index 63b68ddfb90..63b68ddfb90 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-boxes.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cache-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache-private.h
index 24b6d0b2092..24b6d0b2092 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cache-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cache.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache.c
index 5c4e4caa3d0..5c4e4caa3d0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cache.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cache.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cff-subset.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cff-subset.c
index 4660d6e0956..f15deb5ea6b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cff-subset.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cff-subset.c
@@ -433,7 +433,7 @@ cff_index_read (cairo_array_t *index, unsigned char **ptr, unsigned char *end_pt
     p = *ptr;
     if (p + 2 > end_ptr)
         return CAIRO_INT_STATUS_UNSUPPORTED;
-    count = be16_to_cpu( *((uint16_t *)p) );
+    count = get_unaligned_be16 (p);
     p += 2;
     if (count > 0) {
         offset_size = *p++;
@@ -984,14 +984,14 @@ cairo_cff_font_read_fdselect (cairo_cff_font_t *font, unsigned char *p)
         for (i = 0; i < font->num_glyphs; i++)
             font->fdselect[i] = *p++;
     } else if (type == 3) {
-        num_ranges = be16_to_cpu( *((uint16_t *)p) );
+        num_ranges = get_unaligned_be16 (p);
         p += 2;
         for  (i = 0; i < num_ranges; i++)
         {
-            first = be16_to_cpu( *((uint16_t *)p) );
+            first = get_unaligned_be16 (p);
             p += 2;
             fd = *p++;
-            last = be16_to_cpu( *((uint16_t *)p) );
+            last = get_unaligned_be16 (p);
             for (j = first; j < last; j++)
                 font->fdselect[j] = fd;
         }
@@ -1722,7 +1722,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t  *font, unsigned long cid, unsi
 	    p = font->charset + 1;
 	    g = 1;
 	    while (g <= (unsigned)font->num_glyphs && p < font->data_end) {
-		c = be16_to_cpu( *((uint16_t *)p) );
+		c = get_unaligned_be16 (p);
 		if (c == cid) {
 		    *gid = g;
 		    return CAIRO_STATUS_SUCCESS;
@@ -1737,7 +1737,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t  *font, unsigned long cid, unsi
 	    first_gid = 1;
 	    p = font->charset + 1;
 	    while (first_gid <= (unsigned)font->num_glyphs && p + 2 < font->data_end) {
-		first_cid = be16_to_cpu( *((uint16_t *)p) );
+		first_cid = get_unaligned_be16 (p);
 		num_left = p[2];
 		if (cid >= first_cid && cid <= first_cid + num_left) {
 		    *gid = first_gid + cid - first_cid;
@@ -1753,8 +1753,8 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t  *font, unsigned long cid, unsi
 	    first_gid = 1;
 	    p = font->charset + 1;
 	    while (first_gid <= (unsigned)font->num_glyphs && p + 3 < font->data_end) {
-		first_cid = be16_to_cpu( *((uint16_t *)p) );
-		num_left = be16_to_cpu( *((uint16_t *)(p+2)) );
+		first_cid = get_unaligned_be16 (p);
+		num_left = get_unaligned_be16 (p+2);
 		if (cid >= first_cid && cid <= first_cid + num_left) {
 		    *gid = first_gid + cid - first_cid;
 		    return CAIRO_STATUS_SUCCESS;
@@ -2328,7 +2328,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *font)
     unsigned int i;
     cairo_int_status_t status;
     unsigned int offset_array;
-    uint32_t *offset_array_ptr;
+    unsigned char *offset_array_ptr;
     int offset_base;
     uint16_t count;
     uint8_t offset_size = 4;
@@ -2349,7 +2349,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *font)
     if (unlikely (status))
         return status;
     offset_base = _cairo_array_num_elements (&font->output) - 1;
-    *offset_array_ptr = cpu_to_be32(1);
+    put_unaligned_be32(1, offset_array_ptr);
     offset_array += sizeof(uint32_t);
     for (i = 0; i < font->num_subset_fontdicts; i++) {
         status = cff_dict_write (font->fd_dict[font->fd_subset_map[i]],
@@ -2357,8 +2357,9 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *font)
         if (unlikely (status))
             return status;
 
-	offset_array_ptr = (uint32_t *) _cairo_array_index (&font->output, offset_array);
-        *offset_array_ptr = cpu_to_be32(_cairo_array_num_elements (&font->output) - offset_base);
+	offset_array_ptr = _cairo_array_index (&font->output, offset_array);
+	put_unaligned_be32 (_cairo_array_num_elements (&font->output) - offset_base,
+			    offset_array_ptr);
 	offset_array += sizeof(uint32_t);
     }
 
@@ -2609,7 +2610,7 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *font)
     unsigned int i;
     tt_hhea_t hhea;
     int num_hmetrics;
-    unsigned char buf[10];
+    uint16_t short_entry;
     int glyph_index;
     cairo_int_status_t status;
 
@@ -2629,7 +2630,8 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *font)
             status = font->backend->load_truetype_table (font->scaled_font_subset->scaled_font,
                                                          TT_TAG_hmtx,
                                                          glyph_index * long_entry_size,
-                                                         buf, &short_entry_size);
+                                                         (unsigned char *) &short_entry,
+							 &short_entry_size);
             if (unlikely (status))
                 return status;
         }
@@ -2638,11 +2640,12 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *font)
             status = font->backend->load_truetype_table (font->scaled_font_subset->scaled_font,
                                                          TT_TAG_hmtx,
                                                          (num_hmetrics - 1) * long_entry_size,
-                                                         buf, &short_entry_size);
+                                                         (unsigned char *) &short_entry,
+							 &short_entry_size);
             if (unlikely (status))
                 return status;
         }
-        font->widths[i] = be16_to_cpu (*((int16_t*)buf));
+	font->widths[i] = be16_to_cpu (short_entry);
     }
 
     return CAIRO_STATUS_SUCCESS;
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-boxes.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-boxes.c
index 7bcbeb1918a..7bcbeb1918a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-boxes.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-inline.h
index a9f23269223..a9f23269223 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-polygon.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-polygon.c
index f40faefba80..f40faefba80 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-polygon.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-private.h
index 5fc05a64e93..5fc05a64e93 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-region.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-region.c
index e3f4891e3f2..e3f4891e3f2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-region.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-region.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-surface.c
index 85feaa649eb..85feaa649eb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-tor-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-tor-scan-converter.c
index e32a5a9d9c7..e32a5a9d9c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip-tor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip-tor-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip.c
index 0df9b06bf60..0df9b06bf60 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-clip.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-clip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-context-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context-private.h
index 0a7185ef1f5..0a7185ef1f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-context-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-context.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context.c
index 0116b0a5a93..0116b0a5a93 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-context.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-gradient-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient-private.h
index fa684d2c6b0..fa684d2c6b0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-gradient-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-gradient.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient.c
index f8c80041629..f8c80041629 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-gradient.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-gradient.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-private.h
index 13fe5a8dc76..13fe5a8dc76 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-surface.c
index c57fd7f433c..c57fd7f433c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-utils-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils-private.h
index ee77f3034c3..ee77f3034c3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-utils-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-utils.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils.c
index 4f02aaa52da..4f02aaa52da 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl-utils.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl-utils.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl.h
index f270d74d307..f270d74d307 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-cogl.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-cogl.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-color.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-color.c
index c2a11a17738..c2a11a17738 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-color.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-color.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-combsort-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-combsort-inline.h
index d359faeb5b8..d359faeb5b8 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-combsort-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-combsort-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compiler-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compiler-private.h
index 216e71b4ec3..216e71b4ec3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compiler-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compiler-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-composite-rectangles-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles-private.h
index fd7728995de..fd7728995de 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-composite-rectangles-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-composite-rectangles.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles.c
index 6c3e97d4a97..6c3e97d4a97 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-composite-rectangles.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-composite-rectangles.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compositor-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor-private.h
index 019972333f3..019972333f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compositor-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor.c
index b31413b9964..b31413b9964 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-inline.h
index 7972c1ac5e0..7972c1ac5e0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-private.h
index 1dfc46f3acd..1dfc46f3acd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour.c
index 9ad75bdbf8d..9ad75bdbf8d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-contour.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-contour.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-damage-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage-private.h
index 97b177e86b4..97b177e86b4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-damage-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-damage.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage.c
index 63191fee95d..63191fee95d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-damage.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-damage.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-debug.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-debug.c
index 33d46aa3f79..33d46aa3f79 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-debug.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-debug.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-default-context-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context-private.h
index fd159b49670..fd159b49670 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-default-context-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-default-context.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context.c
index 1e5067bf1b8..1e5067bf1b8 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-default-context.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-default-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-deflate-stream.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deflate-stream.c
index ae23bda9472..ae23bda9472 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-deflate-stream.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deflate-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-deprecated.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deprecated.h
index 7a56aadbfe1..7a56aadbfe1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-deprecated.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-deprecated.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-device-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device-private.h
index 6eb44f3b634..6eb44f3b634 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-device-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-device.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device.c
index 585a9c1c41f..585a9c1c41f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-device.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-device.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-directfb-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb-surface.c
index 5ac64ba98ee..5ac64ba98ee 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-directfb-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-directfb.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb.h
index e3d818c6687..e3d818c6687 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-directfb.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-directfb.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-drm.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-drm.h
index 907610dcde8..907610dcde8 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-drm.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-drm.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-egl-context.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-egl-context.c
index bf704c630fb..bf704c630fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-egl-context.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-egl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-inline.h
index 9126c5e61eb..9126c5e61eb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-private.h
index 178078ad614..178078ad614 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error.c
index 1b9bd76be13..1b9bd76be13 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-error.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-error.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fallback-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fallback-compositor.c
index 3f6199fe2bb..3f6199fe2bb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fallback-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fallback-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-features-uninstalled.pc.in b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features-uninstalled.pc.in
index b9cd9d3ad2b..b9cd9d3ad2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-features-uninstalled.pc.in
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features-uninstalled.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-features.pc.in b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features.pc.in
index 9a4b657c8da..9a4b657c8da 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-features.pc.in
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-features.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-private.h
index 9ff8f750392..9ff8f750392 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed-type-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-type-private.h
index e9f26f61539..e9f26f61539 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed-type-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed.c
index 03e05592354..03e05592354 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fixed.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fixed.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face-twin-data.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin-data.c
index ff09cb2be10..ff09cb2be10 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face-twin-data.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin-data.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face-twin.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin.c
index 2ad26302849..2ad26302849 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face-twin.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face-twin.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face.c
index e32a9bb7584..3bcd2a1e6b3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-face.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-face.c
@@ -128,7 +128,8 @@ cairo_font_face_reference (cairo_font_face_t *font_face)
 }
 slim_hidden_def (cairo_font_face_reference);
 
-static inline int __put(cairo_reference_count_t *v)
+static inline cairo_bool_t
+__put(cairo_reference_count_t *v)
 {
     int c, old;
 
@@ -136,7 +137,7 @@ static inline int __put(cairo_reference_count_t *v)
     while (c != 1 && (old = _cairo_atomic_int_cmpxchg_return_old(&v->ref_count, c, c - 1)) != c)
 	c = old;
 
-    return c;
+    return c != 1;
 }
 
 cairo_bool_t
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-options.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-options.c
index ad28745e6b9..ad28745e6b9 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-font-options.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-font-options.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fontconfig-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fontconfig-private.h
index ea873abe7e4..ea873abe7e4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-fontconfig-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-fontconfig-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freed-pool-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool-private.h
index 0ec6de3d1f1..0ec6de3d1f1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freed-pool-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freed-pool.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool.c
index cfdc8e96b05..cfdc8e96b05 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freed-pool.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freed-pool.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-private.h
index 8fe6516f385..8fe6516f385 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist-type-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-type-private.h
index 4dd05646107..4dd05646107 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist-type-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist.c
index d596eab81dc..d596eab81dc 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-freelist.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-freelist.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft-font.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-font.c
index 87e733bb769..87e733bb769 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft-font.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-font.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-private.h
index 3921518664a..0dc8114726f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft-private.h
@@ -37,8 +37,8 @@
 #ifndef CAIRO_FT_PRIVATE_H
 #define CAIRO_FT_PRIVATE_H
 
-#include "cairo-ft.h"
 #include "cairoint.h"
+#include "cairo-ft.h"
 
 #if CAIRO_HAS_FT_FONT
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft.h
index 29c43c9655b..29c43c9655b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ft.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ft.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-composite.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-composite.c
index b50f9a76c52..b50f9a76c52 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-composite.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-composite.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-device.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-device.c
index 7235d9ae123..7235d9ae123 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-device.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-device.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-dispatch-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch-private.h
index cabf76f0d6b..cabf76f0d6b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-dispatch-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-dispatch.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch.c
index 76c3115ba37..76c3115ba37 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-dispatch.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-dispatch.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-ext-def-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-ext-def-private.h
index a261947bef0..a261947bef0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-ext-def-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-ext-def-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-glyphs.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-glyphs.c
index 8a1a548d939..8a1a548d939 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-glyphs.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-glyphs.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-gradient-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient-private.h
index 77f9bbdc5f5..77f9bbdc5f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-gradient-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-gradient.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient.c
index ac3292101ec..ac3292101ec 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-gradient.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-gradient.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-info.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-info.c
index acefbb91059..acefbb91059 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-info.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-info.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-msaa-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-msaa-compositor.c
index 83e8eb2d160..83e8eb2d160 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-msaa-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-msaa-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-operand.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-operand.c
index 40157471747..40157471747 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-operand.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-operand.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-private.h
index cb915c8cf25..cb915c8cf25 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-shaders.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-shaders.c
index 27106066650..27106066650 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-shaders.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-shaders.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-source.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-source.c
index 12235295f40..12235295f40 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-source.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-source.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-spans-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-spans-compositor.c
index 4317ccd074a..4317ccd074a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-spans-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-spans-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-surface.c
index cfccf4dfda5..cfccf4dfda5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-traps-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-traps-compositor.c
index 125ed4eabcb..125ed4eabcb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl-traps-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl-traps-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl.h
index 9fd7608f5cf..9fd7608f5cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gl.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gl.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-glx-context.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-glx-context.c
index 3761b9079a4..3761b9079a4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-glx-context.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-glx-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gstate-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate-private.h
index b2ccc76d145..b2ccc76d145 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gstate-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gstate.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate.c
index b4e988e96d8..b4e988e96d8 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-gstate.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-gstate.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hash-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash-private.h
index 30e51ffe669..30e51ffe669 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hash-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hash.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash.c
index 928c74b8bd6..928c74b8bd6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hash.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hash.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hull.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hull.c
index c65593327f6..c65593327f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-hull.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-hull.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-compositor.c
index 6ff0f09c00f..48072f81bd0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-compositor.c
@@ -2242,10 +2242,10 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
 				     spans[0].x, y, len, 1, r->u.fill.pixel);
 		    } else {
 			uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*y + spans[0].x*4);
-			while (len--)
+			while (len-- > 0)
 			    *d++ = r->u.fill.pixel;
 		    }
-		} else while (len--) {
+		} else while (len-- > 0) {
 		    *d = lerp8x4 (r->u.fill.pixel, a, *d);
 		    d++;
 		}
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-info-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info-private.h
index e64928e40ec..e64928e40ec 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-info-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-info.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info.c
index 64053a218eb..26e7ae5afd1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-info.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-info.c
@@ -39,12 +39,6 @@
 #include "cairo-error-private.h"
 #include "cairo-image-info-private.h"
 
-static uint32_t
-_get_be32 (const unsigned char *p)
-{
-    return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
-}
-
 /* JPEG (image/jpeg)
  *
  * http://www.w3.org/Graphics/JPEG/itu-t81.pdf
@@ -170,7 +164,7 @@ static const unsigned char _jpx_signature[] = {
 static const unsigned char *
 _jpx_next_box (const unsigned char *p)
 {
-    return p + _get_be32 (p);
+    return p + get_unaligned_be32 (p);
 }
 
 static const unsigned char *
@@ -185,8 +179,8 @@ _jpx_match_box (const unsigned char *p, const unsigned char *end, uint32_t type)
     uint32_t length;
 
     if (p + 8 < end) {
-	length = _get_be32 (p);
-	if (_get_be32 (p + 4) == type &&  p + length < end)
+	length = get_unaligned_be32 (p);
+	if (get_unaligned_be32 (p + 4) == type &&  p + length < end)
 	    return TRUE;
     }
 
@@ -208,8 +202,8 @@ _jpx_find_box (const unsigned char *p, const unsigned char *end, uint32_t type)
 static void
 _jpx_extract_info (const unsigned char *p, cairo_image_info_t *info)
 {
-    info->height = _get_be32 (p);
-    info->width = _get_be32 (p + 4);
+    info->height = get_unaligned_be32 (p);
+    info->width = get_unaligned_be32 (p + 4);
     info->num_components = (p[8] << 8) + p[9];
     info->bits_per_component = p[10];
 }
@@ -281,13 +275,13 @@ _cairo_image_info_get_png_info (cairo_image_info_t     *info,
        return CAIRO_INT_STATUS_UNSUPPORTED;
 
     p += 4;
-    if (_get_be32 (p) != PNG_IHDR)
+    if (get_unaligned_be32 (p) != PNG_IHDR)
        return CAIRO_INT_STATUS_UNSUPPORTED;
 
     p += 4;
-    info->width = _get_be32 (p);
+    info->width = get_unaligned_be32 (p);
     p += 4;
-    info->height = _get_be32 (p);
+    info->height = get_unaligned_be32 (p);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -347,14 +341,14 @@ _jbig2_get_next_segment (const unsigned char  *p,
     if (p + 6 >= end)
 	return NULL;
 
-    seg_num = _get_be32 (p);
+    seg_num = get_unaligned_be32 (p);
     *type = p[4] & 0x3f;
     big_page_size = (p[4] & 0x40) != 0;
     p += 5;
 
     num_segs = p[0] >> 5;
     if (num_segs == 7) {
-	num_segs = _get_be32 (p) & 0x1fffffff;
+	num_segs = get_unaligned_be32 (p) & 0x1fffffff;
 	ref_seg_bytes = 4 + ((num_segs + 1)/8);
     } else {
 	ref_seg_bytes = 1;
@@ -373,7 +367,7 @@ _jbig2_get_next_segment (const unsigned char  *p,
     if (p + 4 >= end)
 	return NULL;
 
-    *data_len = _get_be32 (p);
+    *data_len = get_unaligned_be32 (p);
     p += 4;
     *data = p;
 
@@ -397,8 +391,8 @@ _jbig2_get_next_segment (const unsigned char  *p,
 static void
 _jbig2_extract_info (cairo_image_info_t *info, const unsigned char *p)
 {
-    info->width = _get_be32 (p);
-    info->height = _get_be32 (p + 4);
+    info->width = get_unaligned_be32 (p);
+    info->height = get_unaligned_be32 (p + 4);
     info->num_components = 1;
     info->bits_per_component = 1;
 }
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-source.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-source.c
index 950053db2c1..950053db2c1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-source.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-source.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-inline.h
index 743d5fd3e75..743d5fd3e75 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-private.h
index 8ca694c5e3e..8ca694c5e3e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface.c
index 1fd563d1c34..1fd563d1c34 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-image-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-image-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-inline.h
index 71cc5e7ebf4..71cc5e7ebf4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-private.h
index 08bf4b3587c..08bf4b3587c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line.c
index cb13927bdce..cb13927bdce 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-line.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-line.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-list-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-inline.h
index 0955178d24f..0955178d24f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-list-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-list-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-private.h
index 9f39b668f82..9f39b668f82 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-list-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-list-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-lzw.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-lzw.c
index de7f9998376..de7f9998376 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-lzw.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-lzw.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-malloc-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-malloc-private.h
index 1e2c67f8d9a..1e2c67f8d9a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-malloc-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-malloc-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mask-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mask-compositor.c
index 4d6b118dda5..4d6b118dda5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mask-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mask-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-matrix.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-matrix.c
index ae498f5151a..ae498f5151a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-matrix.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-matrix.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mempool-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool-private.h
index a09f6ce51f6..a09f6ce51f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mempool-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mempool.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool.c
index 751ede320f3..751ede320f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mempool.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mempool.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mesh-pattern-rasterizer.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mesh-pattern-rasterizer.c
index 1b63ca8a660..1b63ca8a660 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mesh-pattern-rasterizer.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mesh-pattern-rasterizer.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-misc.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-misc.c
index df8a4efc940..df8a4efc940 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-misc.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-misc.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mono-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mono-scan-converter.c
index 2a9546cf82a..2a9546cf82a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mono-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mono-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-impl-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-impl-private.h
index 25223f3eac0..25223f3eac0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-impl-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-impl-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-list-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-list-private.h
index f46afadb04b..f46afadb04b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-list-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-list-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-private.h
index 61a7160a066..61a7160a066 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-type-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-type-private.h
index e8c493985c9..e8c493985c9 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex-type-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex.c
index 0a31dced3e1..0a31dced3e1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-mutex.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-mutex.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-no-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-no-compositor.c
index 1602a12f63a..1602a12f63a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-no-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-no-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-observer.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-observer.c
index 36d6b93bd63..36d6b93bd63 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-observer.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-observer.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-private.h
index 829dd3c8d41..829dd3c8d41 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-surface.c
index 1ab50f97798..1ab50f97798 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2.h
index d23f2dec42a..d23f2dec42a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-os2.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-os2.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-output-stream-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream-private.h
index 2542646b860..2542646b860 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-output-stream-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-output-stream.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream.c
index 369a59bfba8..369a59bfba8 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-output-stream.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-output-stream.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-private.h
index b827faba0ef..b827faba0ef 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface-private.h
index ebf4b342492..ebf4b342492 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface.c
index 68e4e0e34fd..68e4e0e34fd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-paginated-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-paginated-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-bounds.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-bounds.c
index 9c7222426d3..9c7222426d3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-bounds.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-bounds.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fill.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fill.c
index 4000c9c586e..4000c9c586e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fill.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fill.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fixed-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed-private.h
index cf7cd0836fb..cf7cd0836fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fixed-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fixed.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed.c
index 4bbf496f075..4bbf496f075 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-fixed.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-fixed.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-in-fill.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-in-fill.c
index 1787fb1a3ba..1787fb1a3ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-in-fill.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-in-fill.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-private.h
index 7b54317e20e..7b54317e20e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-boxes.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-boxes.c
index 7f25bf76cf7..7f25bf76cf7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-boxes.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-boxes.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-polygon.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-polygon.c
index e5082bbec68..e5082bbec68 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-polygon.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-traps.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-traps.c
index 520a3e5b9d5..da54e5a358f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-traps.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-traps.c
@@ -299,8 +299,9 @@ join (struct stroker *stroker,
 	    _cairo_traps_tessellate_triangle_with_edges (stroker->traps,
 							 tri, edges);
 	} else {
-	    cairo_point_t t[] = { in->point, *inpt, *outpt };
-	    cairo_point_t e[] = { in->cw, in->ccw, out->cw, out->ccw };
+	    cairo_point_t t[] = { { in->point.x, in->point.y}, { inpt->x, inpt->y }, { outpt->x, outpt->y } };
+	    cairo_point_t e[] = { { in->cw.x, in->cw.y}, { in->ccw.x, in->ccw.y },
+				  { out->cw.x, out->cw.y}, { out->ccw.x, out->ccw.y } };
 	    _cairo_traps_tessellate_triangle_with_edges (stroker->traps, t, e);
 	}
 	break;
@@ -461,8 +462,9 @@ join (struct stroker *stroker,
     }
 
     case CAIRO_LINE_JOIN_BEVEL: {
-	cairo_point_t t[] = { in->point, *inpt, *outpt };
-	cairo_point_t e[] = { in->cw, in->ccw, out->cw, out->ccw };
+	cairo_point_t t[] = { { in->point.x, in->point.y }, { inpt->x, inpt->y }, { outpt->x, outpt->y } };
+	cairo_point_t e[] = { { in->cw.x, in->cw.y }, { in->ccw.x, in->ccw.y },
+			      { out->cw.x, out->cw.y }, { out->ccw.x, out->ccw.y } };
 	_cairo_traps_tessellate_triangle_with_edges (stroker->traps, t, e);
 	break;
     }
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-tristrip.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-tristrip.c
index 6ce4131cc0f..6ce4131cc0f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke-tristrip.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke-tristrip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke.c
index 4d4ede81361..4d4ede81361 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path-stroke.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path-stroke.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path.c
index 43cd175a3c5..43cd175a3c5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-path.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-path.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-inline.h
index 97e8ea034e4..97e8ea034e4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-private.h
index be8ab9fc239..be8ab9fc239 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern.c
index 010de5c30be..ac5d7af20a2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pattern.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pattern.c
@@ -3338,7 +3338,7 @@ _cairo_pattern_is_clear (const cairo_pattern_t *abstract_pattern)
     return FALSE;
 }
 
-/**
+/*
  * Will given row of back-translation matrix work with bilinear scale?
  * This is true for scales larger than 1. Also it was judged acceptable
  * for scales larger than .75. And if there is integer translation
@@ -3419,7 +3419,7 @@ _cairo_hypot(double x, double y)
 }
 
 /**
- * _cairo_pattern_sampled_area
+ * _cairo_pattern_sampled_area:
  *
  * Return region of @pattern that will be sampled to fill @extents,
  * based on the transformation and filter.
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-operators-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators-private.h
index 5d36879152c..4314a042e81 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-operators-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators-private.h
@@ -70,6 +70,7 @@ typedef struct _cairo_pdf_operators {
     cairo_scaled_font_subsets_t *font_subsets;
     cairo_pdf_operators_use_font_subset_t use_font_subset;
     void *use_font_subset_closure;
+    cairo_bool_t ps_output; /* output is for PostScript */
     cairo_bool_t use_actual_text;
     cairo_bool_t in_text_object; /* inside BT/ET pair */
 
@@ -101,7 +102,8 @@ cairo_private void
 _cairo_pdf_operators_init (cairo_pdf_operators_t       *pdf_operators,
 			   cairo_output_stream_t       *stream,
 			   cairo_matrix_t 	       *cairo_to_pdf,
-			   cairo_scaled_font_subsets_t *font_subsets);
+			   cairo_scaled_font_subsets_t *font_subsets,
+			   cairo_bool_t                 ps);
 
 cairo_private cairo_status_t
 _cairo_pdf_operators_fini (cairo_pdf_operators_t       *pdf_operators);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-operators.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators.c
index 48ae3a675b9..dcee25f0c23 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-operators.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-operators.c
@@ -57,11 +57,13 @@ void
 _cairo_pdf_operators_init (cairo_pdf_operators_t	*pdf_operators,
 			   cairo_output_stream_t	*stream,
 			   cairo_matrix_t		*cairo_to_pdf,
-			   cairo_scaled_font_subsets_t  *font_subsets)
+			   cairo_scaled_font_subsets_t  *font_subsets,
+			   cairo_bool_t                  ps)
 {
     pdf_operators->stream = stream;
     pdf_operators->cairo_to_pdf = *cairo_to_pdf;
     pdf_operators->font_subsets = font_subsets;
+    pdf_operators->ps_output = ps;
     pdf_operators->use_font_subset = NULL;
     pdf_operators->use_font_subset_closure = NULL;
     pdf_operators->in_text_object = FALSE;
@@ -176,6 +178,7 @@ typedef struct _word_wrap_stream {
     cairo_output_stream_t base;
     cairo_output_stream_t *output;
     int max_column;
+    cairo_bool_t ps_output;
     int column;
     cairo_word_wrap_state_t state;
     cairo_bool_t in_escape;
@@ -269,7 +272,7 @@ _word_wrap_stream_count_string_up_to (word_wrap_stream_t *stream,
 	    if (*s == '\\') {
 		stream->in_escape = TRUE;
 		stream->escape_digits = 0;
-	    } else if (stream->column > stream->max_column) {
+	    } else if (stream->ps_output && stream->column > stream->max_column) {
 		newline = TRUE;
 		break;
 	    }
@@ -284,7 +287,7 @@ _word_wrap_stream_count_string_up_to (word_wrap_stream_t *stream,
 	_cairo_output_stream_write (stream->output, data, count);
 
     if (newline) {
-	_cairo_output_stream_printf (stream->output, ")\n(");
+	_cairo_output_stream_printf (stream->output, "\\\n");
 	stream->column = 0;
     }
 
@@ -348,7 +351,7 @@ _word_wrap_stream_close (cairo_output_stream_t *base)
 }
 
 static cairo_output_stream_t *
-_word_wrap_stream_create (cairo_output_stream_t *output, int max_column)
+_word_wrap_stream_create (cairo_output_stream_t *output, cairo_bool_t ps, int max_column)
 {
     word_wrap_stream_t *stream;
 
@@ -367,6 +370,7 @@ _word_wrap_stream_create (cairo_output_stream_t *output, int max_column)
 			       _word_wrap_stream_close);
     stream->output = output;
     stream->max_column = max_column;
+    stream->ps_output = ps;
     stream->column = 0;
     stream->state = WRAP_STATE_DELIMITER;
     stream->in_escape = FALSE;
@@ -502,7 +506,7 @@ _cairo_pdf_operators_emit_path (cairo_pdf_operators_t	*pdf_operators,
     pdf_path_info_t info;
     cairo_box_t box;
 
-    word_wrap = _word_wrap_stream_create (pdf_operators->stream, 72);
+    word_wrap = _word_wrap_stream_create (pdf_operators->stream, pdf_operators->ps_output, 72);
     status = _cairo_output_stream_get_status (word_wrap);
     if (unlikely (status))
 	return _cairo_output_stream_destroy (word_wrap);
@@ -1051,7 +1055,7 @@ _cairo_pdf_operators_flush_glyphs (cairo_pdf_operators_t    *pdf_operators)
     if (pdf_operators->num_glyphs == 0)
 	return CAIRO_STATUS_SUCCESS;
 
-    word_wrap_stream = _word_wrap_stream_create (pdf_operators->stream, 72);
+    word_wrap_stream = _word_wrap_stream_create (pdf_operators->stream, pdf_operators->ps_output, 72);
     status = _cairo_output_stream_get_status (word_wrap_stream);
     if (unlikely (status))
 	return _cairo_output_stream_destroy (word_wrap_stream);
@@ -1411,7 +1415,11 @@ _cairo_pdf_operators_emit_cluster (cairo_pdf_operators_t      *pdf_operators,
 	    return status;
     }
 
-    cur_glyph = glyphs;
+    if (cluster_flags & CAIRO_TEXT_CLUSTER_FLAG_BACKWARD)
+	cur_glyph = glyphs + num_glyphs - 1;
+    else
+	cur_glyph = glyphs;
+
     /* XXX
      * If no glyphs, we should put *something* here for the text to be selectable. */
     for (i = 0; i < num_glyphs; i++) {
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-shading-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading-private.h
index 0ca8cb7d518..0ca8cb7d518 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-shading-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-shading.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading.c
index 646e2cd4902..646e2cd4902 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-shading.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-shading.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface-private.h
index 618ca4ede9f..618ca4ede9f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface.c
index 602d5192392..fd52b0d3ed6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf-surface.c
@@ -430,7 +430,8 @@ _cairo_pdf_surface_create_for_stream_internal (cairo_output_stream_t	*output,
     _cairo_pdf_operators_init (&surface->pdf_operators,
 			       surface->output,
 			       &surface->cairo_to_pdf,
-			       surface->font_subsets);
+			       surface->font_subsets,
+			       FALSE);
     _cairo_pdf_operators_set_font_subsets_callback (&surface->pdf_operators,
 						    _cairo_pdf_surface_add_font,
 						    surface);
@@ -2677,7 +2678,7 @@ _cairo_pdf_surface_emit_jbig2_image (cairo_pdf_surface_t              *surface,
     unsigned long global_id_length;
     const unsigned char *global_data;
     unsigned long global_data_length;
-    cairo_pdf_jbig2_global_t *global_entry;
+    cairo_pdf_jbig2_global_t *global_entry = NULL; /* hide compiler warning */
     char smask_buf[30];
     char decode_parms_buf[100];
 
@@ -5677,7 +5678,8 @@ _cairo_pdf_surface_analyze_user_font_subset (cairo_scaled_font_subset_t *font_su
     type3_surface = _cairo_type3_glyph_surface_create (font_subset->scaled_font,
 						       null_stream,
 						       _cairo_pdf_emit_imagemask,
-						       surface->font_subsets);
+						       surface->font_subsets,
+						       FALSE);
     if (unlikely (type3_surface->status)) {
 	status2 = _cairo_output_stream_destroy (null_stream);
 	return type3_surface->status;
@@ -5738,7 +5740,8 @@ _cairo_pdf_surface_emit_type3_font_subset (cairo_pdf_surface_t		*surface,
     type3_surface = _cairo_type3_glyph_surface_create (font_subset->scaled_font,
 						       NULL,
 						       _cairo_pdf_emit_imagemask,
-						       surface->font_subsets);
+						       surface->font_subsets,
+						       FALSE);
     if (unlikely (type3_surface->status)) {
         free (glyphs);
         free (widths);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf.h
index 1bc8524f2b1..1bc8524f2b1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pdf.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pdf.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pen.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pen.c
index 61be0e8299d..61be0e8299d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pen.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pen.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pixman-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pixman-private.h
index d705025c8ee..d705025c8ee 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-pixman-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-pixman-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-png.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-png.c
index 068617d588d..068617d588d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-png.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-png.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon-intersect.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-intersect.c
index 2cd73d2e56b..2cd73d2e56b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon-intersect.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-intersect.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon-reduce.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-reduce.c
index ea457fe4edf..ea457fe4edf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon-reduce.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon-reduce.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon.c
index b0424f6e72e..b0424f6e72e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-polygon.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-polygon.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-private.h
index 9f4f55b7cea..9f4f55b7cea 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface-private.h
index 1d5d27d4910..1d5d27d4910 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface.c
index 706e3057570..03eba62db5d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps-surface.c
@@ -628,7 +628,8 @@ _cairo_ps_surface_analyze_user_font_subset (cairo_scaled_font_subset_t *font_sub
     type3_surface = _cairo_type3_glyph_surface_create (font_subset->scaled_font,
 						       NULL,
 						       _cairo_ps_emit_imagemask,
-						       surface->font_subsets);
+						       surface->font_subsets,
+						       TRUE);
 
     for (i = 0; i < font_subset->num_glyphs; i++) {
 	status = _cairo_type3_glyph_surface_analyze_glyph (type3_surface,
@@ -676,7 +677,8 @@ _cairo_ps_surface_emit_type3_font_subset (cairo_ps_surface_t		*surface,
     type3_surface = _cairo_type3_glyph_surface_create (font_subset->scaled_font,
 						       NULL,
 						       _cairo_ps_emit_imagemask,
-						       surface->font_subsets);
+						       surface->font_subsets,
+						       TRUE);
     status = type3_surface->status;
     if (unlikely (status))
 	return status;
@@ -1068,7 +1070,8 @@ _cairo_ps_surface_create_for_stream_internal (cairo_output_stream_t *stream,
     _cairo_pdf_operators_init (&surface->pdf_operators,
 			       surface->stream,
 			       &surface->cairo_to_ps,
-			       surface->font_subsets);
+			       surface->font_subsets,
+			       TRUE);
     surface->num_pages = 0;
 
     cairo_list_init (&surface->document_media);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps.h
index 33d0e0d941b..33d0e0d941b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-ps.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-ps.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-qt-surface.cpp b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt-surface.cpp
index 7ddad77df37..7ddad77df37 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-qt-surface.cpp
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt-surface.cpp
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-qt.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt.h
index c20bbb18d0b..c20bbb18d0b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-qt.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-qt.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-font.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-font.c
index e6a379ad447..02f34267b18 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-font.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-font.c
@@ -81,9 +81,6 @@ static void (*CGFontGetGlyphsForUnicharsPtr) (CGFontRef, const UniChar[], const
 static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
 static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
 
-/* Not public in the least bit */
-static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph) = NULL;
-
 /* CGFontGetHMetrics isn't public, but the other functions are public/present in 10.5 */
 typedef struct {
     int ascent;
@@ -127,7 +124,6 @@ quartz_font_ensure_symbols(void)
     /* These have the same name in 10.4 and 10.5 */
     CGFontGetUnitsPerEmPtr = dlsym(RTLD_DEFAULT, "CGFontGetUnitsPerEm");
     CGFontGetGlyphAdvancesPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphAdvances");
-    CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphPath");
 
     CGFontGetHMetricsPtr = dlsym(RTLD_DEFAULT, "CGFontGetHMetrics");
     CGFontGetAscentPtr = dlsym(RTLD_DEFAULT, "CGFontGetAscent");
@@ -144,7 +140,6 @@ quartz_font_ensure_symbols(void)
 	CGFontGetGlyphsForUnicharsPtr &&
 	CGFontGetUnitsPerEmPtr &&
 	CGFontGetGlyphAdvancesPtr &&
-	CGFontGetGlyphPathPtr &&
 	(CGFontGetHMetricsPtr || (CGFontGetAscentPtr && CGFontGetDescentPtr && CGFontGetLeadingPtr)))
 	_cairo_quartz_font_symbols_present = TRUE;
 
@@ -550,6 +545,7 @@ _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
     CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
     CGAffineTransform textMatrix;
     CGPathRef glyphPath;
+    CTFontRef ctFont;
     cairo_path_fixed_t *path;
 
     if (glyph == INVALID_GLYPH) {
@@ -564,7 +560,9 @@ _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
 					-font->base.scale.yy,
 					0, 0);
 
-    glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
+    ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+    glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
+    CFRelease (ctFont);
     if (!glyphPath)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-image-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image-surface.c
index 498a7b06436..498a7b06436 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-image-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-image.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image.h
index dae234dacae..dae234dacae 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-image.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-image.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-private.h
index 3ef14c3ae60..3ef14c3ae60 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-surface.c
index 1116ff94c1e..1116ff94c1e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz.h
index 9be5f9ae5cf..9be5f9ae5cf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-quartz.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-quartz.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-raster-source-pattern.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-raster-source-pattern.c
index 64520feae52..64520feae52 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-raster-source-pattern.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-raster-source-pattern.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-inline.h
index 9002ccd6938..9002ccd6938 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-private.h
index 456c63389b7..456c63389b7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface.c
index ce29b936630..ce29b936630 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-recording-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-recording-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rectangle.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangle.c
index 2d51d7b10a4..2d51d7b10a4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rectangle.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangle.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rectangular-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangular-scan-converter.c
index e353b34e853..e353b34e853 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rectangular-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rectangular-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-reference-count-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-reference-count-private.h
index 75fdf3538f5..75fdf3538f5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-reference-count-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-reference-count-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-region-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region-private.h
index 549e5087898..549e5087898 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-region-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-region.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region.c
index ccfb2200e14..ccfb2200e14 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-region.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-region.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rtree-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree-private.h
index 27806cab603..27806cab603 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rtree-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rtree.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree.c
index dbc040929af..dbc040929af 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-rtree.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-rtree.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-private.h
index da7b3469834..da7b3469834 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-subsets-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets-private.h
index 866e63d7bca..866e63d7bca 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-subsets-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-subsets.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets.c
index 2121761839e..2121761839e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font-subsets.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font-subsets.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font.c
index ac80c97d1c5..ac80c97d1c5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-scaled-font.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-scaled-font.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-private.h
index 5b506f500cd..5b506f500cd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-surface.c
index b84aed976f3..b84aed976f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script.h
index b5a8cf32d0b..b5a8cf32d0b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-script.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-script.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-shape-mask-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-shape-mask-compositor.c
index 3117267cccf..3117267cccf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-shape-mask-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-shape-mask-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-skia.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-skia.h
index 99b92865699..99b92865699 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-skia.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-skia.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-slope-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope-private.h
index 6a58c9f456d..6a58c9f456d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-slope-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-slope.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope.c
index cc5f30cb0b3..cc5f30cb0b3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-slope.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-slope.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-compositor-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor-private.h
index 0babebd26b5..0babebd26b5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-compositor-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor.c
index efbae254bf4..efbae254bf4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-private.h
index b158f4d360a..b158f4d360a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans.c
index 182390c205a..182390c205a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spans.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spans.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spline.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spline.c
index 44634faec85..44634faec85 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-spline.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-spline.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-dash-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash-private.h
index 75c000cd73a..75c000cd73a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-dash-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-dash.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash.c
index 9494010f561..9494010f561 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-dash.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-dash.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-style.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-style.c
index 51c9414c042..51c9414c042 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-stroke-style.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-stroke-style.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-backend-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-backend-private.h
index 955a79ff5c3..955a79ff5c3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-backend-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-backend-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-clipper-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper-private.h
index e5b00af7c66..e5b00af7c66 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-clipper-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-clipper.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper.c
index 5309362c68f..5309362c68f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-clipper.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-clipper.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-fallback-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback-private.h
index ecf7b0edf2b..ecf7b0edf2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-fallback-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-fallback.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback.c
index a0af1596921..a0af1596921 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-fallback.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-fallback.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-inline.h
index 85fbc9192bd..85fbc9192bd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-inline.h
index 07b94770d4b..07b94770d4b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-private.h
index 70c87db8283..70c87db8283 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer.c
index 6721bf57d5e..52b013644db 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-observer.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-observer.c
@@ -653,7 +653,7 @@ add_record (cairo_observation_t *log,
 }
 
 static void
-sync (cairo_surface_t *target, int x, int y)
+_cairo_surface_sync (cairo_surface_t *target, int x, int y)
 {
     cairo_rectangle_int_t extents;
 
@@ -751,7 +751,7 @@ _cairo_surface_observer_paint (void *abstract_surface,
     if (unlikely (status))
 	return status;
 
-    sync (surface->target, x, y);
+    _cairo_surface_sync (surface->target, x, y);
     t = _cairo_time_get_delta (t);
 
     add_record_paint (&surface->log, surface->target, op, source, clip, t);
@@ -837,7 +837,7 @@ _cairo_surface_observer_mask (void *abstract_surface,
     if (unlikely (status))
 	return status;
 
-    sync (surface->target, x, y);
+    _cairo_surface_sync (surface->target, x, y);
     t = _cairo_time_get_delta (t);
 
     add_record_mask (&surface->log,
@@ -944,7 +944,7 @@ _cairo_surface_observer_fill (void			*abstract_surface,
     if (unlikely (status))
 	return status;
 
-    sync (surface->target, x, y);
+    _cairo_surface_sync (surface->target, x, y);
     t = _cairo_time_get_delta (t);
 
     add_record_fill (&surface->log,
@@ -1063,7 +1063,7 @@ _cairo_surface_observer_stroke (void				*abstract_surface,
     if (unlikely (status))
 	return status;
 
-    sync (surface->target, x, y);
+    _cairo_surface_sync (surface->target, x, y);
     t = _cairo_time_get_delta (t);
 
     add_record_stroke (&surface->log,
@@ -1183,7 +1183,7 @@ _cairo_surface_observer_glyphs (void			*abstract_surface,
     if (unlikely (status))
 	return status;
 
-    sync (surface->target, x, y);
+    _cairo_surface_sync (surface->target, x, y);
     t = _cairo_time_get_delta (t);
 
     add_record_glyphs (&surface->log,
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-offset-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset-private.h
index 310ba5691cd..310ba5691cd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-offset-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-offset.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset.c
index 98f57f29804..98f57f29804 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-offset.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-offset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-private.h
index f20ab073932..f20ab073932 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-inline.h
index bf89c772b42..bf89c772b42 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-private.h
index 58bee7b49dd..58bee7b49dd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot.c
index 68bf9054ecd..68bf9054ecd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-snapshot.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-snapshot.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface-inline.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-inline.h
index 0cd09e63e70..0cd09e63e70 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface-inline.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-inline.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-private.h
index 89c5cc01b9d..89c5cc01b9d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface.c
index b7dfd9d9e0c..b7dfd9d9e0c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-subsurface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-subsurface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-wrapper-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper-private.h
index 6529ebc1115..6529ebc1115 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-wrapper-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-wrapper.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper.c
index 9236c8bf42e..9236c8bf42e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface-wrapper.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface-wrapper.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface.c
index 00ff52e8228..89345f593d6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-surface.c
@@ -1223,6 +1223,31 @@ _cairo_mime_data_destroy (void *ptr)
 }
 
 /**
+ * CAIRO_MIME_TYPE_JBIG2:
+ *
+ * Joint Bi-level Image Experts Group image coding standard (ISO/IEC 11544).
+ *
+ * Since: 1.14
+ **/
+
+/**
+ * CAIRO_MIME_TYPE_JBIG2_GLOBAL:
+ *
+ * Joint Bi-level Image Experts Group image coding standard (ISO/IEC 11544) global segment.
+ *
+ * Since: 1.14
+ **/
+
+/**
+ * CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID:
+ *
+ * An unique identifier shared by a JBIG2 global segment and all JBIG2 images
+ * that depend on the global segment.
+ *
+ * Since: 1.14
+ **/
+
+/**
  * CAIRO_MIME_TYPE_JP2:
  *
  * The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1).
@@ -1257,7 +1282,8 @@ _cairo_mime_data_destroy (void *ptr)
 /**
  * CAIRO_MIME_TYPE_UNIQUE_ID:
  *
- * Unique identifier for a surface (cairo specific MIME type).
+ * Unique identifier for a surface (cairo specific MIME type). All surfaces with
+ * the same unique identifier will only be embedded once.
  *
  * Since: 1.12
  **/
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface-private.h
index ddbf464b1d2..ddbf464b1d2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface.c
index 372ef45b86e..372ef45b86e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg.h
index 592c645f627..592c645f627 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-svg.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-svg.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface-private.h
index a83cfc959db..a83cfc959db 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface.c
index 294e5f162e2..294e5f162e2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee.h
index 9125a3a4a2b..9125a3a4a2b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tee.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tee.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-time-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time-private.h
index 06dc912b431..06dc912b431 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-time-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-time.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time.c
index a0003fbfc2c..a0003fbfc2c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-time.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-time.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tor-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor-scan-converter.c
index 4adcafb4c5c..b1b51872b19 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tor-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor-scan-converter.c
@@ -277,9 +277,14 @@ struct _pool_chunk {
      * chunk in the pool header. */
     struct _pool_chunk *prev_chunk;
 
-    /* Actual data starts here.	 Well aligned for pointers. */
+    /* Actual data starts here. Well aligned even for 64 bit types. */
+    int64_t data;
 };
 
+/* The int64_t data member of _pool_chunk just exists to enforce alignment,
+ * it shouldn't be included in the allocated size for the struct. */
+#define SIZEOF_POOL_CHUNK (sizeof(struct _pool_chunk) - sizeof(int64_t))
+
 /* A memory pool.  This is supposed to be embedded on the stack or
  * within some other structure.	 It may optionally be followed by an
  * embedded array from which requests are fulfilled until
@@ -299,8 +304,11 @@ struct pool {
 
     /* Header for the sentinel chunk.  Directly following the pool
      * struct should be some space for embedded elements from which
-     * the sentinel chunk allocates from. */
-    struct _pool_chunk sentinel[1];
+     * the sentinel chunk allocates from. This is expressed as a char
+     * array so that the 'int64_t data' member of _pool_chunk isn't
+     * included. This way embedding struct pool in other structs works
+     * without wasting space. */
+    char sentinel[SIZEOF_POOL_CHUNK];
 };
 
 /* A polygon edge. */
@@ -475,7 +483,7 @@ _pool_chunk_create(struct pool *pool, size_t size)
 {
     struct _pool_chunk *p;
 
-    p = malloc(size + sizeof(struct _pool_chunk));
+    p = malloc(SIZEOF_POOL_CHUNK + size);
     if (unlikely (NULL == p))
 	longjmp (*pool->jmp, _cairo_error (CAIRO_STATUS_NO_MEMORY));
 
@@ -489,10 +497,10 @@ pool_init(struct pool *pool,
 	  size_t embedded_capacity)
 {
     pool->jmp = jmp;
-    pool->current = pool->sentinel;
+    pool->current = (void*) pool->sentinel;
     pool->first_free = NULL;
     pool->default_capacity = default_capacity;
-    _pool_chunk_init(pool->sentinel, NULL, embedded_capacity);
+    _pool_chunk_init(pool->current, NULL, embedded_capacity);
 }
 
 static void
@@ -502,7 +510,7 @@ pool_fini(struct pool *pool)
     do {
 	while (NULL != p) {
 	    struct _pool_chunk *prev = p->prev_chunk;
-	    if (p != pool->sentinel)
+	    if (p != (void *) pool->sentinel)
 		free(p);
 	    p = prev;
 	}
@@ -542,14 +550,14 @@ _pool_alloc_from_new_chunk(
 	chunk = _pool_chunk_create (pool, capacity);
     pool->current = chunk;
 
-    obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size);
+    obj = ((unsigned char*)&chunk->data + chunk->size);
     chunk->size += size;
     return obj;
 }
 
 /* Allocate size bytes from the pool.  The first allocated address
- * returned from a pool is aligned to sizeof(void*).  Subsequent
- * addresses will maintain alignment as long as multiples of void* are
+ * returned from a pool is aligned to 8 bytes.  Subsequent
+ * addresses will maintain alignment as long as multiples of 8 are
  * allocated.  Returns the address of a new memory area or %NULL on
  * allocation failures.	 The pool retains ownership of the returned
  * memory. */
@@ -559,7 +567,7 @@ pool_alloc (struct pool *pool, size_t size)
     struct _pool_chunk *chunk = pool->current;
 
     if (size <= chunk->capacity - chunk->size) {
-	void *obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size);
+	void *obj = ((unsigned char*)&chunk->data + chunk->size);
 	chunk->size += size;
 	return obj;
     } else {
@@ -573,16 +581,16 @@ pool_reset (struct pool *pool)
 {
     /* Transfer all used chunks to the chunk free list. */
     struct _pool_chunk *chunk = pool->current;
-    if (chunk != pool->sentinel) {
-	while (chunk->prev_chunk != pool->sentinel) {
+    if (chunk != (void *) pool->sentinel) {
+	while (chunk->prev_chunk != (void *) pool->sentinel) {
 	    chunk = chunk->prev_chunk;
 	}
 	chunk->prev_chunk = pool->first_free;
 	pool->first_free = pool->current;
     }
     /* Reset the sentinel as the current chunk. */
-    pool->current = pool->sentinel;
-    pool->sentinel->size = 0;
+    pool->current = (void *) pool->sentinel;
+    pool->current->size = 0;
 }
 
 /* Rewinds the cell list's cursor to the beginning.  After rewinding
@@ -1167,8 +1175,8 @@ can_do_full_row (struct active_list *active)
 
 	if (e->dy) {
 	    struct quorem x = e->x;
-	    x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
-	    x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
+	    x.quo += e->dxdy_full.quo;
+	    x.rem += e->dxdy_full.rem;
 	    if (x.rem < 0) {
 		x.quo--;
 		x.rem += e->dy;
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tor22-scan-converter.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor22-scan-converter.c
index 4cec5ee4f37..4cec5ee4f37 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tor22-scan-converter.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tor22-scan-converter.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-toy-font-face.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-toy-font-face.c
index 4fe94ab0919..4fe94ab0919 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-toy-font-face.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-toy-font-face.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-compositor.c
index 3414fc2684a..3414fc2684a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-private.h
index dcaf40d1863..dcaf40d1863 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps.c
index 3aa0052f91f..3aa0052f91f 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-traps.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-traps.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tristrip-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip-private.h
index ccd28799e82..ccd28799e82 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tristrip-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tristrip.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip.c
index bb4972f5003..bb4972f5003 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-tristrip.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-tristrip.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-truetype-subset-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset-private.h
index dc9573216f3..dc9573216f3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-truetype-subset-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-truetype-subset.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset.c
index 645a89abf21..645a89abf21 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-truetype-subset.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-truetype-subset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-fallback.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-fallback.c
index 4a657413e48..4a657413e48 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-fallback.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-fallback.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-glyph-names.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-glyph-names.c
index 80ccb96269e..80ccb96269e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-glyph-names.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-glyph-names.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-private.h
index 1630397bca6..1630397bca6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-subset.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-subset.c
index b15663509d3..b15663509d3 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type1-subset.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type1-subset.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type3-glyph-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface-private.h
index 6cd37de5c0d..6f40f1c25b4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type3-glyph-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface-private.h
@@ -65,7 +65,8 @@ cairo_private cairo_surface_t *
 _cairo_type3_glyph_surface_create (cairo_scaled_font_t			 *scaled_font,
 				   cairo_output_stream_t		 *stream,
 				   cairo_type3_glyph_surface_emit_image_t emit_image,
-				   cairo_scaled_font_subsets_t		 *font_subsets);
+				   cairo_scaled_font_subsets_t		 *font_subsets,
+				   cairo_bool_t                           ps_output);
 
 cairo_private void
 _cairo_type3_glyph_surface_set_font_subsets_callback (void				    *abstract_surface,
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type3-glyph-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface.c
index 5bb6bfc444a..c99d461066c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-type3-glyph-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-type3-glyph-surface.c
@@ -74,7 +74,8 @@ cairo_surface_t *
 _cairo_type3_glyph_surface_create (cairo_scaled_font_t			 *scaled_font,
 				   cairo_output_stream_t		 *stream,
 				   cairo_type3_glyph_surface_emit_image_t emit_image,
-				   cairo_scaled_font_subsets_t		 *font_subsets)
+				   cairo_scaled_font_subsets_t		 *font_subsets,
+				   cairo_bool_t ps)
 {
     cairo_type3_glyph_surface_t *surface;
     cairo_matrix_t invert_y_axis;
@@ -106,7 +107,8 @@ _cairo_type3_glyph_surface_create (cairo_scaled_font_t			 *scaled_font,
     _cairo_pdf_operators_init (&surface->pdf_operators,
 			       surface->stream,
 			       &surface->cairo_to_pdf,
-			       font_subsets);
+			       font_subsets,
+			       ps);
 
     _cairo_surface_clipper_init (&surface->clipper,
 				 _cairo_type3_glyph_surface_clipper_intersect_clip_path);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-types-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-types-private.h
index 3d15d968e4b..3d15d968e4b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-types-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-types-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-unicode.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-unicode.c
index 88de39516b6..88de39516b6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-unicode.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-unicode.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-uninstalled.pc.in b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-uninstalled.pc.in
index 9dc3231ae45..9dc3231ae45 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-uninstalled.pc.in
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-uninstalled.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-user-font-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font-private.h
index d54ef78b44e..d54ef78b44e 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-user-font-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-user-font.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font.c
index 6d2de2097d5..6d2de2097d5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-user-font.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-user-font.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-version.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.c
index e493c815c7a..a94cef6819d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-version.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.c
@@ -79,10 +79,10 @@
  * 1.0.1 - Development on a maintenance branch (toward 1.0.2 release)
  * 1.1.1 - Development on head (toward 1.1.2 snapshot and 1.2.0 release)
  * </screen></informalexample>
- * </para>
+ *
  * <refsect2>
  * <title>Compatibility</title>
- * <para>
+ *
  * The API/ABI compatibility guarantees for various versions are as
  * follows. First, let's assume some cairo-using application code that is
  * successfully using the API/ABI "from" one version of cairo. Then let's
@@ -102,11 +102,11 @@
  * with the same in-development version number. This is because these
  * numbers don't correspond to any fixed state of the software, but
  * rather the many states between snapshots and releases.
- * </para>
+ *
  * </refsect2>
  * <refsect2>
  * <title>Examining the version</title>
- * <para>
+ *
  * Cairo provides the ability to examine the version at either
  * compile-time or run-time and in both a human-readable form as well as
  * an encoded form suitable for direct comparison. Cairo also provides the
@@ -135,9 +135,9 @@
  * if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 0, 0))
  *     printf ("Running with suitable cairo version: %s\n", cairo_version_string ());
  * </programlisting></informalexample>
- * </para>
+ *
  * </refsect2>
- * <para>
+ *
  **/
 
 /**
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-version.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.h
index 51008003f98..51008003f98 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-version.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-version.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-vg-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg-surface.c
index 6e0d9a0ed69..6e0d9a0ed69 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-vg-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-vg.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg.h
index f9a62e51c69..f9a62e51c69 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-vg.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-vg.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wgl-context.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wgl-context.c
index 48723744648..48723744648 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wgl-context.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wgl-context.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-private.h
index 3f5491bb1c0..3f5491bb1c0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint-type-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-type-private.h
index 84a3cbab0d2..84a3cbab0d2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint-type-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint-type-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint.c
index 2e056fa36a2..2e056fa36a2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-wideint.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-wideint.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-win32.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-win32.h
index 3d2e1c60169..3d2e1c60169 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-win32.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-win32.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-core.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-core.c
index e01dc1a8361..e01dc1a8361 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-core.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-core.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-render.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-render.c
index 61119653e9a..61119653e9a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-render.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-render.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-shm.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-shm.c
index 7720bbbd25b..7720bbbd25b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection-shm.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection-shm.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection.c
index 2d51e14493f..67897fa4ecc 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-connection.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-connection.c
@@ -79,6 +79,7 @@ typedef struct _cairo_xcb_xid {
 #define XCB_RENDER_HAS_FILTERS(surface)			XCB_RENDER_AT_LEAST((surface), 0, 6)
 #define XCB_RENDER_HAS_FILTER_GOOD(surface) FALSE
 #define XCB_RENDER_HAS_FILTER_BEST(surface) FALSE
+#define XCB_RENDER_HAS_SUBPIXEL_ORDER(surface)		XCB_RENDER_AT_LEAST((surface), 0, 6)
 
 #define XCB_RENDER_HAS_EXTENDED_REPEAT(surface)	XCB_RENDER_AT_LEAST((surface), 0, 10)
 #define XCB_RENDER_HAS_GRADIENTS(surface)	XCB_RENDER_AT_LEAST((surface), 0, 10)
@@ -407,6 +408,15 @@ _cairo_xcb_connection_query_render (cairo_xcb_connection_t *connection)
     if (XCB_RENDER_HAS_GRADIENTS (version))
 	connection->flags |= CAIRO_XCB_RENDER_HAS_GRADIENTS;
 
+    if (XCB_RENDER_HAS_SUBPIXEL_ORDER (version)) {
+	uint32_t screen;
+	uint32_t *subpixel = xcb_render_query_pict_formats_subpixels(formats);
+
+	/* The spec explicitly allows to have too few entries in the reply... */
+	for (screen = 0; screen < formats->num_subpixel && screen < connection->root->roots_len; screen++)
+	    connection->subpixel_orders[screen] = subpixel[screen];
+    }
+
     free (version);
 
     status = _cairo_xcb_connection_parse_xrender_formats (connection, formats);
@@ -581,6 +591,7 @@ _device_destroy (void *device)
     CAIRO_MUTEX_FINI (connection->shm_mutex);
     CAIRO_MUTEX_FINI (connection->screens_mutex);
 
+    free (connection->subpixel_orders);
     free (connection);
 }
 
@@ -684,6 +695,14 @@ _cairo_xcb_connection_get (xcb_connection_t *xcb_connection)
 
     connection->root = xcb_get_setup (xcb_connection);
     connection->render = NULL;
+    connection->subpixel_orders = calloc (connection->root->roots_len, sizeof(*connection->subpixel_orders));
+    if (unlikely (connection->subpixel_orders == NULL)) {
+	CAIRO_MUTEX_UNLOCK (connection->device.mutex);
+	_cairo_xcb_connection_destroy (connection);
+	connection = NULL;
+	goto unlock;
+    }
+
     ext = xcb_get_extension_data (xcb_connection, &xcb_render_id);
     if (ext != NULL && ext->present) {
 	status = _cairo_xcb_connection_query_render (connection);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-private.h
index 1e1d1ee7048..f5d5a4c81c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-private.h
@@ -37,10 +37,10 @@
 #ifndef CAIRO_XCB_PRIVATE_H
 #define CAIRO_XCB_PRIVATE_H
 
-#include "cairo-xcb.h"
-
 #include "cairoint.h"
 
+#include "cairo-xcb.h"
+
 #include "cairo-cache-private.h"
 #include "cairo-compiler-private.h"
 #include "cairo-device-private.h"
@@ -181,7 +181,8 @@ struct _cairo_xcb_font {
 struct _cairo_xcb_screen {
     cairo_xcb_connection_t *connection;
 
-    xcb_screen_t	    *xcb_screen;
+    xcb_screen_t	   *xcb_screen;
+    xcb_render_sub_pixel_t  subpixel_order;
 
     xcb_gcontext_t gc[GC_CACHE_SIZE];
     uint8_t gc_depths[GC_CACHE_SIZE];
@@ -223,6 +224,7 @@ struct _cairo_xcb_connection {
     const xcb_setup_t *root;
     const xcb_query_extension_reply_t *render;
     const xcb_query_extension_reply_t *shm;
+    xcb_render_sub_pixel_t *subpixel_orders;
 
     cairo_list_t free_xids;
     cairo_freepool_t xid_pool;
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-resources.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-resources.c
index 62c27efc7f1..1877758c25a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-resources.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-resources.c
@@ -251,21 +251,13 @@ get_resources(xcb_connection_t *connection, xcb_screen_t *screen, cairo_xcb_reso
     resource_parser_done (&parser);
 }
 
-#if 0 && XCB_RENDER_MAJOR_VERSION > 99 && XCB_RENDER_MINOR_VERSION > 99
-static void
-get_rgba_from_render (xcb_connection_t *connection, xcb_screen_t *screen, cairo_xcb_resources_t *resources)
+void
+_cairo_xcb_resources_get (cairo_xcb_screen_t *screen, cairo_xcb_resources_t *resources)
 {
-    /* this is a mock-up of what the function might look like,
-       xcb_render_query_sub_pixel is not actually implemented in XCB (yet) */
-
-    xcb_render_query_sub_pixel_order_cookie_t cookie;
-    xcb_render_query_sub_pixel_order_reply_t *reply;
-
-    cookie = xcb_render_query_sub_pixel (connection, screen);
-    reply = xcb_render_query_sub_pixel_reply (connection, cookie, NULL);
+    get_resources (screen->connection->xcb_connection, screen->xcb_screen, resources);
 
-    if (reply) {
-	switch (reply->sub_pixel_order) {
+    if (resources->xft_rgba == FC_RGBA_UNKNOWN) {
+	switch (screen->subpixel_order) {
 	case XCB_RENDER_SUB_PIXEL_UNKNOWN:
 	    resources->xft_rgba = FC_RGBA_UNKNOWN;
 	    break;
@@ -285,20 +277,5 @@ get_rgba_from_render (xcb_connection_t *connection, xcb_screen_t *screen, cairo_
 	    resources->xft_rgba = FC_RGBA_NONE;
 	    break;
 	}
-
-	free(reply);
     }
 }
-#endif
-
-void
-_cairo_xcb_resources_get (cairo_xcb_screen_t *screen, cairo_xcb_resources_t *resources)
-{
-    get_resources (screen->connection->xcb_connection, screen->xcb_screen, resources);
-
-#if 0 && XCB_RENDER_MAJOR_VERSION > 99 && XCB_RENDER_MINOR_VERSION > 99
-    if (resources->xft_rgba == FC_RGBA_UNKNOWN) {
-	get_rgba_from_render (screen->connection->xcb_connection, screen->xcb_screen, resources);
-    }
-#endif
-}
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-screen.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-screen.c
index 69ea4599b3c..d0019f9cdff 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-screen.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-screen.c
@@ -207,6 +207,18 @@ _pattern_cache_entry_destroy (void *closure)
     _cairo_freelist_free (&entry->screen->pattern_cache_entry_freelist, entry);
 }
 
+static int _get_screen_index(cairo_xcb_connection_t *xcb_connection,
+			     xcb_screen_t *xcb_screen)
+{
+    int idx = 0;
+    xcb_screen_iterator_t iter = xcb_setup_roots_iterator(xcb_connection->root);
+    for (; iter.rem; xcb_screen_next(&iter), idx++)
+	if (iter.data->root == xcb_screen->root)
+	    return idx;
+
+    ASSERT_NOT_REACHED;
+}
+
 cairo_xcb_screen_t *
 _cairo_xcb_screen_get (xcb_connection_t *xcb_connection,
 		       xcb_screen_t *xcb_screen)
@@ -214,6 +226,7 @@ _cairo_xcb_screen_get (xcb_connection_t *xcb_connection,
     cairo_xcb_connection_t *connection;
     cairo_xcb_screen_t *screen;
     cairo_status_t status;
+    int screen_idx;
     int i;
 
     connection = _cairo_xcb_connection_get (xcb_connection);
@@ -240,9 +253,12 @@ _cairo_xcb_screen_get (xcb_connection_t *xcb_connection,
     if (unlikely (screen == NULL))
 	goto unlock;
 
+    screen_idx = _get_screen_index(connection, xcb_screen);
+
     screen->connection = connection;
     screen->xcb_screen = xcb_screen;
     screen->has_font_options = FALSE;
+    screen->subpixel_order = connection->subpixel_orders[screen_idx];
 
     _cairo_freelist_init (&screen->pattern_cache_entry_freelist,
 			  sizeof (struct pattern_cache_entry));
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-shm.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-shm.c
index 2be2dac5bf9..2be2dac5bf9 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-shm.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-shm.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface-core.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-core.c
index 9c0c0a0957d..9c0c0a0957d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface-core.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-core.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface-render.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-render.c
index 21a89cc0fc0..1a086a24fa1 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface-render.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface-render.c
@@ -4467,6 +4467,9 @@ _cairo_xcb_surface_add_glyph (cairo_xcb_connection_t *connection,
 	    const uint8_t *d;
 	    uint8_t *new, *n;
 
+	    if (c == 0)
+		break;
+
 	    new = malloc (c);
 	    if (unlikely (new == NULL)) {
 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -4495,6 +4498,9 @@ _cairo_xcb_surface_add_glyph (cairo_xcb_connection_t *connection,
 	    const uint32_t *d;
 	    uint32_t *new, *n;
 
+	    if (c == 0)
+		break;
+
 	    new = malloc (4 * c);
 	    if (unlikely (new == NULL)) {
 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface.c
index d7e0d734ea5..d7e0d734ea5 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb.h
index e321d8482c2..e321d8482c2 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xcb.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xcb.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-core-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-core-compositor.c
index 5babcc81bed..5babcc81bed 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-core-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-core-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-display.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-display.c
index a2a3bc7924b..a2a3bc7924b 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-display.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-display.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-fallback-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-fallback-compositor.c
index ed2845db57d..ed2845db57d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-fallback-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-fallback-compositor.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-private.h
index 6d37896c319..0f2f2e1faa0 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-private.h
@@ -37,8 +37,8 @@
 #ifndef CAIRO_XLIB_PRIVATE_H
 #define CAIRO_XLIB_PRIVATE_H
 
-#include "cairo-xlib.h"
 #include "cairo-xlib-xrender-private.h"
+#include "cairo-xlib.h"
 
 #include "cairo-compiler-private.h"
 #include "cairo-device-private.h"
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-render-compositor.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-render-compositor.c
index e90df09fdfa..8a1ec7bd731 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-render-compositor.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-render-compositor.c
@@ -1287,6 +1287,9 @@ _cairo_xlib_surface_add_glyph (cairo_xlib_display_t *display,
 	    unsigned char   *d;
 	    unsigned char   *new, *n;
 
+	    if (c == 0)
+		break;
+
 	    new = malloc (c);
 	    if (!new) {
 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -1312,6 +1315,9 @@ _cairo_xlib_surface_add_glyph (cairo_xlib_display_t *display,
 	    const uint32_t *d;
 	    uint32_t *new, *n;
 
+	    if (c == 0)
+		break;
+
 	    new = malloc (4 * c);
 	    if (unlikely (new == NULL)) {
 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-screen.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-screen.c
index 57beeaab426..57beeaab426 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-screen.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-screen.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-source.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-source.c
index 81cc028e85d..1591f5874f6 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-source.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-source.c
@@ -869,11 +869,14 @@ recording_pattern_get_surface (const cairo_pattern_t *pattern)
     cairo_surface_t *surface;
 
     surface = ((const cairo_surface_pattern_t *) pattern)->surface;
+
     if (_cairo_surface_is_paginated (surface))
-	surface = _cairo_paginated_surface_get_recording (surface);
+	return cairo_surface_reference (_cairo_paginated_surface_get_recording (surface));
+
     if (_cairo_surface_is_snapshot (surface))
-	surface = _cairo_surface_snapshot_get_target (surface);
-    return surface;
+	return _cairo_surface_snapshot_get_target (surface);
+
+    return cairo_surface_reference (surface);
 }
 
 static cairo_surface_t *
@@ -885,6 +888,7 @@ record_source (cairo_xlib_surface_t *dst,
 	       int *src_x, int *src_y)
 {
     cairo_xlib_surface_t *src;
+    cairo_surface_t *recording;
     cairo_matrix_t matrix, m;
     cairo_status_t status;
     cairo_rectangle_int_t upload, limit;
@@ -911,9 +915,11 @@ record_source (cairo_xlib_surface_t *dst,
     }
 
     cairo_matrix_init_translate (&matrix, upload.x, upload.y);
-    status = _cairo_recording_surface_replay_with_clip (recording_pattern_get_surface (&pattern->base),
+    recording = recording_pattern_get_surface (&pattern->base),
+    status = _cairo_recording_surface_replay_with_clip (recording,
 							&matrix, &src->base,
 							NULL);
+    cairo_surface_destroy (recording);
     if (unlikely (status)) {
 	cairo_surface_destroy (&src->base);
 	return _cairo_surface_create_in_error (status);
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-private.h
index 87db6962b31..83d9b63cc4c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-private.h
@@ -33,9 +33,9 @@
 #ifndef CAIRO_XLIB_SURFACE_PRIVATE_H
 #define CAIRO_XLIB_SURFACE_PRIVATE_H
 
+#include "cairo-xlib-xrender-private.h"
 #include "cairo-xlib.h"
 #include "cairo-xlib-private.h"
-#include "cairo-xlib-xrender-private.h"
 
 #include "cairo-surface-private.h"
 #include "cairo-surface-backend-private.h"
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface-shm.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-shm.c
index 84b46d89a52..fb40699dc1d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface-shm.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface-shm.c
@@ -453,7 +453,7 @@ static void send_event(cairo_xlib_display_t *display,
     display->shm->last_event = ev.serial;
 }
 
-static void sync (cairo_xlib_display_t *display)
+static void _cairo_xlib_display_sync (cairo_xlib_display_t *display)
 {
     cairo_xlib_shm_info_t *info;
     struct pqueue *pq = &display->shm->info;
@@ -949,7 +949,7 @@ _cairo_xlib_surface_update_shm (cairo_xlib_surface_t *surface)
 	XChangeGC (display->display, gc, GCSubwindowMode, &gcv);
     }
 
-    sync (display);
+    _cairo_xlib_display_sync (display);
     shm->active = 0;
     shm->idle--;
 
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface.c
index 029a542b946..029a542b946 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-visual.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-visual.c
index 863822eebbd..863822eebbd 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-visual.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-visual.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xcb-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xcb-surface.c
index 9c0d4b41389..af3e1557899 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xcb-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xcb-surface.c
@@ -519,21 +519,6 @@ cairo_xlib_surface_create (Display     *dpy,
 								     width, height));
 }
 
-cairo_surface_t *
-cairo_xlib_surface_create_for_bitmap (Display  *dpy,
-				      Pixmap	bitmap,
-				      Screen   *scr,
-				      int	width,
-				      int	height)
-{
-    return _cairo_xlib_xcb_surface_create (dpy, scr, NULL, NULL,
-					   cairo_xcb_surface_create_for_bitmap (XGetXCBConnection (dpy),
-										(xcb_screen_t *) scr,
-										bitmap,
-										width, height));
-}
-
-#if CAIRO_HAS_XLIB_XRENDER_SURFACE
 static xcb_screen_t *
 _cairo_xcb_screen_from_root (xcb_connection_t *connection,
 			     xcb_window_t id)
@@ -548,6 +533,24 @@ _cairo_xcb_screen_from_root (xcb_connection_t *connection,
 
     return NULL;
 }
+
+cairo_surface_t *
+cairo_xlib_surface_create_for_bitmap (Display  *dpy,
+				      Pixmap	bitmap,
+				      Screen   *scr,
+				      int	width,
+				      int	height)
+{
+    xcb_connection_t *connection = XGetXCBConnection (dpy);
+    xcb_screen_t *screen = _cairo_xcb_screen_from_root (connection, (xcb_window_t) scr->root);
+    return _cairo_xlib_xcb_surface_create (dpy, scr, NULL, NULL,
+					   cairo_xcb_surface_create_for_bitmap (connection,
+										screen,
+										bitmap,
+										width, height));
+}
+
+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
 cairo_surface_t *
 cairo_xlib_surface_create_with_xrender_format (Display		    *dpy,
 					       Drawable		    drawable,
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xrender-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender-private.h
index 90769467b2d..90769467b2d 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xrender-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xrender.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender.h
index b34b057de4c..b34b057de4c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib-xrender.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib-xrender.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib.h
index ecf8d6c86be..ecf8d6c86be 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xlib.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xlib.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xml-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml-surface.c
index 6dbafdba2ba..6dbafdba2ba 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xml-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xml.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml.h
index 9ae76e90aae..9ae76e90aae 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo-xml.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo-xml.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.c b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.c
index e3acf4d46c7..e3acf4d46c7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.h
index 3104d47e4c4..3104d47e4c4 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.pc.in b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.pc.in
index b361edf18fb..b361edf18fb 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairo.pc.in
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairo.pc.in
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/cairoint.h b/Build/source/libs/cairo/cairo-1.14.2/src/cairoint.h
index b4e8ac87fb5..5bca0038953 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/cairoint.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/cairoint.h
@@ -229,7 +229,7 @@ be16_to_cpu(uint16_t v)
 static inline uint32_t cairo_const
 cpu_to_be32(uint32_t v)
 {
-    return (cpu_to_be16 (v) << 16) | cpu_to_be16 (v >> 16);
+    return (v >> 24) | ((v >> 8) & 0xff00) | ((v << 8) & 0xff0000) | (v << 24);
 }
 
 static inline uint32_t cairo_const
@@ -240,6 +240,32 @@ be32_to_cpu(uint32_t v)
 
 #endif
 
+/* Unaligned big endian access
+ */
+
+static inline uint16_t get_unaligned_be16 (const unsigned char *p)
+{
+    return p[0] << 8 | p[1];
+}
+
+static inline uint32_t get_unaligned_be32 (const unsigned char *p)
+{
+    return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
+}
+
+static inline void put_unaligned_be16 (uint16_t v, unsigned char *p)
+{
+    p[0] = (v >> 8) & 0xff;
+    p[1] = v & 0xff;
+}
+
+static inline void put_unaligned_be32 (uint32_t v, unsigned char *p)
+{
+    p[0] = (v >> 24) & 0xff;
+    p[1] = (v >> 16) & 0xff;
+    p[2] = (v >> 8)  & 0xff;
+    p[3] = v & 0xff;
+}
 
 /* The glibc versions of ispace() and isdigit() are slow in UTF-8 locales.
  */
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-def.sh b/Build/source/libs/cairo/cairo-1.14.2/src/check-def.sh
index beefb46a333..beefb46a333 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-def.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-def.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-doc-syntax.awk b/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.awk
index 1fa8b8d2232..1fa8b8d2232 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-doc-syntax.awk
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.awk
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-doc-syntax.sh b/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.sh
index 762a48429b0..762a48429b0 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-doc-syntax.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-doc-syntax.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-has-hidden-symbols.c b/Build/source/libs/cairo/cairo-1.14.2/src/check-has-hidden-symbols.c
index 12041277692..12041277692 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-has-hidden-symbols.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-has-hidden-symbols.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-headers.sh b/Build/source/libs/cairo/cairo-1.14.2/src/check-headers.sh
index 61232954bae..61232954bae 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-headers.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-headers.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-link.c b/Build/source/libs/cairo/cairo-1.14.2/src/check-link.c
index 66ca1b2413c..66ca1b2413c 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-link.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-link.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-plt.sh b/Build/source/libs/cairo/cairo-1.14.2/src/check-plt.sh
index 5a9dae1269d..5a9dae1269d 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-plt.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-plt.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/check-preprocessor-syntax.sh b/Build/source/libs/cairo/cairo-1.14.2/src/check-preprocessor-syntax.sh
index b718f604ee7..b718f604ee7 100755
--- a/Build/source/libs/cairo/cairo-1.14.0/src/check-preprocessor-syntax.sh
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/check-preprocessor-syntax.sh
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-base-compositor-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/test-base-compositor-surface.c
index ff84b10aff7..ff84b10aff7 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-base-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-base-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface-private.h b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface-private.h
index 491f241bacc..491f241bacc 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface-private.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface-private.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.c
index 1cc5f692120..1cc5f692120 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface.h b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.h
index 8d8af2d5409..8d8af2d5409 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-compositor-surface.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-compositor-surface.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-null-compositor-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.c
index 2301055e30a..2301055e30a 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-null-compositor-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-null-compositor-surface.h b/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.h
index 52d864b28df..52d864b28df 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-null-compositor-surface.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-null-compositor-surface.h
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-paginated-surface.c b/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.c
index 0a7c79b37bf..0a7c79b37bf 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-paginated-surface.c
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.c
diff --git a/Build/source/libs/cairo/cairo-1.14.0/src/test-paginated-surface.h b/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.h
index 2bd98aa5eee..2bd98aa5eee 100644
--- a/Build/source/libs/cairo/cairo-1.14.0/src/test-paginated-surface.h
+++ b/Build/source/libs/cairo/cairo-1.14.2/src/test-paginated-surface.h
diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure
index 092dfb28e90..1ff3c6488eb 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.0.
+# Generated by GNU Autoconf 2.69 for cairo (TeX Live) 1.14.2.
 #
 # 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.0'
-PACKAGE_STRING='cairo (TeX Live) 1.14.0'
+PACKAGE_VERSION='1.14.2'
+PACKAGE_STRING='cairo (TeX Live) 1.14.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="cairo-1.14.0/src/cairo.h"
+ac_unique_file="cairo-1.14.2/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.0 to adapt to many kinds of systems.
+\`configure' configures cairo (TeX Live) 1.14.2 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.0:";;
+     short | recursive ) echo "Configuration of cairo (TeX Live) 1.14.2:";;
    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.0
+cairo (TeX Live) configure 1.14.2
 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.0, which was
+It was created by cairo (TeX Live) $as_me 1.14.2, 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.0'
+ VERSION='1.14.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6616,7 +6616,7 @@ LIBS=$kpse_save_LIBS
 echo timestamp >config.force
 fi
 
-CAIRO_TREE=cairo-1.14.0
+CAIRO_TREE=cairo-1.14.2
 
 
 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.0, which was
+This file was extended by cairo (TeX Live) $as_me 1.14.2, 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.0
+cairo (TeX Live) config.status 1.14.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/cairo/version.ac b/Build/source/libs/cairo/version.ac
index 44fd0b1d61a..56690adf0de 100644
--- a/Build/source/libs/cairo/version.ac
+++ b/Build/source/libs/cairo/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current cairo version
-m4_define([cairo_version], [1.14.0])
+m4_define([cairo_version], [1.14.2])