758 files changed, 2027 insertions, 1801 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 38f54bb3c83..3bfcb212ef6 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -12,7 +12,7 @@ See also comments in ../texk/README.
 cairo 1.14.0 - checked 15oct14
   http://cairographics.org/releases/
 
-freetype2 2.5.4 - checked 7dec14
+freetype2 2.5.5 - checked 7jan15
   http://savannah.nongnu.org/download/freetype/
 
 gd 2.1.0 - checked 26jun13
@@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13
 pixman 0.32.6 - checked 7jul14
   http://cairographics.org/releases/
 
-poppler 0.29.0 - checked 5dec14
+poppler 0.30.0 - checked 7jan15
   http://poppler.freedesktop.org/ - used by luatex and xetex
 
 potrace 1.11 - checked 12apr13
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 526e8e60034..0defc4f9906 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import freetype-2.5.5.
+	* version.ac: Adjust.
+
 2014-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import freetype-2.5.4.
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index 50908fbdc36..ef388501d84 100755
--- a/Build/source/libs/freetype2/configure
+++ b/Build/source/libs/freetype2/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.5.4.
+# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.5.5.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,12 +579,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType (TeX Live)'
 PACKAGE_TARNAME='freetype--tex-live-'
-PACKAGE_VERSION='2.5.4'
-PACKAGE_STRING='FreeType (TeX Live) 2.5.4'
+PACKAGE_VERSION='2.5.5'
+PACKAGE_STRING='FreeType (TeX Live) 2.5.5'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="freetype-2.5.4/builds/unix/ftconfig.in"
+ac_unique_file="freetype-2.5.5/builds/unix/ftconfig.in"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -1235,7 +1235,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 FreeType (TeX Live) 2.5.4 to adapt to many kinds of systems.
+\`configure' configures FreeType (TeX Live) 2.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1302,7 +1302,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType (TeX Live) 2.5.4:";;
+     short | recursive ) echo "Configuration of FreeType (TeX Live) 2.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1398,7 +1398,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType (TeX Live) configure 2.5.4
+FreeType (TeX Live) configure 2.5.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1499,7 +1499,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 FreeType (TeX Live) $as_me 2.5.4, which was
+It was created by FreeType (TeX Live) $as_me 2.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3422,7 +3422,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='freetype--tex-live-'
- VERSION='2.5.4'
+ VERSION='2.5.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4368,7 +4368,7 @@ else
 fi
 
 
-FREETYPE_TREE=freetype-2.5.4
+FREETYPE_TREE=freetype-2.5.5
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -4952,7 +4952,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 FreeType (TeX Live) $as_me 2.5.4, which was
+This file was extended by FreeType (TeX Live) $as_me 2.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5009,7 +5009,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="\\
-FreeType (TeX Live) config.status 2.5.4
+FreeType (TeX Live) config.status 2.5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4-PATCHES/ChangeLog b/Build/source/libs/freetype2/freetype-2.5.5-PATCHES/ChangeLog
index 450f9b72657..f27af44c960 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4-PATCHES/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.5.5-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported freetype-2.5.5 source tree from:
+	  http://savannah.nongnu.org/download/freetype/
+
 2014-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported freetype-2.5.4 source tree from:
diff --git a/Build/source/libs/freetype2/freetype-2.5.4-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-2.5.5-PATCHES/TL-Changes
index 3f4aa2107d1..87255205014 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4-PATCHES/TL-Changes
+++ b/Build/source/libs/freetype2/freetype-2.5.5-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the freetype-2.5.4/ tree as obtained from:
+Changes applied to the freetype-2.5.5/ tree as obtained from:
 	http://savannah.nongnu.org/download/freetype/.
 
 Updated:
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/CMakeLists.txt b/Build/source/libs/freetype2/freetype-2.5.5/CMakeLists.txt
index 7784b9e1a25..8b859a57e98 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/CMakeLists.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/CMakeLists.txt
@@ -99,7 +99,7 @@ endif ()
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "5")
-set(VERSION_PATCH "4")
+set(VERSION_PATCH "5")
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 # Compiler definitions for building the library
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog
index c6bb781a2cc..809b475f013 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog
@@ -1,3 +1,163 @@
+2014-12-30  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.5.5 released.
+	=========================
+
+
+	Tag sources with `VER-2-5-5'.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.5.5.
+
+	* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
+	builds/windows/vc2005/index.html,
+	builds/windows/vc2008/freetype.vcproj,
+	builds/windows/vc2008/index.html,
+	builds/windows/vc2010/freetype.vcxproj,
+	builds/windows/vc2010/index.html,
+	builds/windows/visualc/freetype.dsp,
+	builds/windows/visualc/freetype.vcproj,
+	builds/windows/visualc/index.html,
+	builds/windows/visualce/freetype.dsp,
+	builds/windows/visualce/freetype.vcproj,
+	builds/windows/visualce/index.html,
+	builds/wince/vc2005-ce/freetype.vcproj,
+	builds/wince/vc2005-ce/index.html,
+	builds/wince/vc2008-ce/freetype.vcproj,
+	builds/wince/vc2008-ce/index.html: s/2.5.4/2.5.5/, s/254/255/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 5.
+
+	* builds/unix/configure.raw (version_info): Set to 17:4:11.
+	* CMakeLists.txt (VERSION_PATCH): Set to 5.
+	* docs/CHANGES: Updated.
+
+2014-12-24  Alexei Podtelezhnikov <apodtele@gmail.com>
+
+	[base] Formatting and nanooptimizations.
+
+	* src/base/ftcalc.c,
+	* src/base/fttrigon.c: Revise sign restoration.
+
+2014-12-13  Werner Lemberg  <wl@gnu.org>
+
+	* src/pcf/pcfread.c (pcf_read_TOC): Improve fix from 2014-12-08.
+
+2014-12-11  Werner Lemberg  <wl@gnu.org>
+
+	* builds/toplevel.mk (dist): Use older POSIX standard for `tar'.
+
+	Apparently, BSD tar isn't capable yet of handling POSIX-1.2001
+	(contrary to GNU tar), so force the POSIX-1.1988 format.
+
+	Problem reported by Stephen Fisher <sfisher@SDF.ORG>.
+
+2014-12-11  Werner Lemberg  <wl@gnu.org>
+
+	* src/type42/t42parse.c (t42_parse_sfnts): Reject invalid TTF size.
+
+2014-12-11  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftobjs.c (FT_Get_Glyph_Name): Fix off-by-one check.
+
+	Problem reported by Dennis Felsing <dennis@felsin9.de>.
+
+2014-12-11  Werner Lemberg  <wl@gnu.org>
+
+	* src/type42/t42parse.c (t42_parse_sfnts): Check `string_size'.
+
+	Problem reported by Dennis Felsing <dennis@felsin9.de>.
+
+2014-12-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[gxvalid] Fix a naming convention conflicting with ftvalid.
+
+	See previous changeset for otvalid.
+
+	* src/gxvalid/{gxvcommn.h, gxvmort.h, gxvmorx.h}: Replace
+	`valid' by `gxvalid'.
+	* src/gxvalid/{gxvbsln.c, gxvcommn.c, gxvfeat.c, gxvjust.c,
+	gxvkern.c, gxvlcar.c, gxvmort.c, gxvmort0.c, gxvmort1.c,
+	gxvmort2.c, gxvmort4.c, gxvmort5.c, gxvmorx.c, gxvmorx0.c,
+	gxvmorx1.c, gxvmorx2.c, gxvmorx4.c, gxvmorx5.c, gxvopbd.c,
+	gxvprop.c, gxvtrak.c}: Replace `valid' by `gxvalid' if
+	it is typed as GXV_Validator.
+
+2014-12-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[otvalid] Fix a naming convention conflicting with ftvalid.
+
+	Some prototypes in ftvalid.h use `valid' for the variables
+	typed as FT_Validator.  Their implementations in src/base/
+	ftobjs.c and utilizations in src/sfnt/ttcmap.c do similar.
+
+	Some macros in otvcommn.h assume the exist of the variable
+	`valid' typed as OTV_Validator in the caller.
+
+	Mixing these two conventions cause invalid pointer conversion
+	and unexpected SEGV in longjmp.  To prevent it, all variables
+	typed as OTV_Validator are renamed to `otvalid'.
+
+	* src/otvalid/otvcommn.h: Replace `valid' by `otvalid'.
+	* src/otvalid/{otvcommn.c, otvbase.c, otvgdef.c, otvgpos.c,
+	otvgsub.c, otvjstf.c, otvmath.c}: Replace `valid' by `otvalid'
+	if it is typed as OTV_Validator.
+
+2014-12-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[ftvalid] Introduce FT_THROW() in FT_INVALID_XXX macros.
+
+	Original patch is designed by Werner Lemberg.  Extra part
+	for otvalid and gxvalid are added by suzuki toshiya, see
+	discussion:
+	http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00002.html
+	http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00007.html
+
+	* include/internal/ftvalid.h: Introduce FT_THROW() in FT_INVALID_().
+	* src/gxvalid/gxvcommn.h: Ditto.
+	* src/otvalid/otvcommn.h: Ditto.
+
+2014-12-08  Werner Lemberg  <wl@gnu.org>
+
+	[pcf] Fix Savannah bug #43774.
+
+	Work around `features' of X11's `pcfWriteFont' and `pcfReadFont'
+	functions.  Since the PCF format doesn't have an official
+	specification, we have to exactly follow these functions' behaviour.
+
+	The problem was unveiled with a patch from 2014-11-06, fixing issue
+	#43547.
+
+	* src/pcf/pcfread.c (pcf_read_TOC): Don't check table size for last
+	element.  Instead, assign real size.
+
+2014-12-07  Werner Lemberg  <wl@gnu.org>
+
+	Work around a bug in Borland's C++ compiler.
+
+	See
+
+	  http://qc.embarcadero.com/wc/qcmain.aspx?d=118998
+
+	for Borland's bug tracker entry.
+
+	Reported by Yuliana Zigangirova <zigangirova@inbox.ru>,
+	http://lists.gnu.org/archive/html/freetype-devel/2014-04/msg00001.html.
+
+	* include/internal/ftvalid.h (FT_ValidatorRec), src/smooth/ftgrays.c
+	(gray_TWorker_): Move `ft_jmp_buf' field to be the first element.
+
+2014-12-07  Werner Lemberg  <wl@gnu.org>
+
+	*/*: Decorate hex constants with `U' and `L' where appropriate.
+
+2014-12-07  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Prevent memory leak for buggy fonts.
+
+	* src/truetype/ttobjs.c (tt_size_done): Unconditionally call
+	`tt_size_done_bytecode'.
+
 2014-12-06  Werner Lemberg  <wl@gnu.org>
 
 	* Version 2.5.4 released.
@@ -568,7 +728,7 @@
 
 	[cff, pfr, psaux, winfonts] Fix Savannah bug #43676.
 
-	Don't cast cmap init function pointers to an incompatible type. 
+	Don't cast cmap init function pointers to an incompatible type.
 
 	Without this patch, the number of parameters between declaration and
 	the real signature differs.  Calling such a function results in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.20 b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.20
index 8fcc5e70ab4..8fcc5e70ab4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.20
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.20
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.21 b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.21
index 300a094f203..300a094f203 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.21
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.21
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.22 b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.22
index 4144288a5bf..4144288a5bf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.22
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.22
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.23 b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.23
index 1a23848f88a..1a23848f88a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.23
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.23
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.24 b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.24
index 01eb3b75f72..01eb3b75f72 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/ChangeLog.24
+++ b/Build/source/libs/freetype2/freetype-2.5.5/ChangeLog.24
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/Jamfile
index abaf817ca15..16e097ed95f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/Jamfile
@@ -195,7 +195,7 @@ rule RefDoc
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.4 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/Jamrules b/Build/source/libs/freetype2/freetype-2.5.5/Jamrules
index d8d1c7e617b..d8d1c7e617b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/Jamrules
+++ b/Build/source/libs/freetype2/freetype-2.5.5/Jamrules
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/Makefile b/Build/source/libs/freetype2/freetype-2.5.5/Makefile
index c1fa16cee54..c1fa16cee54 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/README b/Build/source/libs/freetype2/freetype-2.5.5/README
index cced66039c4..f00a1ab79bc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/README
@@ -1,4 +1,4 @@
-  FreeType 2.5.4
+  FreeType 2.5.5
   ==============
 
   Homepage: http://www.freetype.org
@@ -24,9 +24,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.5.4.tar.bz2
-    freetype-doc-2.5.4.tar.gz
-    ftdoc254.zip
+    freetype-doc-2.5.5.tar.bz2
+    freetype-doc-2.5.5.tar.gz
+    ftdoc255.zip
 
   To view the documentation online, go to
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/README.git b/Build/source/libs/freetype2/freetype-2.5.5/README.git
index 021c121413d..021c121413d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/README.git
+++ b/Build/source/libs/freetype2/freetype-2.5.5/README.git
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/autogen.sh b/Build/source/libs/freetype2/freetype-2.5.5/autogen.sh
index cc0e661ce5a..cc0e661ce5a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/autogen.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.5/autogen.sh
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/README b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/README
index 85fcc43308c..85fcc43308c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/include/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/include/config/ftconfig.h
index a73ace671dd..a73ace671dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/include/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/include/config/ftconfig.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/include/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/include/config/ftmodule.h
index 5873bab74fa..5873bab74fa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/include/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/include/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/makefile b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/makefile
index 8a1e4c61b15..8a1e4c61b15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/makefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/makefile.os4 b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/makefile.os4
index a2e6ffcedf7..a2e6ffcedf7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/makefile.os4
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/makefile.os4
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/smakefile b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/smakefile
index aee7fb9d488..aee7fb9d488 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/smakefile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/smakefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/src/base/ftdebug.c
index 39688af783c..39688af783c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/src/base/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/src/base/ftsystem.c
index 42a552dbe89..42a552dbe89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/amiga/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/amiga/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/ansi/ansi-def.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/ansi/ansi-def.mk
index 2c585729515..2c585729515 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/ansi/ansi-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/ansi/ansi-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/ansi/ansi.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/ansi/ansi.mk
index 32b3bac3e3a..32b3bac3e3a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/ansi/ansi.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/ansi/ansi.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/ATARI.H b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/ATARI.H
index 9f78c924b83..9f78c924b83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/ATARI.H
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/ATARI.H
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/FNames.SIC b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/FNames.SIC
index f3657179d91..f3657179d91 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/FNames.SIC
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/FNames.SIC
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/FREETYPE.PRJ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/FREETYPE.PRJ
index 4776a5bc690..4776a5bc690 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/FREETYPE.PRJ
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/FREETYPE.PRJ
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/README.TXT b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/README.TXT
index 04eec63519b..04eec63519b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/README.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/README.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/deflinejoiner.awk b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/deflinejoiner.awk
index 16d9e6dd933..16d9e6dd933 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/deflinejoiner.awk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/deflinejoiner.awk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/gen-purec-patch.sh b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/gen-purec-patch.sh
index 1ec050c11fa..1ec050c11fa 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/atari/gen-purec-patch.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/atari/gen-purec-patch.sh
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/beos-def.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/beos-def.mk
index 4371a30aa3c..4371a30aa3c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/beos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/beos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/beos.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/beos.mk
index b5c8bdabe32..b5c8bdabe32 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/beos.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/beos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/detect.mk
index 24a0878862a..24a0878862a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/beos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/beos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/cmake/iOS.cmake b/Build/source/libs/freetype2/freetype-2.5.5/builds/cmake/iOS.cmake
index a41a7acf2ac..a41a7acf2ac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/cmake/iOS.cmake
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/cmake/iOS.cmake
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/ansi-cc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/ansi-cc.mk
index 3b668e20102..3b668e20102 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/ansi-cc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/ansi-cc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/bcc-dev.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/bcc-dev.mk
index 42a99b0c006..42a99b0c006 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/bcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/bcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/bcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/bcc.mk
index 855edadf0a3..855edadf0a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/bcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/emx.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/emx.mk
index c237005cb1e..c237005cb1e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/gcc-dev.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/gcc-dev.mk
index c63e1262ebe..c63e1262ebe 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/gcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/gcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/gcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/gcc.mk
index f6b7101b38a..f6b7101b38a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/intelc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/intelc.mk
index 413ce5bacc7..413ce5bacc7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/intelc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/intelc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/unix-lcc.mk
index d79f50846cb..d79f50846cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/visualage.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/visualage.mk
index c109659bf73..c109659bf73 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/visualage.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/visualage.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/visualc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/visualc.mk
index 2e19ef86a31..2e19ef86a31 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/visualc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/visualc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/watcom.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/watcom.mk
index 4db1e7fecea..4db1e7fecea 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/watcom.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/watcom.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/win-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/win-lcc.mk
index 5d02d82462e..5d02d82462e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/compiler/win-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/compiler/win-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/detect.mk
index ff4045d5c02..ff4045d5c02 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/detect.mk
index 3e5e967e430..3e5e967e430 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-def.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-def.mk
index 950f581a00b..950f581a00b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-emx.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-emx.mk
index 6ea8f6d872f..6ea8f6d872f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-gcc.mk
index e14255c1f27..e14255c1f27 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-wat.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-wat.mk
index c763b163cd9..c763b163cd9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/dos/dos-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/dos/dos-wat.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/exports.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/exports.mk
index 96b10db8747..96b10db8747 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/exports.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/exports.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/freetype.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/freetype.mk
index 8b2e2eace4d..8b2e2eace4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/freetype.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/freetype.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/link_dos.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/link_dos.mk
index c37ac7e52c1..c37ac7e52c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/link_dos.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/link_dos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/link_std.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/link_std.mk
index 0bd2163bb19..0bd2163bb19 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/link_std.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/link_std.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.m68k_cfm.make.txt b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.m68k_cfm.make.txt
index 425f9f9ce28..425f9f9ce28 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.m68k_cfm.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.m68k_far.make.txt b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.m68k_far.make.txt
index ebf5a1b56ab..ebf5a1b56ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.m68k_far.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.m68k_far.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.ppc_carbon.make.txt b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.ppc_carbon.make.txt
index 2926413f395..2926413f395 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.ppc_carbon.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.ppc_classic.make.txt b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.ppc_classic.make.txt
index 377de9ab98f..377de9ab98f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/FreeType.ppc_classic.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/FreeType.ppc_classic.make.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/README b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/README
index f58e47d4ad2..f58e47d4ad2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ascii2mpw.py b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ascii2mpw.py
index ad32b219772..ad32b219772 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ascii2mpw.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ascii2mpw.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/freetype-Info.plist b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/freetype-Info.plist
index b3d114dad8b..b3d114dad8b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/freetype-Info.plist
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/freetype-Info.plist
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ftlib.prj.xml b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ftlib.prj.xml
index cbbc45ee55c..cbbc45ee55c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ftlib.prj.xml
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ftlib.prj.xml
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ftmac.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ftmac.c
index 27b5511c025..27b5511c025 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/mac/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/mac/ftmac.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/modules.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/modules.mk
index 3c1b083dd71..3c1b083dd71 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/modules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/modules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/newline b/Build/source/libs/freetype2/freetype-2.5.5/builds/newline
index 8b137891791..8b137891791 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/newline
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/newline
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/detect.mk
index 47a40a2f857..47a40a2f857 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-def.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-def.mk
index 01cda9285af..01cda9285af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-dev.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-dev.mk
index 83da8dea33e..83da8dea33e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-gcc.mk
index 446073e4f56..446073e4f56 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/os2/os2-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/os2/os2-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/symbian/bld.inf b/Build/source/libs/freetype2/freetype-2.5.5/builds/symbian/bld.inf
index bc8c1609c9d..bc8c1609c9d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/symbian/bld.inf
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/symbian/bld.inf
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/symbian/freetype.mmp b/Build/source/libs/freetype2/freetype-2.5.5/builds/symbian/freetype.mmp
index cb0008c4463..cb0008c4463 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/symbian/freetype.mmp
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/symbian/freetype.mmp
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/toplevel.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/toplevel.mk
index 812750ac54f..16d4be83728 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/toplevel.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/toplevel.mk
@@ -220,9 +220,9 @@ dist:
 
 	mv tmp freetype-$(version)
 
-	tar cfh - freetype-$(version) \
+	tar -H ustar -chf - freetype-$(version) \
 	| gzip -9 -c > freetype-$(version).tar.gz
-	tar cfh - freetype-$(version) \
+	tar -H ustar -chf - freetype-$(version) \
 	| bzip2 -c > freetype-$(version).tar.bz2
 
 	@# Use CR/LF for zip files.
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/aclocal.m4 b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/aclocal.m4
index 2c0316495ec..2c0316495ec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/aclocal.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/aclocal.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/config.guess
index dbfb9786cb6..6c32c8645c8 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2014-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/config.sub
index 6d2e94c8bf9..7ffe3737842 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/config.sub
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2014-12-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv | ft32 \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure
index 31d697599a9..08357a9cb9b 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.5.4.
+# Generated by GNU Autoconf 2.69 for FreeType 2.5.5.
 #
 # Report bugs to <freetype@nongnu.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.5.4'
-PACKAGE_STRING='FreeType 2.5.4'
+PACKAGE_VERSION='2.5.5'
+PACKAGE_STRING='FreeType 2.5.5'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''
 
@@ -1325,7 +1325,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 FreeType 2.5.4 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.5.4:";;
+     short | recursive ) echo "Configuration of FreeType 2.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1531,7 +1531,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType configure 2.5.4
+FreeType configure 2.5.5
 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 FreeType $as_me 2.5.4, which was
+It was created by FreeType $as_me 2.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2485,7 +2485,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='17:3:11'
+version_info='17:4:11'
 
 ft_version=`echo $version_info | tr : .`
 
@@ -14288,7 +14288,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 FreeType $as_me 2.5.4, which was
+This file was extended by FreeType $as_me 2.5.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14354,7 +14354,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="\\
-FreeType config.status 2.5.4
+FreeType config.status 2.5.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure.ac
index ab6ee8e6b2f..f6f754699d2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure.ac
@@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-AC_INIT([FreeType], [2.5.4], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.5.5], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='17:3:11'
+version_info='17:4:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure.raw
index e72d28f7e7f..72543cf88cd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='17:3:11'
+version_info='17:4:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/detect.mk
index 0506e7d04b9..0506e7d04b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype-config.in
index ebc311f077f..ebc311f077f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype-config.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype2.in b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype2.in
index a488d960968..a488d960968 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype2.in
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype2.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype2.m4
index 3a806d90f5b..3a806d90f5b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/freetype2.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/freetype2.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ft-munmap.m4
index 68b3361e2b1..68b3361e2b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ft-munmap.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ft-munmap.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ftconfig.in b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ftconfig.in
index e66f3eab3d8..e66f3eab3d8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ftconfig.in
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ftconfig.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ftsystem.c
index 7f7b3acb308..7f7b3acb308 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/install-sh b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/install-sh
index 0b0fdcbba69..04367377519 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/install-sh
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2013-10-30.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -82,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -139,16 +139,14 @@ while test $# -ne 0; do
 
     -s) stripcmd=$stripprog;;
 
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
+    -t) dst_arg=$2
         # Protect names problematic for 'test' and other utilities.
         case $dst_arg in
           -* | [=\(\)!]) dst_arg=./$dst_arg;;
         esac
         shift;;
 
-    -T) is_target_a_directory=never;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -163,16 +161,6 @@ while test $# -ne 0; do
   shift
 done
 
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -204,15 +192,6 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
-if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -274,7 +253,7 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
+      if test -n "$no_target_directory"; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/install.mk
index 83525ee41d6..83525ee41d6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/install.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/install.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ltmain.sh b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ltmain.sh
index 08f3a26e3b8..08f3a26e3b8 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/ltmain.sh
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/ltmain.sh
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/mkinstalldirs b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/mkinstalldirs
index ef7e16fdafe..ef7e16fdafe 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/mkinstalldirs
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/mkinstalldirs
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/pkg.m4 b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/pkg.m4
index f26f84c9aef..f26f84c9aef 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/pkg.m4
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/pkg.m4
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-cc.in
index b84bc5d27b1..b84bc5d27b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-cc.in
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-cc.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-def.in
index 4c06a05c747..4c06a05c747 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-def.in
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-dev.mk
index 76bae3862ae..76bae3862ae 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-lcc.mk
index 6038e523921..6038e523921 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix.mk
index 7f9d9a34fb9..7f9d9a34fb9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unix.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unix.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unixddef.mk
index 130d6b0f623..130d6b0f623 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/unix/unixddef.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/unix/unixddef.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/vms/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.5/builds/vms/ftconfig.h
index b3096512e56..b3096512e56 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/vms/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/vms/ftconfig.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/vms/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/vms/ftsystem.c
index 5c2819edb53..5c2819edb53 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/vms/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/vms/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/ftdebug.c
index 24f96582815..24f96582815 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/freetype.sln
index 67b2216dcd5..67b2216dcd5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/freetype.vcproj
index c4161a947d9..e87295a6624 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/freetype.vcproj
@@ -21,7 +21,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -41,7 +41,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -61,7 +61,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -81,7 +81,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -121,7 +121,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -141,7 +141,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -161,7 +161,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -181,7 +181,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -201,7 +201,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -221,7 +221,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -241,7 +241,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -261,7 +261,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -281,7 +281,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -301,7 +301,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -321,7 +321,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -341,7 +341,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -361,7 +361,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -381,7 +381,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -401,7 +401,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -421,7 +421,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -441,7 +441,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -461,7 +461,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -481,7 +481,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -501,7 +501,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -521,7 +521,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -541,7 +541,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -561,7 +561,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -581,7 +581,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -601,7 +601,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -621,7 +621,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -641,7 +641,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -661,7 +661,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -681,7 +681,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -701,7 +701,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -721,7 +721,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -741,7 +741,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -758,7 +758,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/index.html
index b05a7fd9bbf..e2160f687a4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2005-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2005-ce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.4 sources:</p>
+It compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/freetype.sln
index 0468e903b71..0468e903b71 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/freetype.vcproj
index abbda6adda2..d2aaf39a430 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -266,7 +266,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -533,7 +533,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -709,7 +709,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -797,7 +797,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -885,7 +885,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -973,7 +973,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1061,7 +1061,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1149,7 +1149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1236,7 +1236,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1323,7 +1323,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1410,7 +1410,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1497,7 +1497,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1584,7 +1584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1668,7 +1668,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1753,7 +1753,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1838,7 +1838,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1923,7 +1923,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2008,7 +2008,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2093,7 +2093,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2178,7 +2178,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2263,7 +2263,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2348,7 +2348,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2433,7 +2433,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2518,7 +2518,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2603,7 +2603,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2689,7 +2689,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2775,7 +2775,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2861,7 +2861,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2947,7 +2947,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3033,7 +3033,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3119,7 +3119,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3205,7 +3205,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3279,7 +3279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/index.html
index 20b250cabd5..469baefef7c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/wince/vc2008-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/wince/vc2008-ce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.4 sources:</p>
+It compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/detect.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/detect.mk
index 9dca2612719..9dca2612719 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/ftdebug.c
index dd2c2ad7cdd..dd2c2ad7cdd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/freetype.sln
index b90da27bb36..b90da27bb36 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/freetype.vcproj
index 32e7709eb62..fe0df721680 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/freetype.vcproj
@@ -16,7 +16,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -33,7 +33,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255MT.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -50,7 +50,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255ST.lib" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -67,7 +67,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -84,7 +84,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255ST_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />
       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
       <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype254MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype255MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/index.html
index 8d782971e94..4929dcdd0ce 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2005/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2005/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.4 sources:</p>
+compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/freetype.sln
index 0995f806174..0995f806174 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/freetype.vcproj
index 5507d10f3dc..2ec8673363f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254MT.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -220,7 +220,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254ST.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -365,7 +365,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -439,7 +439,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/index.html
index dd83bb05755..7e0d154c3bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2008/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2008/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.4 sources:</p>
+compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.sln
index ce0b15b2d6c..ce0b15b2d6c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.user.props b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.user.props
index fa86299127f..78310d46316 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.user.props
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.user.props
@@ -2,7 +2,7 @@
 <!--
  * freetype.user.props
  *
- * 
+ *
  * You can specify custom options here without altering the project file.
  *
  * Multiple entries within each property are separated by semicolons (;).
@@ -14,19 +14,19 @@
 <Project ToolsVersion="4.0"
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-  
+
     <!--
      * `;'-separated list of symbols to #define
      -->
     <UserDefines></UserDefines>
-    
+
     <!--
      * path where your custom `ftoption.h' lives;
      * this is searched BEFORE any other path
      -->
     <!-- <UserOptionDirectory>..\..\..\devel</UserOptionDirectory> -->
     <UserOptionDirectory></UserOptionDirectory>
-    
+
     <!--
      * `;'-separated list of paths to additional include directories,
      * e.g., where to find zlib.h, png.h, etc.;
@@ -34,23 +34,23 @@
      -->
     <!-- <UserIncludeDirectories>..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12</UserIncludeDirectories> -->
     <UserIncludeDirectories></UserIncludeDirectories>
-    
+
     <!--
      * `;'-separated list of paths to additional library directories,
      * e.g., where to find zlib.lib, libpng.lib, etc.
      -->
     <!-- <UserLibraryDirectories>..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12</UserLibraryDirectories> -->
     <UserLibraryDirectories></UserLibraryDirectories>
-    
+
     <!--
      * `;'-separated list of additional linker dependencies,
      * e.g., zlib.lib, libpng.lib, etc.
      -->
     <!-- <UserDependencies>zlib.lib;libpng16.lib</UserDependencies> -->
     <UserDependencies></UserDependencies>
-    
+
   </PropertyGroup>
-  
+
   <!--
    * Example configuration for x64 debug build only
    -->
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.vcxproj
index 49f0b3f5644..b1ac565e901 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.vcxproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.vcxproj
@@ -191,18 +191,18 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype254d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype254d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype254MTd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype254MTd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype254STd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype254STd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype254</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype254</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype254MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype254MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype254ST</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype254ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype255d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype255d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype255MTd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype255MTd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype255STd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype255STd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype255</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype255</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype255MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype255MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype255ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype255ST</TargetName>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\freetype.user.props" Condition="exists('$(SolutionDir)\freetype.user.props')" Label="UserProperties" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.vcxproj.filters b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.vcxproj.filters
index f2b3659b8af..f2b3659b8af 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/freetype.vcxproj.filters
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/index.html
index f63d4843396..cb205aa70cd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/vc2010/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/vc2010/index.html
@@ -12,16 +12,16 @@
 <p>This directory contains a project file for Visual C++ (VS.NET&nbsp;2010
 or newer), named <tt>freetype.vcxproj</tt>, and Visual Studio, called
 <tt>freetype.sln</tt>.  It compiles the following libraries from the
-FreeType 2.5.4 sources:</p>
+FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-freetype254.lib     - release build
-freetype254d.lib    - debug build
-freetype254ST.lib   - release build; single threaded
-freetype254STd.lib  - debug build;   single threaded
-freetype254MT.lib   - release build; multi-threaded
-freetype254MTd.lib  - debug build;   multi-threaded</pre>
+freetype255.lib     - release build
+freetype255d.lib    - debug build
+freetype255ST.lib   - release build; single threaded
+freetype255STd.lib  - debug build;   single threaded
+freetype255MT.lib   - release build; multi-threaded
+freetype255MTd.lib  - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Both Win32 and x64 builds are supported.</p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.dsp b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.dsp
index 360046eaab7..6ccae36bd4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.dsp
@@ -7,23 +7,23 @@
 CFG=freetype - Win32 Debug Singlethreaded
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "freetype.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype254.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype254ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,10 +177,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.dsw b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.sln b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.sln
index 470d4fa3034..470d4fa3034 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.vcproj
index f5c5b50797c..43b11dffc5e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/index.html
index 4a0b332922e..751d7ad0be4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualc/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualc/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.4 sources:</p>
+compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.dsp b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.dsp
index 360046eaab7..6ccae36bd4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.dsp
@@ -7,23 +7,23 @@
 CFG=freetype - Win32 Debug Singlethreaded
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "freetype.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug Singlethreaded"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug Multithreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Release Multithreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Release Singlethreaded" (based on "Win32 (x86) Static Library")
 !MESSAGE "freetype - Win32 Debug Singlethreaded" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"
 
@@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype254.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype255.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.lib"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"
 
@@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype254ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,10 +177,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype255_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib"
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.dsw b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.vcproj
index 3652f9ce57e..edc307883a8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254.lib"
+				OutputFile="..\..\..\objs\freetype255.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT.lib"
+				OutputFile="..\..\..\objs\freetype255MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST.lib"
+				OutputFile="..\..\..\objs\freetype255ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254_D.lib"
+				OutputFile="..\..\..\objs\freetype255_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254ST_D.lib"
+				OutputFile="..\..\..\objs\freetype255ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype254MT_D.lib"
+				OutputFile="..\..\..\objs\freetype255MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/index.html b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/index.html
index 2a4d4a97f9e..68d15fd25a7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/visualce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/visualce/index.html
@@ -21,14 +21,14 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.5.4 sources:</p>
+It compiles the following libraries from the FreeType 2.5.5 sources:</p>
 
 <ul>
   <pre>
-    freetype254.lib     - release build; single threaded
-    freetype254_D.lib   - debug build;   single threaded
-    freetype254MT.lib   - release build; multi-threaded
-    freetype254MT_D.lib - debug build;   multi-threaded</pre>
+    freetype255.lib     - release build; single threaded
+    freetype255_D.lib   - debug build;   single threaded
+    freetype255MT.lib   - release build; multi-threaded
+    freetype255MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-bcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-bcc.mk
index 87d8ea3c2bb..87d8ea3c2bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-bcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-bccd.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-bccd.mk
index dd21eddac0b..dd21eddac0b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-bccd.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-bccd.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-dev.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-dev.mk
index 3561229473a..3561229473a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-gcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-gcc.mk
index 3bbdd3cc46e..3bbdd3cc46e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-icc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-icc.mk
index 44d26bd6c05..44d26bd6c05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-icc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-icc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-intl.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-intl.mk
index 0f3e22bc3fd..0f3e22bc3fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-intl.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-intl.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-lcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-lcc.mk
index 8bd5b568542..8bd5b568542 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-mingw32.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-mingw32.mk
index b35dbb0c096..b35dbb0c096 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-mingw32.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-mingw32.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-vcc.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-vcc.mk
index 95f76858f85..95f76858f85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-vcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-vcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-wat.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-wat.mk
index e1ddf66e351..e1ddf66e351 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/w32-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/w32-wat.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/win32-def.mk b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/win32-def.mk
index 61af5df0f95..61af5df0f95 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/builds/windows/win32-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/builds/windows/win32-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/configure b/Build/source/libs/freetype2/freetype-2.5.5/configure
index 4d8a945a5a9..4d8a945a5a9 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/configure
+++ b/Build/source/libs/freetype2/freetype-2.5.5/configure
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/devel/ft2build.h b/Build/source/libs/freetype2/freetype-2.5.5/devel/ft2build.h
index 6cc34b77b42..6cc34b77b42 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/devel/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/devel/ft2build.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/devel/ftoption.h b/Build/source/libs/freetype2/freetype-2.5.5/devel/ftoption.h
index 10027bb5441..10027bb5441 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/devel/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/devel/ftoption.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/CHANGES b/Build/source/libs/freetype2/freetype-2.5.5/docs/CHANGES
index 94420f0952a..bbc31104afc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/CHANGES
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/CHANGES
@@ -1,4 +1,14 @@
 
+CHANGES BETWEEN 2.5.4 and 2.5.5
+
+  I. IMPORTANT BUG FIXES
+
+    - Handling of  uncompressed PCF files works again (bug  introduced
+      in version 2.5.4).
+
+
+======================================================================
+
 CHANGES BETWEEN 2.5.3 and 2.5.4
 
   I. IMPORTANT BUG FIXES
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/CMAKE b/Build/source/libs/freetype2/freetype-2.5.5/docs/CMAKE
index 31237ae1516..31237ae1516 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/CMAKE
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/CMAKE
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/CUSTOMIZE b/Build/source/libs/freetype2/freetype-2.5.5/docs/CUSTOMIZE
index dfadb4658d8..dfadb4658d8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/CUSTOMIZE
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/CUSTOMIZE
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/DEBUG b/Build/source/libs/freetype2/freetype-2.5.5/docs/DEBUG
index d8c79d187a5..d8c79d187a5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/DEBUG
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/DEBUG
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/FTL.TXT b/Build/source/libs/freetype2/freetype-2.5.5/docs/FTL.TXT
index bbaba33f47d..bbaba33f47d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/FTL.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/FTL.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/GPLv2.TXT b/Build/source/libs/freetype2/freetype-2.5.5/docs/GPLv2.TXT
index b2fe7b6af35..b2fe7b6af35 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/GPLv2.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/GPLv2.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL
index 456b76d2b55..456b76d2b55 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.ANY b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.ANY
index 8aa394f1fc5..8aa394f1fc5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.ANY
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.ANY
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.CROSS b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.CROSS
index d372adcfefa..d372adcfefa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.CROSS
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.CROSS
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.GNU b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.GNU
index 3b9e0a2df0c..3b9e0a2df0c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.GNU
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.GNU
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.MAC b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.MAC
index 42bb0d8637c..42bb0d8637c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.MAC
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.MAC
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.UNIX b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.UNIX
index 251c749a35d..251c749a35d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.UNIX
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.UNIX
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.VMS b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.VMS
index 994e566883f..994e566883f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/INSTALL.VMS
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/INSTALL.VMS
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/LICENSE.TXT b/Build/source/libs/freetype2/freetype-2.5.5/docs/LICENSE.TXT
index 99dc342d764..99dc342d764 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/LICENSE.TXT
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/LICENSE.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/MAKEPP b/Build/source/libs/freetype2/freetype-2.5.5/docs/MAKEPP
index 58eaf551df8..58eaf551df8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/MAKEPP
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/MAKEPP
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/PROBLEMS b/Build/source/libs/freetype2/freetype-2.5.5/docs/PROBLEMS
index 40bdc35a676..40bdc35a676 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/PROBLEMS
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/PROBLEMS
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/TODO b/Build/source/libs/freetype2/freetype-2.5.5/docs/TODO
index be60d6f040a..be60d6f040a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/TODO
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/TODO
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/VERSION.DLL b/Build/source/libs/freetype2/freetype-2.5.5/docs/VERSION.DLL
index 5564acf85d3..dd492619583 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/VERSION.DLL
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/VERSION.DLL
@@ -52,6 +52,7 @@ on _most_ systems, but not all of them:
 
     release     libtool     so
   -------------------------------
+     2.5.5      17.4.11   6.11.4
      2.5.4      17.3.11   6.11.3
      2.5.3      17.2.11   6.11.2
      2.5.2      17.1.11   6.11.1
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/formats.txt b/Build/source/libs/freetype2/freetype-2.5.5/docs/formats.txt
index aed885c89c2..aed885c89c2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/formats.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/formats.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/freetype-config.1 b/Build/source/libs/freetype2/freetype-2.5.5/docs/freetype-config.1
index 61aa722e397..7b4a118f39f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/freetype-config.1
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/freetype-config.1
@@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.4"
+.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.5"
 .
 .
 .SH NAME
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/raster.txt b/Build/source/libs/freetype2/freetype-2.5.5/docs/raster.txt
index 95d9e24010b..95d9e24010b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/raster.txt
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/raster.txt
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/README b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/README
index 51b04d6f151..51b04d6f151 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-auto_hinter.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-auto_hinter.html
index 679acdf9b9c..71dede4194a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-auto_hinter.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-auto_hinter.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>The auto-hinter</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-base_interface.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-base_interface.html
index 45377402663..4547b6f1c91 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-base_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-base_interface.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Base Interface</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-basic_types.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-basic_types.html
index eaae10bff76..e39573d5b60 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-basic_types.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-basic_types.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Basic Data Types</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bdf_fonts.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bdf_fonts.html
index 7515f87bfd7..daf2307c04a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bdf_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bdf_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>BDF and PCF Files</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bitmap_handling.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bitmap_handling.html
index c6781d9147b..a0eec744f33 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bitmap_handling.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bitmap_handling.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Bitmap Handling</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bzip2.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bzip2.html
index 2abe7a460f6..dc33973b19f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-bzip2.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-bzip2.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>BZIP2 Streams</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cache_subsystem.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cache_subsystem.html
index a16c07d0ad5..18650de7edc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cache_subsystem.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cache_subsystem.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Cache Sub-System</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cff_driver.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cff_driver.html
index 1f9be08609c..f1de5661a68 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cff_driver.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cff_driver.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>The CFF driver</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cid_fonts.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cid_fonts.html
index d6176a47e45..cb0b506fe71 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-cid_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-cid_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>CID Fonts</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-computations.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-computations.html
index 9938bc686ce..a7771ef41ba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-computations.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-computations.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Computations</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-font_formats.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-font_formats.html
index 05d06e41cdc..508cee2a5a7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-font_formats.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-font_formats.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Font Formats</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gasp_table.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gasp_table.html
index b2edb345373..3b56119a10a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gasp_table.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gasp_table.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Gasp Table</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_management.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_management.html
index f91fce9ffdf..017db1f1c24 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Glyph Management</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_stroker.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_stroker.html
index 24e6405b941..d5daa46c320 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_stroker.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_stroker.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Glyph Stroker</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_variants.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_variants.html
index c8c9dc73413..a19db11ea57 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-glyph_variants.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-glyph_variants.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Glyph Variants</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gx_validation.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gx_validation.html
index 519a7c4e1c6..ff2eef6acf6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gx_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gx_validation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>TrueTypeGX/AAT Validation</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gzip.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gzip.html
index 89b9c729fa1..c7e5a84f3e6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-gzip.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-gzip.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>GZIP Streams</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-header_file_macros.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-header_file_macros.html
index 800161078be..35954db9a24 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-header_file_macros.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-header_file_macros.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Header File Macros</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-header_inclusion.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-header_inclusion.html
index 4eb4651fab9..4171decb003 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-header_inclusion.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-header_inclusion.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>FreeType's header inclusion scheme</h1>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-incremental.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-incremental.html
index 651f323b6a5..26225c255a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-incremental.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-incremental.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Incremental Loading</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-index.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-index.html
index e265e7835d3..2e16e94a055 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-index.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-index.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <table class="index">
 <tr><td><a href="ft2-bdf_fonts.html#BDF_PropertyType">BDF_PROPERTY_TYPE_ATOM</a></td><td><a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilterWeights">FT_Library_SetLcdFilterWeights</a></td><td><a href="ft2-header_file_macros.html#FT_SYSTEM_H">FT_SYSTEM_H</a></td></tr>
@@ -377,5 +377,5 @@
 <hr>
 <table class="index-toc-link"><tr><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
 
-<div class="timestamp">generated on Sat Dec  6 18:53:39 2014</div></body>
+<div class="timestamp">generated on Tue Dec 30 21:42:54 2014</div></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-lcd_filtering.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-lcd_filtering.html
index 83d8c34ad34..768fbf02c21 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-lcd_filtering.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-lcd_filtering.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>LCD Filtering</h1>
 <h2>Synopsis</h2>
@@ -112,7 +112,7 @@
 
 <p>The <a href="ft2-lcd_filtering.html#FT_Library_SetLcdFilter">FT_Library_SetLcdFilter</a> API can be used to specify a low-pass filter, which is then applied to LCD-optimized bitmaps generated through <a href="ft2-base_interface.html#FT_Render_Glyph">FT_Render_Glyph</a>. This is useful to reduce color fringes that would occur with unfiltered rendering.</p>
 <p>Note that no filter is active by default, and that this function is <b>not</b> implemented in default builds of the library. You need to #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING in your &lsquo;ftoption.h&rsquo; file in order to activate it.</p>
-<p>FreeType generates alpha coverage maps, which are linear by nature. For instance, the value 0x80 in bitmap representation means that (within numerical precision) 0x80/0xff fraction of that pixel is covered by the glyph's outline. The blending function for placing text over a background is</p>
+<p>FreeType generates alpha coverage maps, which are linear by nature. For instance, the value 0x80 in bitmap representation means that (within numerical precision) 0x80/0xFF fraction of that pixel is covered by the glyph's outline. The blending function for placing text over a background is</p>
 <pre class="colored">
   dst = alpha * src + (1 - alpha) * dst    ,
 </pre>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-list_processing.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-list_processing.html
index 972a103b36d..2617e504fbf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-list_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-list_processing.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>List Processing</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-lzw.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-lzw.html
index a87d60afdbd..5f500e643dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-lzw.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-lzw.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>LZW Streams</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-mac_specific.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-mac_specific.html
index 27689ce6279..ca66af63b8b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-mac_specific.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-mac_specific.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Mac Specific Interface</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-module_management.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-module_management.html
index 20da2c9170a..a836715e2a5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-module_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-module_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Module Management</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-multiple_masters.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-multiple_masters.html
index 1a0ffbb0ab6..ba5115b812f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-multiple_masters.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-multiple_masters.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Multiple Masters</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-ot_validation.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-ot_validation.html
index f2afad43480..a4988e183b3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-ot_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-ot_validation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>OpenType Validation</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-outline_processing.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-outline_processing.html
index a08da1cac72..323efc9162f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-outline_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-outline_processing.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Outline Processing</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-pfr_fonts.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-pfr_fonts.html
index 7fe83922cfa..8f3cb8ab113 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-pfr_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-pfr_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>PFR Fonts</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-quick_advance.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-quick_advance.html
index fc88a6752bd..4cffbf8374f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-quick_advance.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-quick_advance.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Quick retrieval of advance values</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-raster.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-raster.html
index 2dba6ec3cae..3d4062124ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-raster.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-raster.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Scanline Converter</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-sfnt_names.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-sfnt_names.html
index 40b2449cd7f..3bd918d3e8d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-sfnt_names.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-sfnt_names.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>SFNT Names</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-sizes_management.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-sizes_management.html
index 703dd6cd367..50563eb5a4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-sizes_management.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-sizes_management.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Size Management</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-system_interface.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-system_interface.html
index f1d11919aa3..139cbc7f037 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-system_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-system_interface.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>System Interface</h1>
 <h2>Synopsis</h2>
@@ -258,6 +258,9 @@
 
 <p>A handle to an input stream.</p>
 
+<h4>also</h4>
+<p>See <a href="ft2-system_interface.html#FT_StreamRec">FT_StreamRec</a> for the publicly accessible fields of a given stream object.</p>
+
 <hr>
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div>
 
@@ -367,6 +370,7 @@
 </td></tr>
 <tr><td class="val" id="size">size</td><td class="desc">
 <p>The stream size in bytes.</p>
+<p>In case of compressed streams where the size is unknown before actually doing the decompression, the value is set to 0x7FFFFFFF. (Note that this size value can occur for normal streams also; it is thus just a hint.)</p>
 </td></tr>
 <tr><td class="val" id="pos">pos</td><td class="desc">
 <p>The current position within the stream.</p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-toc.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-toc.html
index 7f5b4de88c2..61098164d19 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-toc.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-toc.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Table of Contents</h1>
 <div class="section">
@@ -266,5 +266,5 @@
 <hr>
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td></tr></table>
 
-<div class="timestamp">generated on Sat Dec  6 18:53:39 2014</div></body>
+<div class="timestamp">generated on Tue Dec 30 21:42:54 2014</div></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-truetype_engine.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-truetype_engine.html
index 6764604c316..d0c467bd45a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-truetype_engine.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-truetype_engine.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>The TrueType Engine</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-truetype_tables.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-truetype_tables.html
index 5a174bd2c4e..9c63d67dac7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-truetype_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-truetype_tables.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>TrueType Tables</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-tt_driver.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-tt_driver.html
index de709918f23..5d71829e4c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-tt_driver.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-tt_driver.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>The TrueType driver</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-type1_tables.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-type1_tables.html
index 9dae39599db..71355a9d846 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-type1_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-type1_tables.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Type 1 Tables</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-user_allocation.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-user_allocation.html
index 5a6390c6a9f..52bd6ec2246 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-user_allocation.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-user_allocation.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>User allocation</h1>
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-version.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-version.html
index 901c0c493ca..89e3dac9030 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-version.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-version.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>FreeType Version</h1>
 <h2>Synopsis</h2>
@@ -224,7 +224,7 @@
 <pre>
 #define <a href="ft2-version.html#FREETYPE_MAJOR">FREETYPE_MAJOR</a>  2
 #define <a href="ft2-version.html#FREETYPE_MINOR">FREETYPE_MINOR</a>  5
-#define <a href="ft2-version.html#FREETYPE_PATCH">FREETYPE_PATCH</a>  4
+#define <a href="ft2-version.html#FREETYPE_PATCH">FREETYPE_PATCH</a>  5
 </pre>
 
 <p>These three macros identify the FreeType source code version. Use <a href="ft2-version.html#FT_Library_Version">FT_Library_Version</a> to access them at runtime.</p>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-winfnt_fonts.html b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-winfnt_fonts.html
index c85b9d623c8..a17e350d276 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/reference/ft2-winfnt_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/reference/ft2-winfnt_fonts.html
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>FreeType-2.5.4 API Reference</title>
+<title>FreeType-2.5.5 API Reference</title>
 <style type="text/css">
   a:link { color: #0000EF; }
   a:visited { color: #51188E; }
@@ -100,7 +100,7 @@
 <body>
 
 <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table>
-<h1>FreeType-2.5.4 API Reference</h1>
+<h1>FreeType-2.5.5 API Reference</h1>
 
 <h1>Window FNT Files</h1>
 <h2>Synopsis</h2>
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/docs/release b/Build/source/libs/freetype2/freetype-2.5.5/docs/release
index cf1f643d616..98f16cd356c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/docs/release
+++ b/Build/source/libs/freetype2/freetype-2.5.5/docs/release
@@ -41,7 +41,8 @@ How to prepare a new release
 . Run  src/tools/chktrcmp.py  and check  that there  are no  undefined
   trace_XXXX macros.
 
-. Tag the git repositories (freetype2, freetype2-demos) with
+. After pushing the new release,  tag the git repositories (freetype2,
+  freetype2-demos) with
 
     git tag VER-<version> -m "" -u <committer>
 
@@ -188,7 +189,7 @@ How to prepare a new release
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2005-2007, 2009, 2011-2013 by
+Copyright 2003, 2005-2007, 2009, 2011-2014 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftconfig.h
index 22d70fd35be..22d70fd35be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftconfig.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftheader.h b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftheader.h
index b6236299210..b6236299210 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftheader.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftheader.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftmodule.h
index 76d271a74b9..76d271a74b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftoption.h b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftoption.h
index 2b0b67e7af3..2b0b67e7af3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftoption.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftstdlib.h b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftstdlib.h
index b940efc4273..b940efc4273 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/config/ftstdlib.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/config/ftstdlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/freetype.h b/Build/source/libs/freetype2/freetype-2.5.5/include/freetype.h
index efbd13ad835..27fd44bfc23 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/freetype.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/freetype.h
@@ -3937,7 +3937,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  5
-#define FREETYPE_PATCH  4
+#define FREETYPE_PATCH  5
 
 
   /*************************************************************************/
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ft2build.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ft2build.h
index 6f8eb7f3731..6f8eb7f3731 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ft2build.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftadvanc.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftadvanc.h
index 955f93fa16c..955f93fa16c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftadvanc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftadvanc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftautoh.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftautoh.h
index 59191abbfe4..59191abbfe4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftautoh.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftautoh.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbbox.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbbox.h
index d6800e240fc..d6800e240fc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbbox.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbbox.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbdf.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbdf.h
index 6d262e4141a..6d262e4141a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbitmap.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbitmap.h
index eae716904b4..eae716904b4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbitmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbitmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbzip2.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbzip2.h
index 4dce161fd69..4dce161fd69 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftbzip2.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftbzip2.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcache.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcache.h
index a30e925cc56..a30e925cc56 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcache.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcache.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcffdrv.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcffdrv.h
index f7031bc8832..f7031bc8832 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcffdrv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcffdrv.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftchapters.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftchapters.h
index d333761c81b..d333761c81b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftchapters.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftchapters.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcid.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcid.h
index 17550d87b5c..17550d87b5c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftcid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftcid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/fterrdef.h b/Build/source/libs/freetype2/freetype-2.5.5/include/fterrdef.h
index 99b2fadec6d..99b2fadec6d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/fterrdef.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/fterrdef.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/fterrors.h b/Build/source/libs/freetype2/freetype-2.5.5/include/fterrors.h
index 0fa3e4dce19..0fa3e4dce19 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/fterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/fterrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgasp.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgasp.h
index 3f3d7654678..3f3d7654678 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgasp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgasp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftglyph.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftglyph.h
index 15fa6a99505..15fa6a99505 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftglyph.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgxval.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgxval.h
index 88c3d937503..88c3d937503 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgxval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgzip.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgzip.h
index eb346c6dc78..eb346c6dc78 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftgzip.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftgzip.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftimage.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftimage.h
index 2f7ca2aaf55..2f7ca2aaf55 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftimage.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftimage.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftincrem.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftincrem.h
index 4c0246c5df4..4c0246c5df4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftincrem.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftincrem.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlcdfil.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlcdfil.h
index 39206f01927..e8679c1a3ff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlcdfil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlcdfil.h
@@ -5,7 +5,7 @@
 /*    FreeType API for color filtering of subpixel bitmap glyphs           */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2006-2008, 2010, 2013 by                                     */
+/*  Copyright 2006-2008, 2010, 2013, 2014 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -56,7 +56,7 @@ FT_BEGIN_HEADER
    *
    *   FreeType generates alpha coverage maps, which are linear by nature.
    *   For instance, the value 0x80 in bitmap representation means that
-   *   (within numerical precision) 0x80/0xff fraction of that pixel is
+   *   (within numerical precision) 0x80/0xFF fraction of that pixel is
    *   covered by the glyph's outline.  The blending function for placing
    *   text over a background is
    *
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlist.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlist.h
index 9950a279971..9950a279971 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlist.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlist.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlzw.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlzw.h
index 857c0c52bbc..857c0c52bbc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftlzw.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftlzw.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmac.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmac.h
index 42874fe6fc1..42874fe6fc1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmac.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmac.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmm.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmm.h
index 2dcfd678df1..2dcfd678df1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmodapi.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmodapi.h
index 980f15d3de0..980f15d3de0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmodapi.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmodapi.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmoderr.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmoderr.h
index 5a27db151a3..5a27db151a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftmoderr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftmoderr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftotval.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftotval.h
index 75ba03ee8e7..75ba03ee8e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftotval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftotval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftoutln.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftoutln.h
index d3b8fbd2658..d3b8fbd2658 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftoutln.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftoutln.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftpfr.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftpfr.h
index 7d5035396b7..7d5035396b7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftrender.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftrender.h
index e8d36363ca6..e8d36363ca6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftrender.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftrender.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsizes.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsizes.h
index 41670457014..41670457014 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsizes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsizes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsnames.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsnames.h
index 88af440356c..88af440356c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsnames.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsnames.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftstroke.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftstroke.h
index bd311709f34..bd311709f34 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftstroke.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftstroke.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsynth.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsynth.h
index d0ea730874f..d0ea730874f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsynth.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsynth.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsystem.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsystem.h
index 2c95cbbda30..7436ed2678a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftsystem.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftsystem.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType low-level system interface definition (specification).      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2010 by                               */
+/*  Copyright 1996-2001, 2002, 2005, 2010, 2014 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -192,6 +192,10 @@ FT_BEGIN_HEADER
    * @description:
    *   A handle to an input stream.
    *
+   * @also:
+   *   See @FT_StreamRec for the publicly accessible fields of a given
+   *   stream object.
+   *
    */
   typedef struct FT_StreamRec_*  FT_Stream;
 
@@ -285,6 +289,11 @@ FT_BEGIN_HEADER
    *   size ::
    *     The stream size in bytes.
    *
+   *     In case of compressed streams where the size is unknown before
+   *     actually doing the decompression, the value is set to 0x7FFFFFFF. 
+   *     (Note that this size value can occur for normal streams also; it is
+   *     thus just a hint.)
+   *
    *   pos ::
    *     The current position within the stream.
    *
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/fttrigon.h b/Build/source/libs/freetype2/freetype-2.5.5/include/fttrigon.h
index 9c7b54324e4..9c7b54324e4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/fttrigon.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/fttrigon.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftttdrv.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftttdrv.h
index 358841397ca..358841397ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftttdrv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftttdrv.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/fttypes.h b/Build/source/libs/freetype2/freetype-2.5.5/include/fttypes.h
index 2c01e8737ca..2c01e8737ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/fttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/fttypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftwinfnt.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftwinfnt.h
index 50261581a21..50261581a21 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftwinfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ftxf86.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ftxf86.h
index 89d1993e1ea..89d1993e1ea 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ftxf86.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ftxf86.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/autohint.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/autohint.h
index 545de938c27..545de938c27 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/autohint.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/autohint.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftcalc.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftcalc.h
index 14ec37b9cd1..14ec37b9cd1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftcalc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftcalc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftdebug.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftdebug.h
index 58a3916d7e5..58a3916d7e5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftdebug.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftdebug.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftdriver.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftdriver.h
index 940218e62d5..940218e62d5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftgloadr.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftgloadr.h
index f70774f74eb..f70774f74eb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftgloadr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftgloadr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftmemory.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftmemory.h
index 3d51aeec69f..3d51aeec69f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftmemory.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftmemory.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftobjs.h
index b45a5ed814f..b45a5ed814f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftpic.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftpic.h
index 485ce7a24e7..485ce7a24e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftrfork.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftrfork.h
index d750cbefd83..d750cbefd83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftrfork.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftrfork.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftserv.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftserv.h
index 1203ec8121a..1203ec8121a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftserv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftserv.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftstream.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftstream.h
index 26618583209..26618583209 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftstream.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftstream.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/fttrace.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/fttrace.h
index d5253db78a3..d5253db78a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/fttrace.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/fttrace.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftvalid.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftvalid.h
index 12ad03685ad..c281b1424a5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/ftvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/ftvalid.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType validation support (specification).                         */
 /*                                                                         */
-/*  Copyright 2004, 2013 by                                                */
+/*  Copyright 2004, 2013, 2014 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -87,13 +87,13 @@ FT_BEGIN_HEADER
   /* validator structure */
   typedef struct  FT_ValidatorRec_
   {
+    ft_jmp_buf          jump_buffer; /* used for exception handling      */
+
     const FT_Byte*      base;        /* address of table in memory       */
     const FT_Byte*      limit;       /* `base' + sizeof(table) in memory */
     FT_ValidationLevel  level;       /* validation level                 */
     FT_Error            error;       /* error returned. 0 means success  */
 
-    ft_jmp_buf          jump_buffer; /* used for exception handling      */
-
   } FT_ValidatorRec;
 
 #if defined( _MSC_VER )
@@ -126,31 +126,29 @@ FT_BEGIN_HEADER
   /* Calls ft_validate_error.  Assumes that the `valid' local variable */
   /* holds a pointer to the current validator object.                  */
   /*                                                                   */
-  /* Use preprocessor prescan to pass FT_ERR_PREFIX.                   */
-  /*                                                                   */
-#define FT_INVALID( _prefix, _error )  FT_INVALID_( _prefix, _error )
-#define FT_INVALID_( _prefix, _error ) \
-          ft_validator_error( valid, _prefix ## _error )
+#define FT_INVALID( _error )  FT_INVALID_( _error )
+#define FT_INVALID_( _error ) \
+          ft_validator_error( valid, FT_THROW( _error ) )
 
   /* called when a broken table is detected */
 #define FT_INVALID_TOO_SHORT \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+          FT_INVALID( Invalid_Table )
 
   /* called when an invalid offset is detected */
 #define FT_INVALID_OFFSET \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Offset )
+          FT_INVALID( Invalid_Offset )
 
   /* called when an invalid format/value is detected */
 #define FT_INVALID_FORMAT \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+          FT_INVALID( Invalid_Table )
 
   /* called when an invalid glyph index is detected */
 #define FT_INVALID_GLYPH_ID \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Glyph_Index )
+          FT_INVALID( Invalid_Glyph_Index )
 
   /* called when an invalid field value is detected */
 #define FT_INVALID_DATA \
-          FT_INVALID( FT_ERR_PREFIX, Invalid_Table )
+          FT_INVALID( Invalid_Table )
 
 
 FT_END_HEADER
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/internal.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/internal.h
index e0ddb06b708..e0ddb06b708 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/internal.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/internal.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/psaux.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/psaux.h
index e903114f84f..e903114f84f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/psaux.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/psaux.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/pshints.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/pshints.h
index f05ea6863a9..f05ea6863a9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/pshints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/pshints.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svbdf.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svbdf.h
index 0974752a797..0974752a797 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svcid.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svcid.h
index 6be3f9374da..6be3f9374da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svcid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svcid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svgldict.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svgldict.h
index 1d125347253..1d125347253 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svgldict.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svgldict.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svgxval.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svgxval.h
index 2cdab506551..2cdab506551 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svgxval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svkern.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svkern.h
index 1488adf493b..1488adf493b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svkern.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svmm.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svmm.h
index b08a663d667..b08a663d667 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svmm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svmm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svotval.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svotval.h
index 970bbd57593..970bbd57593 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svotval.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svotval.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpfr.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpfr.h
index 462786f9ce9..462786f9ce9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpostnm.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpostnm.h
index a76b4fe057a..a76b4fe057a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpostnm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpostnm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svprop.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svprop.h
index 22da0bbc69d..22da0bbc69d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svprop.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svprop.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpscmap.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpscmap.h
index 030948ea64f..030948ea64f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpscmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpscmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpsinfo.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpsinfo.h
index 4bfb506711b..4bfb506711b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svpsinfo.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svpsinfo.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svsfnt.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svsfnt.h
index d3835aa1c2a..d3835aa1c2a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svsfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svsfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svttcmap.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svttcmap.h
index 4370f4c2d82..4370f4c2d82 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svttcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svtteng.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svtteng.h
index 58e02a6f9dd..58e02a6f9dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svtteng.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svtteng.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svttglyf.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svttglyf.h
index 369eb8421b7..369eb8421b7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svttglyf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svttglyf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svwinfnt.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svwinfnt.h
index 57f7765d92f..57f7765d92f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svwinfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svxf86nm.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svxf86nm.h
index ca5d884a83c..ca5d884a83c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/services/svxf86nm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/services/svxf86nm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/sfnt.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/sfnt.h
index d558e869bda..d558e869bda 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/sfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/sfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/t1types.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/t1types.h
index e20237c14dc..e20237c14dc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/t1types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/t1types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/tttypes.h b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/tttypes.h
index ad302b87c88..ad302b87c88 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/internal/tttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/internal/tttypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/t1tables.h b/Build/source/libs/freetype2/freetype-2.5.5/include/t1tables.h
index 61aefdd5413..61aefdd5413 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/t1tables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/t1tables.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ttnameid.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ttnameid.h
index 9711d1d9475..e65b5581274 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ttnameid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ttnameid.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType name ID definitions (specification only).                   */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2012, 2013 by                          */
+/*  Copyright 1996-2004, 2006-2008, 2012-2014 by                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -470,26 +470,26 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_ARABIC_GENERAL                    0x0001
 #define TT_MS_LANGID_ARABIC_SAUDI_ARABIA               0x0401
 #define TT_MS_LANGID_ARABIC_IRAQ                       0x0801
-#define TT_MS_LANGID_ARABIC_EGYPT                      0x0c01
+#define TT_MS_LANGID_ARABIC_EGYPT                      0x0C01
 #define TT_MS_LANGID_ARABIC_LIBYA                      0x1001
 #define TT_MS_LANGID_ARABIC_ALGERIA                    0x1401
 #define TT_MS_LANGID_ARABIC_MOROCCO                    0x1801
-#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1c01
+#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1C01
 #define TT_MS_LANGID_ARABIC_OMAN                       0x2001
 #define TT_MS_LANGID_ARABIC_YEMEN                      0x2401
 #define TT_MS_LANGID_ARABIC_SYRIA                      0x2801
-#define TT_MS_LANGID_ARABIC_JORDAN                     0x2c01
+#define TT_MS_LANGID_ARABIC_JORDAN                     0x2C01
 #define TT_MS_LANGID_ARABIC_LEBANON                    0x3001
 #define TT_MS_LANGID_ARABIC_KUWAIT                     0x3401
 #define TT_MS_LANGID_ARABIC_UAE                        0x3801
-#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3c01
+#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3C01
 #define TT_MS_LANGID_ARABIC_QATAR                      0x4001
 #define TT_MS_LANGID_BULGARIAN_BULGARIA                0x0402
 #define TT_MS_LANGID_CATALAN_SPAIN                     0x0403
 #define TT_MS_LANGID_CHINESE_GENERAL                   0x0004
 #define TT_MS_LANGID_CHINESE_TAIWAN                    0x0404
 #define TT_MS_LANGID_CHINESE_PRC                       0x0804
-#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0c04
+#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0C04
 #define TT_MS_LANGID_CHINESE_SINGAPORE                 0x1004
 
 #if 1  /* this looks like the correct value */
@@ -507,7 +507,7 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_DANISH_DENMARK                    0x0406
 #define TT_MS_LANGID_GERMAN_GERMANY                    0x0407
 #define TT_MS_LANGID_GERMAN_SWITZERLAND                0x0807
-#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0c07
+#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0C07
 #define TT_MS_LANGID_GERMAN_LUXEMBOURG                 0x1007
 #define TT_MS_LANGID_GERMAN_LIECHTENSTEI               0x1407
 #define TT_MS_LANGID_GREEK_GREECE                      0x0408
@@ -520,69 +520,69 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
 #define TT_MS_LANGID_ENGLISH_UNITED_STATES             0x0409
 #define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM            0x0809
-#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0c09
+#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0C09
 #define TT_MS_LANGID_ENGLISH_CANADA                    0x1009
 #define TT_MS_LANGID_ENGLISH_NEW_ZEALAND               0x1409
 #define TT_MS_LANGID_ENGLISH_IRELAND                   0x1809
-#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1c09
+#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1C09
 #define TT_MS_LANGID_ENGLISH_JAMAICA                   0x2009
 #define TT_MS_LANGID_ENGLISH_CARIBBEAN                 0x2409
 #define TT_MS_LANGID_ENGLISH_BELIZE                    0x2809
-#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2c09
+#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2C09
 #define TT_MS_LANGID_ENGLISH_ZIMBABWE                  0x3009
 #define TT_MS_LANGID_ENGLISH_PHILIPPINES               0x3409
 #define TT_MS_LANGID_ENGLISH_INDONESIA                 0x3809
-#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3c09
+#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3C09
 #define TT_MS_LANGID_ENGLISH_INDIA                     0x4009
 #define TT_MS_LANGID_ENGLISH_MALAYSIA                  0x4409
 #define TT_MS_LANGID_ENGLISH_SINGAPORE                 0x4809
-#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040a
-#define TT_MS_LANGID_SPANISH_MEXICO                    0x080a
-#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0c0a
-#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100a
-#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140a
-#define TT_MS_LANGID_SPANISH_PANAMA                    0x180a
-#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1c0a
-#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200a
-#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240a
-#define TT_MS_LANGID_SPANISH_PERU                      0x280a
-#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2c0a
-#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300a
-#define TT_MS_LANGID_SPANISH_CHILE                     0x340a
-#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380a
-#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3c0a
-#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400a
-#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440a
-#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480a
-#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4c0a
-#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500a
-#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540a
+#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040A
+#define TT_MS_LANGID_SPANISH_MEXICO                    0x080A
+#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0C0A
+#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100A
+#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140A
+#define TT_MS_LANGID_SPANISH_PANAMA                    0x180A
+#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1C0A
+#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200A
+#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240A
+#define TT_MS_LANGID_SPANISH_PERU                      0x280A
+#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2C0A
+#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300A
+#define TT_MS_LANGID_SPANISH_CHILE                     0x340A
+#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380A
+#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3C0A
+#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400A
+#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440A
+#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480A
+#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4C0A
+#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500A
+#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540A
   /* The following ID blatantly violate MS specs by using a */
   /* sublanguage > 0x1F.                                    */
-#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40aU
-#define TT_MS_LANGID_FINNISH_FINLAND                   0x040b
-#define TT_MS_LANGID_FRENCH_FRANCE                     0x040c
-#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080c
-#define TT_MS_LANGID_FRENCH_CANADA                     0x0c0c
-#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100c
-#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140c
-#define TT_MS_LANGID_FRENCH_MONACO                     0x180c
-#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1c0c
-#define TT_MS_LANGID_FRENCH_REUNION                    0x200c
-#define TT_MS_LANGID_FRENCH_CONGO                      0x240c
+#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40AU
+#define TT_MS_LANGID_FINNISH_FINLAND                   0x040B
+#define TT_MS_LANGID_FRENCH_FRANCE                     0x040C
+#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080C
+#define TT_MS_LANGID_FRENCH_CANADA                     0x0C0C
+#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100C
+#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140C
+#define TT_MS_LANGID_FRENCH_MONACO                     0x180C
+#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1C0C
+#define TT_MS_LANGID_FRENCH_REUNION                    0x200C
+#define TT_MS_LANGID_FRENCH_CONGO                      0x240C
   /* which was formerly: */
 #define TT_MS_LANGID_FRENCH_ZAIRE  TT_MS_LANGID_FRENCH_CONGO
-#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280c
-#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2c0c
-#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300c
-#define TT_MS_LANGID_FRENCH_MALI                       0x340c
-#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380c
-#define TT_MS_LANGID_FRENCH_HAITI                      0x3c0c
-  /* and another violation of the spec (see 0xE40aU) */
-#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40cU
-#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040d
-#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040e
-#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040f
+#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280C
+#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2C0C
+#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300C
+#define TT_MS_LANGID_FRENCH_MALI                       0x340C
+#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380C
+#define TT_MS_LANGID_FRENCH_HAITI                      0x3C0C
+  /* and another violation of the spec (see 0xE40AU) */
+#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40CU
+#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040D
+#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040E
+#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040F
 #define TT_MS_LANGID_ITALIAN_ITALY                     0x0410
 #define TT_MS_LANGID_ITALIAN_SWITZERLAND               0x0810
 #define TT_MS_LANGID_JAPANESE_JAPAN                    0x0411
@@ -600,27 +600,27 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA                0x0818
 #define TT_MS_LANGID_RUSSIAN_RUSSIA                    0x0419
 #define TT_MS_LANGID_RUSSIAN_MOLDAVIA                  0x0819
-#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041a
-#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081a
-#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0c1a
+#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041A
+#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081A
+#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0C1A
 
 #if 0  /* this used to be this value, but it looks like we were wrong */
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101a
+#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101A
 #else  /* current sources say */
-#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA       0x101a
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x141a
+#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA       0x101A
+#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x141A
        /* and XPsp2 Platform SDK added (2004-07-26) */
        /* Names are shortened to be significant within 40 chars. */
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN         0x181a
-#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC      0x181a
+#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN         0x181A
+#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC      0x181A
 #endif
 
-#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041b
-#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041c
-#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041d
-#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081d
-#define TT_MS_LANGID_THAI_THAILAND                     0x041e
-#define TT_MS_LANGID_TURKISH_TURKEY                    0x041f
+#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041B
+#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041C
+#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041D
+#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081D
+#define TT_MS_LANGID_THAI_THAILAND                     0x041E
+#define TT_MS_LANGID_TURKISH_TURKEY                    0x041F
 #define TT_MS_LANGID_URDU_PAKISTAN                     0x0420
 #define TT_MS_LANGID_URDU_INDIA                        0x0820
 #define TT_MS_LANGID_INDONESIAN_INDONESIA              0x0421
@@ -633,13 +633,13 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA      0x0827
 #define TT_MS_LANGID_TAJIK_TAJIKISTAN                  0x0428
 #define TT_MS_LANGID_FARSI_IRAN                        0x0429
-#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042a
-#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042b
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042c
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082c
-#define TT_MS_LANGID_BASQUE_SPAIN                      0x042d
-#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042e
-#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042f
+#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042A
+#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042B
+#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042C
+#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082C
+#define TT_MS_LANGID_BASQUE_SPAIN                      0x042D
+#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042E
+#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042F
 #define TT_MS_LANGID_SUTU_SOUTH_AFRICA                 0x0430
 #define TT_MS_LANGID_TSONGA_SOUTH_AFRICA               0x0431
 #define TT_MS_LANGID_TSWANA_SOUTH_AFRICA               0x0432
@@ -650,32 +650,32 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_GEORGIAN_GEORGIA                  0x0437
 #define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS           0x0438
 #define TT_MS_LANGID_HINDI_INDIA                       0x0439
-#define TT_MS_LANGID_MALTESE_MALTA                     0x043a
+#define TT_MS_LANGID_MALTESE_MALTA                     0x043A
   /* Added by XPsp2 Platform SDK (2004-07-26) */
-#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY              0x043b
-#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN              0x083b
-#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND             0x0C3b
-#define TT_MS_LANGID_SAMI_LULE_NORWAY                  0x103b
-#define TT_MS_LANGID_SAMI_LULE_SWEDEN                  0x143b
-#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY              0x183b
-#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN              0x1C3b
-#define TT_MS_LANGID_SAMI_SKOLT_FINLAND                0x203b
-#define TT_MS_LANGID_SAMI_INARI_FINLAND                0x243b
+#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY              0x043B
+#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN              0x083B
+#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND             0x0C3B
+#define TT_MS_LANGID_SAMI_LULE_NORWAY                  0x103B
+#define TT_MS_LANGID_SAMI_LULE_SWEDEN                  0x143B
+#define TT_MS_LANGID_SAMI_SOUTHERN_NORWAY              0x183B
+#define TT_MS_LANGID_SAMI_SOUTHERN_SWEDEN              0x1C3B
+#define TT_MS_LANGID_SAMI_SKOLT_FINLAND                0x203B
+#define TT_MS_LANGID_SAMI_INARI_FINLAND                0x243B
   /* ... and we also keep our old identifier... */
-#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043b
+#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043B
 
 #if 0 /* this seems to be a previous inversion */
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
+#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043C
+#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083C
 #else
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
+#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083C
+#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043C
 #endif
 
-#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043d
-#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043e
-#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083e
-#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043f
+#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043D
+#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043E
+#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083E
+#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043F
 #define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN /* Cyrillic*/ 0x0440
   /* alias declared in Windows 2000 */
 #define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \
@@ -693,12 +693,12 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_GUJARATI_INDIA                    0x0447
 #define TT_MS_LANGID_ORIYA_INDIA                       0x0448
 #define TT_MS_LANGID_TAMIL_INDIA                       0x0449
-#define TT_MS_LANGID_TELUGU_INDIA                      0x044a
-#define TT_MS_LANGID_KANNADA_INDIA                     0x044b
-#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044c
-#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044d
-#define TT_MS_LANGID_MARATHI_INDIA                     0x044e
-#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044f
+#define TT_MS_LANGID_TELUGU_INDIA                      0x044A
+#define TT_MS_LANGID_KANNADA_INDIA                     0x044B
+#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044C
+#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044D
+#define TT_MS_LANGID_MARATHI_INDIA                     0x044E
+#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044F
 #define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450
 #define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN      0x0850
 #define TT_MS_LANGID_TIBETAN_CHINA                     0x0451
@@ -732,13 +732,13 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_SINDHI_INDIA /* Arabic */         0x0459
 #define TT_MS_LANGID_SINDHI_PAKISTAN                   0x0859
   /* Missing a LCID for Sindhi in Devanagari script */
-#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045a
-#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045b
-#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045c
-#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045d
-#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045e
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */    0x045f
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085f
+#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045A
+#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045B
+#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045C
+#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045D
+#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045E
+#define TT_MS_LANGID_TAMAZIGHT_MOROCCO /* Arabic */    0x045F
+#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085F
   /* Missing a LCID for Tifinagh script */
 #define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */    0x0460
   /* Spelled this way by XPsp2 Platform SDK (2004-07-26) */
@@ -758,15 +758,15 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_FULFULDE_NIGERIA                  0x0467
 #define TT_MS_LANGID_HAUSA_NIGERIA                     0x0468
 #define TT_MS_LANGID_IBIBIO_NIGERIA                    0x0469
-#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046a
-#define TT_MS_LANGID_QUECHUA_BOLIVIA                   0x046b
-#define TT_MS_LANGID_QUECHUA_ECUADOR                   0x086b
-#define TT_MS_LANGID_QUECHUA_PERU                      0x0c6b
-#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA               0x046c
+#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046A
+#define TT_MS_LANGID_QUECHUA_BOLIVIA                   0x046B
+#define TT_MS_LANGID_QUECHUA_ECUADOR                   0x086B
+#define TT_MS_LANGID_QUECHUA_PERU                      0x0C6B
+#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA               0x046C
   /* Also spelled by XPsp2 Platform SDK (2004-07-26) */
 #define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \
           TT_MS_LANGID_SEPEDI_SOUTH_AFRICA
-  /* language codes 0x046d, 0x046e and 0x046f are (still) unknown. */
+  /* language codes 0x046D, 0x046E and 0x046F are (still) unknown. */
 #define TT_MS_LANGID_IGBO_NIGERIA                      0x0470
 #define TT_MS_LANGID_KANURI_NIGERIA                    0x0471
 #define TT_MS_LANGID_OROMO_ETHIOPIA                    0x0472
@@ -783,12 +783,12 @@ FT_BEGIN_HEADER
   /*       studying).                                                     */
 #define TT_MS_LANGID_YI_CHINA                          0x0478
 #define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES   0x0479
-  /* language codes from 0x047a to 0x047f are (still) unknown. */
+  /* language codes from 0x047A to 0x047F are (still) unknown. */
 #define TT_MS_LANGID_UIGHUR_CHINA                      0x0480
 #define TT_MS_LANGID_MAORI_NEW_ZEALAND                 0x0481
 
 #if 0  /* not deemed useful for fonts */
-#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE            0x04ff
+#define TT_MS_LANGID_HUMAN_INTERFACE_DEVICE            0x04FF
 #endif
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/tttables.h b/Build/source/libs/freetype2/freetype-2.5.5/include/tttables.h
index e1d8b05e79c..e1d8b05e79c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/tttables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/tttables.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/tttags.h b/Build/source/libs/freetype2/freetype-2.5.5/include/tttags.h
index d59aa19a338..d59aa19a338 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/tttags.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/tttags.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/include/ttunpat.h b/Build/source/libs/freetype2/freetype-2.5.5/include/ttunpat.h
index bf53ddd528f..bf53ddd528f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/include/ttunpat.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/include/ttunpat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/modules.cfg b/Build/source/libs/freetype2/freetype-2.5.5/modules.cfg
index 4e5259445fb..4e5259445fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/modules.cfg
+++ b/Build/source/libs/freetype2/freetype-2.5.5/modules.cfg
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/objs/README b/Build/source/libs/freetype2/freetype-2.5.5/objs/README
index befb63e0492..befb63e0492 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/objs/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/objs/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/Jamfile
index 1cc06858c0f..1cc06858c0f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/Jamfile
index 2714765b5b5..2714765b5b5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afangles.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afangles.c
index f8b095bef30..f8b095bef30 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afangles.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afangles.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afangles.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afangles.h
index f33f9e108e3..f33f9e108e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afangles.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afangles.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.c
index 811226eac3a..811226eac3a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.cin b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.cin
index c6762bec307..c6762bec307 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.cin
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.cin
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.dat b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.dat
index 3f98c13b243..3f98c13b243 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.dat
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.dat
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.h
index a86184191df..a86184191df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.hin b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.hin
index 0b4b48d7fe5..0b4b48d7fe5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afblue.hin
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afblue.hin
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcjk.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcjk.c
index 048e0e7d022..048e0e7d022 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcjk.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcjk.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcjk.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcjk.h
index 4dd4f39177a..4dd4f39177a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcjk.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcjk.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcover.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcover.h
index d5ac96944a3..d5ac96944a3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afcover.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afcover.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afdummy.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afdummy.c
index f8702a109e0..f8702a109e0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afdummy.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afdummy.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afdummy.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afdummy.h
index ad1b0d3abba..ad1b0d3abba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afdummy.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afdummy.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aferrors.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aferrors.h
index 50e1a22dd57..50e1a22dd57 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aferrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afglobal.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afglobal.c
index a54c20c0232..a54c20c0232 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afglobal.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afglobal.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afglobal.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afglobal.h
index 38d8d695285..38d8d695285 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afglobal.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afglobal.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afhints.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afhints.c
index f3cc50f202d..f3cc50f202d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afhints.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afhints.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afhints.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afhints.h
index 92101de7ca9..92101de7ca9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afhints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afhints.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afindic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afindic.c
index 197881b6145..197881b6145 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afindic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afindic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afindic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afindic.h
index 9e13cf7e3fb..9e13cf7e3fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afindic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afindic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin.c
index 36a36896fbf..36a36896fbf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin.h
index 2c0bfca18b2..2c0bfca18b2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin2.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin2.c
index 07590b380cc..07590b380cc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin2.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin2.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin2.h
index b5d252a91ba..b5d252a91ba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aflatin2.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aflatin2.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afloader.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afloader.c
index fb15c87f0e7..fb15c87f0e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afloader.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afloader.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afloader.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afloader.h
index 9601e24fce8..9601e24fce8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afloader.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afloader.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afmodule.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afmodule.c
index 81ece385119..641e03ea2be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afmodule.c
@@ -226,7 +226,7 @@
   af_get_interface( FT_Module    module,
                     const char*  module_interface )
   {
-    /* AF_SERVICES_GET derefers `library' in PIC mode */
+    /* AF_SERVICES_GET dereferences `library' in PIC mode */
 #ifdef FT_CONFIG_OPTION_PIC
     FT_Library  library;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afmodule.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afmodule.h
index 20b7b9f6654..20b7b9f6654 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afpic.c
index cb29fd79fed..cb29fd79fed 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afpic.h
index 9a68b4a5a29..9a68b4a5a29 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afranges.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afranges.c
index b2c504d426f..b2c504d426f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afranges.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afranges.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afranges.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afranges.h
index fe5b2aa7c15..fe5b2aa7c15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afranges.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afranges.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afscript.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afscript.h
index efe8754df81..efe8754df81 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afscript.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afscript.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afstyles.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afstyles.h
index f14d354ccbb..f14d354ccbb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afstyles.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afstyles.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aftypes.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aftypes.h
index 61badd1b8d0..61badd1b8d0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/aftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/aftypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwarp.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwarp.c
index 34a97ffc57c..34a97ffc57c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwarp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwarp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwarp.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwarp.h
index 7343fdd5ef5..7343fdd5ef5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwarp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwarp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwrtsys.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwrtsys.h
index 8aa2ed9e6b8..8aa2ed9e6b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/afwrtsys.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/afwrtsys.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/autofit.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/autofit.c
index e2b9934e4bb..e2b9934e4bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/autofit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/autofit.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/hbshim.c b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/hbshim.c
index a705cef0001..a705cef0001 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/hbshim.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/hbshim.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/hbshim.h b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/hbshim.h
index 02f1513f67d..02f1513f67d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/hbshim.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/hbshim.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/module.mk
index 6ec60912ab7..6ec60912ab7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/rules.mk
index 658f04ea591..658f04ea591 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/autofit/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/autofit/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/base/Jamfile
index 832e8b84249..832e8b84249 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/basepic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/basepic.c
index aeb6fd57770..aeb6fd57770 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/basepic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/basepic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/basepic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/base/basepic.h
index 329d7c8fd61..329d7c8fd61 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/basepic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/basepic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftadvanc.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftadvanc.c
index 18884efe19e..18884efe19e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftadvanc.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftadvanc.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftapi.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftapi.c
index 8914d1f4e99..8914d1f4e99 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftapi.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftapi.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbase.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbase.c
index 5e5d70ec4b6..5e5d70ec4b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbase.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbase.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbase.h b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbase.h
index 51a1db18b84..51a1db18b84 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbase.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbase.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbbox.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbbox.c
index c775d5c8cf0..f9a17517ecf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbbox.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbbox.c
@@ -42,22 +42,22 @@
   } TBBox_Rec;
 
 
-#define FT_UPDATE_BBOX(p, bbox)       \
-  FT_BEGIN_STMNT                      \
-    if ( p->x < bbox.xMin )           \
-      bbox.xMin = p->x;               \
-    if ( p->x > bbox.xMax )           \
-      bbox.xMax = p->x;               \
-    if ( p->y < bbox.yMin )           \
-      bbox.yMin = p->y;               \
-    if ( p->y > bbox.yMax )           \
-      bbox.yMax = p->y;               \
+#define FT_UPDATE_BBOX( p, bbox ) \
+  FT_BEGIN_STMNT                  \
+    if ( p->x < bbox.xMin )       \
+      bbox.xMin = p->x;           \
+    if ( p->x > bbox.xMax )       \
+      bbox.xMax = p->x;           \
+    if ( p->y < bbox.yMin )       \
+      bbox.yMin = p->y;           \
+    if ( p->y > bbox.yMax )       \
+      bbox.yMax = p->y;           \
   FT_END_STMNT
 
-#define CHECK_X( p, bbox )  \
+#define CHECK_X( p, bbox )                         \
           ( p->x < bbox.xMin || p->x > bbox.xMax )
 
-#define CHECK_Y( p, bbox )  \
+#define CHECK_Y( p, bbox )                         \
           ( p->y < bbox.yMin || p->y > bbox.yMax )
 
 
@@ -419,7 +419,8 @@
     return 0;
   }
 
-FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
+
+  FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
     (FT_Outline_MoveTo_Func) BBox_Move_To,
     (FT_Outline_LineTo_Func) BBox_Line_To,
     (FT_Outline_ConicTo_Func)BBox_Conic_To,
@@ -427,14 +428,17 @@ FT_DEFINE_OUTLINE_FUNCS(bbox_interface,
     0, 0
   )
 
+
   /* documentation is in ftbbox.h */
 
   FT_EXPORT_DEF( FT_Error )
   FT_Outline_Get_BBox( FT_Outline*  outline,
                        FT_BBox     *abbox )
   {
-    FT_BBox     cbox = { 0x7FFFFFFF, 0x7FFFFFFF, -0x7FFFFFFF, -0x7FFFFFFF };
-    FT_BBox     bbox = { 0x7FFFFFFF, 0x7FFFFFFF, -0x7FFFFFFF, -0x7FFFFFFF };
+    FT_BBox     cbox = {  0x7FFFFFFFL,  0x7FFFFFFFL,
+                         -0x7FFFFFFFL, -0x7FFFFFFFL };
+    FT_BBox     bbox = {  0x7FFFFFFFL,  0x7FFFFFFFL,
+                         -0x7FFFFFFFL, -0x7FFFFFFFL };
     FT_Vector*  vec;
     FT_UShort   n;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbdf.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbdf.c
index d9dcbad5ede..d9dcbad5ede 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbitmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbitmap.c
index 5dd33a26f1d..19a1a807953 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftbitmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftbitmap.c
@@ -363,7 +363,7 @@
               p[x] |= p[x - 1] << ( 8 - i );
 
 #if 0
-            if ( p[x] == 0xff )
+            if ( p[x] == 0xFF )
               break;
 #endif
           }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftcalc.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftcalc.c
index f3ef8c537ba..57f796803df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftcalc.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftcalc.c
@@ -86,8 +86,8 @@
   FT_EXPORT_DEF( FT_Fixed )
   FT_RoundFix( FT_Fixed  a )
   {
-    return ( a >= 0 ) ?   ( a + 0x8000L ) & ~0xFFFFL
-                      : -((-a + 0x8000L ) & ~0xFFFFL );
+    return a >= 0 ?   ( a + 0x8000L ) & ~0xFFFFL
+                  : -((-a + 0x8000L ) & ~0xFFFFL );
   }
 
 
@@ -96,8 +96,8 @@
   FT_EXPORT_DEF( FT_Fixed )
   FT_CeilFix( FT_Fixed  a )
   {
-    return ( a >= 0 ) ?   ( a + 0xFFFFL ) & ~0xFFFFL
-                      : -((-a + 0xFFFFL ) & ~0xFFFFL );
+    return a >= 0 ?   ( a + 0xFFFFL ) & ~0xFFFFL
+                  : -((-a + 0xFFFFL ) & ~0xFFFFL );
   }
 
 
@@ -106,8 +106,8 @@
   FT_EXPORT_DEF( FT_Fixed )
   FT_FloorFix( FT_Fixed  a )
   {
-    return ( a >= 0 ) ?   a & ~0xFFFFL
-                      : -((-a) & ~0xFFFFL );
+    return a >= 0 ?   a & ~0xFFFFL
+                  : -((-a) & ~0xFFFFL );
   }
 
 #ifndef FT_MSB
@@ -115,30 +115,31 @@
   FT_BASE_DEF ( FT_Int )
   FT_MSB( FT_UInt32 z )
   {
-    FT_Int shift = 0;
+    FT_Int  shift = 0;
+
 
     /* determine msb bit index in `shift' */
-    if ( z & 0xFFFF0000U )
+    if ( z & 0xFFFF0000UL )
     {
       z     >>= 16;
       shift  += 16;
     }
-    if ( z & 0x0000FF00U )
+    if ( z & 0x0000FF00UL )
     {
       z     >>= 8;
       shift  += 8;
     }
-    if ( z & 0x000000F0U )
+    if ( z & 0x000000F0UL )
     {
       z     >>= 4;
       shift  += 4;
     }
-    if ( z & 0x0000000CU )
+    if ( z & 0x0000000CUL )
     {
       z     >>= 2;
       shift  += 2;
     }
-    if ( z & 0x00000002U )
+    if ( z & 0x00000002UL )
     {
    /* z     >>= 1; */
       shift  += 1;
@@ -187,7 +188,7 @@
     d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c
                          : 0x7FFFFFFFL );
 
-    return ( s > 0 ) ? d : -d;
+    return s < 0 ? -d : d;
   }
 
 
@@ -209,7 +210,7 @@
     d = (FT_Long)( c > 0 ? (FT_Int64)a * b / c
                          : 0x7FFFFFFFL );
 
-    return ( s > 0 ) ? d : -d;
+    return s < 0 ? -d : d;
   }
 
 
@@ -234,7 +235,7 @@
 
     c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 );
 
-    return ( s > 0 ) ? c : -c;
+    return s < 0 ? -c : c;
 
 #endif /* FT_MULFIX_ASSEMBLER */
   }
@@ -256,7 +257,7 @@
     q = (FT_Long)( b > 0 ? ( ( (FT_UInt64)a << 16 ) + ( b >> 1 ) ) / b
                          : 0x7FFFFFFFL );
 
-    return ( s < 0 ? -q : q );
+    return s < 0 ? -q : q;
   }
 
 
@@ -438,7 +439,7 @@
                        : ft_div64by32( temp.hi, temp.lo, c );
     }
 
-    return ( s < 0 ? -a : a );
+    return s < 0 ? -a : a;
   }
 
 
@@ -475,7 +476,7 @@
                        : ft_div64by32( temp.hi, temp.lo, c );
     }
 
-    return ( s < 0 ? -a : a );
+    return s < 0 ? -a : a;
   }
 
 
@@ -573,7 +574,7 @@
            ( ( al * ( ub & 0xFFFFUL ) + 0x8000UL ) >> 16 );
     }
 
-    return ( s < 0 ? -(FT_Long)ua : (FT_Long)ua );
+    return s < 0 ? -(FT_Long)ua : (FT_Long)ua;
 
 #endif /* 0 */
 
@@ -620,7 +621,7 @@
       q = (FT_Long)ft_div64by32( temp.hi, temp.lo, b );
     }
 
-    return ( s < 0 ? -q : q );
+    return s < 0 ? -q : q;
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftcid.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftcid.c
index 741879d9220..741879d9220 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftcid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftcid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftdbgmem.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftdbgmem.c
index 6fb86fe77de..6fb86fe77de 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftdbgmem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftdbgmem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftdebug.c
index 39ac6add057..39ac6add057 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftfstype.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftfstype.c
index 6b49ef83718..6b49ef83718 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftfstype.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftfstype.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgasp.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgasp.c
index 8485d29259e..8485d29259e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgasp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgasp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgloadr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgloadr.c
index 3cc5c7a8057..3cc5c7a8057 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgloadr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgloadr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftglyph.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftglyph.c
index ac178c41be0..ac178c41be0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftglyph.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgxval.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgxval.c
index a65f4c879b0..a65f4c879b0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftgxval.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftgxval.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftinit.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftinit.c
index c4c88201a16..c4c88201a16 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftinit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftinit.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftlcdfil.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftlcdfil.c
index d8bcbbf1d22..d8bcbbf1d22 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftlcdfil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftlcdfil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftmac.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftmac.c
index 5301ab44fc0..5301ab44fc0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftmac.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftmm.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftmm.c
index 056680bd609..056680bd609 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftmm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftmm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftobjs.c
index 32a372b7fbd..ee15a016c75 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftobjs.c
@@ -1910,7 +1910,7 @@
     rlen = ( header[0x57] << 24 ) |
            ( header[0x58] << 16 ) |
            ( header[0x59] <<  8 ) |
-             header[0x5a];
+             header[0x5A];
 #endif /* 0 */
     offset = 128 + ( ( dlen + 127 ) & ~127 );
 
@@ -3648,8 +3648,10 @@
     /* clean up buffer */
     ((FT_Byte*)buffer)[0] = '\0';
 
-    if ( (FT_Long)glyph_index > face->num_glyphs ||
-         !FT_HAS_GLYPH_NAMES( face )             )
+    if ( (FT_Long)glyph_index >= face->num_glyphs )
+      return FT_THROW( Invalid_Glyph_Index );
+
+    if ( !FT_HAS_GLYPH_NAMES( face ) )
       return FT_THROW( Invalid_Argument );
 
     FT_FACE_LOOKUP_SERVICE( face, service, GLYPH_DICT );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftotval.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftotval.c
index 5fc73d76ab3..5fc73d76ab3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftotval.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftotval.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftoutln.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftoutln.c
index 8749d64ce79..8749d64ce79 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftoutln.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftoutln.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpatent.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpatent.c
index 82b42f03438..82b42f03438 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpatent.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpatent.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpfr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpfr.c
index 7425abe33c2..7425abe33c2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpfr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpic.c
index 9bd92f785a1..9bd92f785a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftrfork.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftrfork.c
index 5352970389a..efe24d6eeee 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftrfork.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftrfork.c
@@ -182,10 +182,10 @@
         return error;
 
       FT_TRACE2(( "Resource tags: %c%c%c%c\n",
-                  (char)( 0xff & ( tag_internal >> 24 ) ),
-                  (char)( 0xff & ( tag_internal >> 16 ) ),
-                  (char)( 0xff & ( tag_internal >>  8 ) ),
-                  (char)( 0xff & ( tag_internal >>  0 ) ) ));
+                  (char)( 0xFF & ( tag_internal >> 24 ) ),
+                  (char)( 0xFF & ( tag_internal >> 16 ) ),
+                  (char)( 0xFF & ( tag_internal >>  8 ) ),
+                  (char)( 0xFF & ( tag_internal >>  0 ) ) ));
       FT_TRACE3(( "             : subcount=%d, suboffset=0x%04x\n",
                   subcnt, rpos ));
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsnames.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsnames.c
index 260e91c148e..260e91c148e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsnames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftstream.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftstream.c
index 759fd8fc07a..759fd8fc07a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftstream.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftstream.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftstroke.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftstroke.c
index d123e0274c8..5fc41fc8fa2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftstroke.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftstroke.c
@@ -834,8 +834,8 @@
     stroker->miter_limit = miter_limit;
 
     /* ensure miter limit has sensible value */
-    if ( stroker->miter_limit < 0x10000 )
-      stroker->miter_limit = 0x10000;
+    if ( stroker->miter_limit < 0x10000L )
+      stroker->miter_limit = 0x10000L;
 
     /* save line join style:                                           */
     /* line join style can be temporarily changed when stroking curves */
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsynth.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsynth.c
index 0567bd537a4..0567bd537a4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsynth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsynth.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsystem.c
index 2c6ddac10c2..2c6ddac10c2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/fttrigon.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/fttrigon.c
index 9b2ccd5d61a..22b7ecf1bf2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/fttrigon.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/fttrigon.c
@@ -73,7 +73,7 @@
     /* and CORDIC hypotenuse, so it minimizes the error       */
     val = (FT_Fixed)( ( (FT_Int64)val * FT_TRIG_SCALE + 0x40000000UL ) >> 32 );
 
-    return ( s >= 0 ) ? val : -val;
+    return s < 0 ? -val : val;
   }
 
 #else /* !FT_LONG64 */
@@ -117,12 +117,12 @@
     /* and CORDIC hypotenuse, so it minimizes the error       */
 
     /* Check carry overflow of lo + 0x40000000 */
-    lo += 0x40000000U;
-    hi += ( lo < 0x40000000U );
+    lo += 0x40000000UL;
+    hi += ( lo < 0x40000000UL );
 
     val  = (FT_Fixed)hi;
 
-    return ( s >= 0 ) ? val : -val;
+    return s < 0 ? -val : val;
   }
 
 #endif /* !FT_LONG64 */
@@ -480,8 +480,8 @@
 
     v.x = ft_trig_downscale( v.x );
 
-    *length = ( shift >= 0 ) ?                      ( v.x >>  shift )
-                             : (FT_Fixed)( (FT_UInt32)v.x << -shift );
+    *length = shift >= 0 ?                      ( v.x >>  shift )
+                         : (FT_Fixed)( (FT_UInt32)v.x << -shift );
     *angle  = v.y;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/fttype1.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/fttype1.c
index 47af19afb04..47af19afb04 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/fttype1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/fttype1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftutil.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftutil.c
index 56e2800eb6b..56e2800eb6b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftwinfnt.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftwinfnt.c
index 8e337fbe530..8e337fbe530 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftwinfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftwinfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftxf86.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftxf86.c
index a4bf767dfa2..a4bf767dfa2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/ftxf86.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/ftxf86.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/md5.c b/Build/source/libs/freetype2/freetype-2.5.5/src/base/md5.c
index 52d96accd30..52d96accd30 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/md5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/md5.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/md5.h b/Build/source/libs/freetype2/freetype-2.5.5/src/base/md5.h
index 2da44bf355a..2da44bf355a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/md5.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/md5.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/base/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/base/rules.mk
index cbd810732be..cbd810732be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/base/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/base/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/Jamfile
index da23ccd0add..da23ccd0add 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/README b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/README
index b761aba2b28..b761aba2b28 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdf.c b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdf.c
index f95fb76225f..f95fb76225f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdf.h b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdf.h
index d11be6f147f..d11be6f147f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdfdrivr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdfdrivr.c
index 55a428c1b6e..55a428c1b6e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdfdrivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdfdrivr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdfdrivr.h
index ca0dae50d22..ca0dae50d22 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdfdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdferror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdferror.h
index ea545aca06c..ea545aca06c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdferror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdferror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdflib.c b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdflib.c
index 369c111f97b..abcfdee7be6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/bdflib.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/bdflib.c
@@ -781,8 +781,8 @@
       hold     = buf[end];
       buf[end] = 0;
 
-      /* XXX: Use encoding independent value for 0x1a */
-      if ( buf[start] != '#' && buf[start] != 0x1a && end > start )
+      /* XXX: Use encoding independent value for 0x1A */
+      if ( buf[start] != '#' && buf[start] != 0x1A && end > start )
       {
         error = (*cb)( buf + start, (unsigned long)( end - start ), lineno,
                        (void*)&cb, client_data );
@@ -823,17 +823,17 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
   };
 
   static const unsigned char  odigits[32] =
   {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -841,7 +841,7 @@
 
   static const unsigned char  ddigits[32] =
   {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -849,8 +849,8 @@
 
   static const unsigned char  hdigits[32] =
   {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03,
-    0x7e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
+    0x7E, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   };
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/module.mk
index fe06ae8e064..fe06ae8e064 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/rules.mk
index 6ff1614ddec..6ff1614ddec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bdf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bdf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/Jamfile
index 3da986dce65..3da986dce65 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/ftbzip2.c b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/ftbzip2.c
index 59651361b35..7e406b1612f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/ftbzip2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/ftbzip2.c
@@ -131,7 +131,7 @@
     /* head[0] && head[1] are the magic numbers;    */
     /* head[2] is the version, and head[3] the blocksize */
     if ( head[0] != 0x42  ||
-         head[1] != 0x5a  ||
+         head[1] != 0x5A  ||
          head[2] != 0x68  )  /* only support bzip2 (huffman) */
     {
       error = FT_THROW( Invalid_File_Format );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/rules.mk
index 0ff2628b4a1..0ff2628b4a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/bzip2/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/bzip2/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/Jamfile
index 6563991375b..6563991375b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcache.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcache.c
index d41e91e5ec1..d41e91e5ec1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcache.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcache.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcbasic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcbasic.c
index 6bad39d912b..6bad39d912b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcbasic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcbasic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccache.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccache.c
index f20dd4502c0..f20dd4502c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccache.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccache.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccache.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccache.h
index 4155f320e05..4155f320e05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccache.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccache.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccback.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccback.h
index 95282792732..95282792732 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccback.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccback.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccmap.c
index ab223663bb1..ab223663bb1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftccmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftccmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcerror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcerror.h
index 0e055709bb7..0e055709bb7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcerror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcerror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcglyph.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcglyph.c
index 441e177238a..441e177238a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcglyph.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcglyph.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcglyph.h
index 5fed19cb8fa..5fed19cb8fa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcglyph.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcimage.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcimage.c
index c242ece021e..c242ece021e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcimage.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcimage.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcimage.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcimage.h
index 20d5d3e07df..20d5d3e07df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcimage.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcimage.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmanag.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmanag.c
index fff7a08827a..fff7a08827a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmanag.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmanag.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmanag.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmanag.h
index 0aec33c5843..0aec33c5843 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmanag.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmanag.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmru.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmru.c
index dc8b4cc3970..dc8b4cc3970 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmru.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmru.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmru.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmru.h
index 6fccf11781c..6fccf11781c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcmru.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcmru.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcsbits.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcsbits.c
index 59727d16e26..59727d16e26 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcsbits.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcsbits.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcsbits.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcsbits.h
index df55dca8066..df55dca8066 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/ftcsbits.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/ftcsbits.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/rules.mk
index ed75a6a91fd..ed75a6a91fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cache/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cache/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/Jamfile
index 6705d3cfdb7..6705d3cfdb7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2arrst.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2arrst.c
index c8d6f130985..c8d6f130985 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2arrst.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2arrst.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2arrst.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2arrst.h
index ff5ad8b1268..ff5ad8b1268 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2arrst.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2arrst.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2blues.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2blues.c
index 250f89e0df4..250f89e0df4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2blues.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2blues.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2blues.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2blues.h
index 2f38fcad8f5..2f38fcad8f5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2blues.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2blues.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2error.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2error.c
index b5595a3d1f3..b5595a3d1f3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2error.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2error.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2error.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2error.h
index 6453ebcb7b8..6453ebcb7b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2error.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2error.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2fixed.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2fixed.h
index ed1452a7daa..ed1452a7daa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2fixed.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2fixed.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2font.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2font.c
index a46b748ed7e..83fd348f2db 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2font.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2font.c
@@ -150,8 +150,8 @@
       /* logarithms; remembering that the 16 lowest bits of the fraction */
       /* are dropped this is correct to within a factor of almost 4.     */
       /* For example, 0x80.0000 * 0x80.0000 = 0x4000.0000 is 23+23 and   */
-      /* is flagged as possible overflow because 0xff.ffff * 0xff.ffff = */
-      /* 0xffff.fe00 is also 23+23.                                      */
+      /* is flagged as possible overflow because 0xFF.FFFF * 0xFF.FFFF = */
+      /* 0xFFFF.FE00 is also 23+23.                                      */
 
       logBase2 = FT_MSB( (FT_UInt32)stemWidthPer1000 ) +
                    FT_MSB( (FT_UInt32)ppem );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2font.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2font.h
index d8860ce8ed5..d8860ce8ed5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2font.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2font.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2ft.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2ft.c
index ebba4694ce8..ebba4694ce8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2ft.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2ft.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2ft.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2ft.h
index 731da3ca8c7..731da3ca8c7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2ft.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2ft.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2glue.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2glue.h
index a24da39e93c..a24da39e93c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2glue.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2glue.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2hints.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2hints.c
index 040d193f313..040d193f313 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2hints.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2hints.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2hints.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2hints.h
index f25d91bf89f..f25d91bf89f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2hints.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2hints.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2intrp.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2intrp.c
index a26960669f1..a26960669f1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2intrp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2intrp.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2intrp.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2intrp.h
index b5d8947838e..b5d8947838e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2intrp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2intrp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2read.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2read.c
index 2b429e3eeb0..2b429e3eeb0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2read.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2read.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2read.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2read.h
index 7ef7c8c1493..7ef7c8c1493 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2read.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2read.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2stack.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2stack.c
index 8332b5d91aa..8332b5d91aa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2stack.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2stack.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2stack.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2stack.h
index 7d6d1961fe9..7d6d1961fe9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2stack.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2stack.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2types.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2types.h
index ac6a02266e7..ac6a02266e7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cf2types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cf2types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cff.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cff.c
index c3840b58384..c3840b58384 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cff.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cff.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffcmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffcmap.c
index 52248b2b9a2..52248b2b9a2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffcmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffcmap.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffcmap.h
index 3f7f67bbe05..3f7f67bbe05 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffdrivr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffdrivr.c
index dde7d448801..3e8898e343c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2013 by                                                 */
+/*  Copyright 1996-2014 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -753,7 +753,7 @@
     FT_Module_Interface  result;
 
 
-    /* CFF_SERVICES_GET derefers `library' in PIC mode */
+    /* CFF_SERVICES_GET dereferences `library' in PIC mode */
 #ifdef FT_CONFIG_OPTION_PIC
     if ( !driver )
       return NULL;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffdrivr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffdrivr.h
index 50e8138701e..50e8138701e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfferrs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfferrs.h
index 801d73ec6b7..801d73ec6b7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfferrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfferrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffgload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffgload.c
index 758a3d3bbd1..758a3d3bbd1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffgload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffgload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffgload.h
index 41df7db6928..41df7db6928 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffload.c
index d9bec5966b1..d9bec5966b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffload.h
index 804961964b8..804961964b8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffobjs.c
index da3d0190fe4..da3d0190fe4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffobjs.h
index dfbf9a96b0b..dfbf9a96b0b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffparse.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffparse.c
index 91bd5326c3e..c79ab623dcb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffparse.c
@@ -188,7 +188,7 @@
     }
 
     /* Read fraction part, if any. */
-    if ( nib == 0xa )
+    if ( nib == 0xA )
       for (;;)
       {
         /* If we entered this iteration with phase == 4, we need */
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffparse.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffparse.h
index 61d91ed2e2d..61d91ed2e2d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffpic.c
index f22e4f0d537..f22e4f0d537 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffpic.h
index 50bab4c1739..50bab4c1739 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cffpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cffpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfftoken.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfftoken.h
index bcb4276a78f..bcb4276a78f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfftoken.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfftoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfftypes.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfftypes.h
index 87274466644..87274466644 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/cfftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/cfftypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/module.mk
index ef1391c279b..ef1391c279b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/rules.mk
index 13115c25509..13115c25509 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cff/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cff/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/Jamfile
index ebeaed54ea2..ebeaed54ea2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/ciderrs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/ciderrs.h
index ef13155504e..ef13155504e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/ciderrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/ciderrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidgload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidgload.c
index 7febab81c41..7febab81c41 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidgload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidgload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidgload.h
index a0a91bfea83..a0a91bfea83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidload.c
index 1cda0eee7ad..1cda0eee7ad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidload.h
index 8c172ffee2d..8c172ffee2d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidobjs.c
index 5932ffa9730..5932ffa9730 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidobjs.h
index aee346d1c88..aee346d1c88 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidparse.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidparse.c
index d8476cdae89..d8476cdae89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidparse.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidparse.h
index f27be65a600..f27be65a600 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidriver.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidriver.c
index 6132a277633..6132a277633 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidriver.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidriver.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidriver.h
index 3c45e068862..3c45e068862 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidtoken.h b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidtoken.h
index 904cb09cf4d..904cb09cf4d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/cidtoken.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/cidtoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/module.mk
index ce30bfd7ae4..ce30bfd7ae4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/rules.mk
index f3627446126..f3627446126 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/type1cid.c b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/type1cid.c
index 0b866e97c44..0b866e97c44 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/cid/type1cid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/cid/type1cid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/Jamfile
index 88049a625d3..88049a625d3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/README b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/README
index 28e535b0bcc..28e535b0bcc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvalid.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvalid.c
index bc36e675d14..bc36e675d14 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvalid.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvalid.h
index 27be9ecca85..27be9ecca85 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvbsln.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvbsln.c
index 3d100315636..d16511876ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvbsln.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvbsln.c
@@ -72,10 +72,10 @@
   static void
   gxv_bsln_LookupValue_validate( FT_UShort            glyph,
                                  GXV_LookupValueCPtr  value_p,
-                                 GXV_Validator        valid )
+                                 GXV_Validator        gxvalid )
   {
-    FT_UShort   v = value_p->u;
-    FT_UShort*  ctlPoints;
+    FT_UShort     v = value_p->u;
+    FT_UShort*    ctlPoints;
 
     FT_UNUSED( glyph );
 
@@ -124,7 +124,7 @@
   gxv_bsln_LookupFmt4_transit( FT_UShort            relative_gindex,
                                GXV_LookupValueCPtr  base_value_p,
                                FT_Bytes             lookuptbl_limit,
-                               GXV_Validator        valid )
+                               GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -135,7 +135,7 @@
     offset = (FT_UShort)( base_value_p->u +
                           ( relative_gindex * sizeof ( FT_UShort ) ) );
 
-    p     = valid->lookuptbl_head + offset;
+    p     = gxvalid->lookuptbl_head + offset;
     limit = lookuptbl_limit;
     GXV_LIMIT_CHECK( 2 );
 
@@ -148,7 +148,7 @@
   static void
   gxv_bsln_parts_fmt0_validate( FT_Bytes       tables,
                                 FT_Bytes       limit,
-                                GXV_Validator  valid )
+                                GXV_Validator  gxvalid )
   {
     FT_Bytes  p = tables;
 
@@ -158,7 +158,7 @@
     /* deltas */
     GXV_LIMIT_CHECK( 2 * GXV_BSLN_VALUE_COUNT );
 
-    valid->table_data = NULL;      /* No ctlPoints here. */
+    gxvalid->table_data = NULL;      /* No ctlPoints here. */
 
     GXV_EXIT;
   }
@@ -167,7 +167,7 @@
   static void
   gxv_bsln_parts_fmt1_validate( FT_Bytes       tables,
                                 FT_Bytes       limit,
-                                GXV_Validator  valid )
+                                GXV_Validator  gxvalid )
   {
     FT_Bytes  p = tables;
 
@@ -175,15 +175,15 @@
     GXV_NAME_ENTER( "parts format 1" );
 
     /* deltas */
-    gxv_bsln_parts_fmt0_validate( p, limit, valid );
+    gxv_bsln_parts_fmt0_validate( p, limit, gxvalid );
 
     /* mappingData */
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_bsln_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_bsln_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit;
     gxv_LookupTable_validate( p + 2 * GXV_BSLN_VALUE_COUNT,
                               limit,
-                              valid );
+                              gxvalid );
 
     GXV_EXIT;
   }
@@ -192,7 +192,7 @@
   static void
   gxv_bsln_parts_fmt2_validate( FT_Bytes       tables,
                                 FT_Bytes       limit,
-                                GXV_Validator  valid )
+                                GXV_Validator  gxvalid )
   {
     FT_Bytes   p = tables;
 
@@ -211,7 +211,7 @@
     stdGlyph = FT_NEXT_USHORT( p );
     GXV_TRACE(( " (stdGlyph = %u)\n", stdGlyph ));
 
-    gxv_glyphid_validate( stdGlyph, valid );
+    gxv_glyphid_validate( stdGlyph, gxvalid );
 
     /* Record the position of ctlPoints */
     GXV_BSLN_DATA( ctlPoints_p ) = p;
@@ -226,7 +226,7 @@
           FT_INVALID_DATA;
       }
       else
-        gxv_ctlPoint_validate( stdGlyph, (FT_Short)ctlPoint, valid );
+        gxv_ctlPoint_validate( stdGlyph, (FT_Short)ctlPoint, gxvalid );
     }
 
     GXV_EXIT;
@@ -236,7 +236,7 @@
   static void
   gxv_bsln_parts_fmt3_validate( FT_Bytes       tables,
                                 FT_Bytes       limit,
-                                GXV_Validator  valid)
+                                GXV_Validator  gxvalid)
   {
     FT_Bytes  p = tables;
 
@@ -244,15 +244,15 @@
     GXV_NAME_ENTER( "parts format 3" );
 
     /* stdGlyph + ctlPoints */
-    gxv_bsln_parts_fmt2_validate( p, limit, valid );
+    gxv_bsln_parts_fmt2_validate( p, limit, gxvalid );
 
     /* mappingData */
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_bsln_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_bsln_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_bsln_LookupFmt4_transit;
     gxv_LookupTable_validate( p + ( 2 + 2 * GXV_BSLN_VALUE_COUNT ),
                               limit,
-                              valid );
+                              gxvalid );
 
     GXV_EXIT;
   }
@@ -271,8 +271,8 @@
                      FT_Face       face,
                      FT_Validator  ftvalid )
   {
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
 
     GXV_bsln_DataRec  bslnrec;
     GXV_bsln_Data     bsln = &bslnrec;
@@ -293,9 +293,9 @@
     };
 
 
-    valid->root       = ftvalid;
-    valid->table_data = bsln;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = bsln;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `bsln' table\n" ));
     GXV_INIT;
@@ -320,7 +320,7 @@
 
     bsln->defaultBaseline = defaultBaseline;
 
-    fmt_funcs_table[format]( p, limit, valid );
+    fmt_funcs_table[format]( p, limit, gxvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvcommn.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvcommn.c
index 7af52342ba0..8e72a72f4e4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvcommn.c
@@ -65,7 +65,7 @@
                                    FT_UShort*     buff,
                                    FT_UInt        nmemb,
                                    FT_UShort      limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     FT_UInt  i;
 
@@ -130,7 +130,7 @@
                                   FT_ULong*      buff,
                                   FT_UInt        nmemb,
                                   FT_ULong       limit,
-                                  GXV_Validator  valid)
+                                  GXV_Validator  gxvalid)
   {
     FT_UInt  i;
 
@@ -182,7 +182,7 @@
                             FT_Bytes       limit,
                             FT_Byte*       min,
                             FT_Byte*       max,
-                            GXV_Validator  valid )
+                            GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -202,7 +202,7 @@
       *max = (FT_Byte)FT_MAX( *max, val );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
@@ -211,7 +211,7 @@
                               FT_Bytes       limit,
                               FT_UShort*     min,
                               FT_UShort*     max,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -231,7 +231,7 @@
       *max = (FT_Byte)FT_MAX( *max, val );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
@@ -256,7 +256,7 @@
 
   static void
   gxv_BinSrchHeader_check_consistency( GXV_BinSrchHeader*  binSrchHeader,
-                                       GXV_Validator       valid )
+                                       GXV_Validator       gxvalid )
   {
     FT_UShort  searchRange;
     FT_UShort  entrySelector;
@@ -329,7 +329,7 @@
                               FT_Bytes       limit,
                               FT_UShort*     unitSize_p,
                               FT_UShort*     nUnits_p,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     FT_Bytes           p = table;
     GXV_BinSrchHeader  binSrchHeader;
@@ -359,7 +359,7 @@
     binSrchHeader.rangeShift    = FT_NEXT_USHORT( p );
     GXV_TRACE(( "nUnits %d\n", binSrchHeader.nUnits ));
 
-    gxv_BinSrchHeader_check_consistency( &binSrchHeader, valid );
+    gxv_BinSrchHeader_check_consistency( &binSrchHeader, gxvalid );
 
     if ( *unitSize_p == 0 )
       *unitSize_p = binSrchHeader.unitSize;
@@ -367,7 +367,7 @@
     if ( *nUnits_p == 0 )
       *nUnits_p = binSrchHeader.nUnits;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -422,7 +422,7 @@
   static void
   gxv_LookupTable_fmt0_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  i;
@@ -432,24 +432,24 @@
 
     GXV_NAME_ENTER( "LookupTable format 0" );
 
-    GXV_LIMIT_CHECK( 2 * valid->face->num_glyphs );
+    GXV_LIMIT_CHECK( 2 * gxvalid->face->num_glyphs );
 
-    for ( i = 0; i < valid->face->num_glyphs; i++ )
+    for ( i = 0; i < gxvalid->face->num_glyphs; i++ )
     {
       GXV_LIMIT_CHECK( 2 );
       if ( p + 2 >= limit )     /* some fonts have too-short fmt0 array */
       {
         GXV_TRACE(( "too short, glyphs %d - %d are missing\n",
-                    i, valid->face->num_glyphs ));
+                    i, gxvalid->face->num_glyphs ));
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
         break;
       }
 
-      value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign );
-      valid->lookupval_func( i, &value, valid );
+      value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign );
+      gxvalid->lookupval_func( i, &value, gxvalid );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -473,12 +473,12 @@
   static void
   gxv_LookupTable_fmt2_skip_endmarkers( FT_Bytes       table,
                                         FT_UShort      unitSize,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
 
-    while ( ( p + 4 ) < valid->root->limit )
+    while ( ( p + 4 ) < gxvalid->root->limit )
     {
       if ( p[0] != 0xFF || p[1] != 0xFF || /* lastGlyph */
            p[2] != 0xFF || p[3] != 0xFF )  /* firstGlyph */
@@ -486,14 +486,14 @@
       p += unitSize;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_LookupTable_fmt2_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_Bytes             p = table;
     FT_UShort            gid;
@@ -509,8 +509,8 @@
     GXV_NAME_ENTER( "LookupTable format 2" );
 
     unitSize = nUnits = 0;
-    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid );
-    p += valid->subtable_length;
+    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid );
+    p += gxvalid->subtable_length;
 
     GXV_UNITSIZE_VALIDATE( "format2", unitSize, nUnits, 6 );
 
@@ -519,10 +519,10 @@
       GXV_LIMIT_CHECK( 2 + 2 + 2 );
       lastGlyph  = FT_NEXT_USHORT( p );
       firstGlyph = FT_NEXT_USHORT( p );
-      value      = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign );
+      value      = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign );
 
-      gxv_glyphid_validate( firstGlyph, valid );
-      gxv_glyphid_validate( lastGlyph, valid );
+      gxv_glyphid_validate( firstGlyph, gxvalid );
+      gxv_glyphid_validate( lastGlyph, gxvalid );
 
       if ( lastGlyph < gid )
       {
@@ -539,7 +539,7 @@
                     unit, lastGlyph, firstGlyph ));
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
 
-        if ( valid->root->level == FT_VALIDATE_TIGHT )
+        if ( gxvalid->root->level == FT_VALIDATE_TIGHT )
           continue;     /* ftxvalidator silently skips such an entry */
 
         FT_TRACE4(( "continuing with exchanged values\n" ));
@@ -549,13 +549,13 @@
       }
 
       for ( gid = firstGlyph; gid <= lastGlyph; gid++ )
-        valid->lookupval_func( gid, &value, valid );
+        gxvalid->lookupval_func( gid, &value, gxvalid );
     }
 
-    gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, valid );
-    p += valid->subtable_length;
+    gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, gxvalid );
+    p += gxvalid->subtable_length;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -564,7 +564,7 @@
   static void
   gxv_LookupTable_fmt4_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_Bytes             p = table;
     FT_UShort            unit;
@@ -581,8 +581,8 @@
     GXV_NAME_ENTER( "LookupTable format 4" );
 
     unitSize = nUnits = 0;
-    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid );
-    p += valid->subtable_length;
+    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid );
+    p += gxvalid->subtable_length;
 
     GXV_UNITSIZE_VALIDATE( "format4", unitSize, nUnits, 6 );
 
@@ -592,8 +592,8 @@
       lastGlyph  = FT_NEXT_USHORT( p );
       firstGlyph = FT_NEXT_USHORT( p );
 
-      gxv_glyphid_validate( firstGlyph, valid );
-      gxv_glyphid_validate( lastGlyph, valid );
+      gxv_glyphid_validate( firstGlyph, gxvalid );
+      gxv_glyphid_validate( lastGlyph, gxvalid );
 
       if ( lastGlyph < gid )
       {
@@ -610,7 +610,7 @@
                     unit, lastGlyph, firstGlyph ));
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
 
-        if ( valid->root->level == FT_VALIDATE_TIGHT )
+        if ( gxvalid->root->level == FT_VALIDATE_TIGHT )
           continue; /* ftxvalidator silently skips such an entry */
 
         FT_TRACE4(( "continuing with exchanged values\n" ));
@@ -624,19 +624,19 @@
 
       for ( gid = firstGlyph; gid <= lastGlyph; gid++ )
       {
-        value = valid->lookupfmt4_trans( (FT_UShort)( gid - firstGlyph ),
+        value = gxvalid->lookupfmt4_trans( (FT_UShort)( gid - firstGlyph ),
                                          &base_value,
                                          limit,
-                                         valid );
+                                         gxvalid );
 
-        valid->lookupval_func( gid, &value, valid );
+        gxvalid->lookupval_func( gid, &value, gxvalid );
       }
     }
 
-    gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, valid );
-    p += valid->subtable_length;
+    gxv_LookupTable_fmt2_skip_endmarkers( p, unitSize, gxvalid );
+    p += gxvalid->subtable_length;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -645,26 +645,26 @@
   static void
   gxv_LookupTable_fmt6_skip_endmarkers( FT_Bytes       table,
                                         FT_UShort      unitSize,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
 
-    while ( p < valid->root->limit )
+    while ( p < gxvalid->root->limit )
     {
       if ( p[0] != 0xFF || p[1] != 0xFF )
         break;
       p += unitSize;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_LookupTable_fmt6_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_Bytes             p = table;
     FT_UShort            unit;
@@ -679,8 +679,8 @@
     GXV_NAME_ENTER( "LookupTable format 6" );
 
     unitSize = nUnits = 0;
-    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, valid );
-    p += valid->subtable_length;
+    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nUnits, gxvalid );
+    p += gxvalid->subtable_length;
 
     GXV_UNITSIZE_VALIDATE( "format6", unitSize, nUnits, 4 );
 
@@ -688,9 +688,9 @@
     {
       GXV_LIMIT_CHECK( 2 + 2 );
       glyph = FT_NEXT_USHORT( p );
-      value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign );
+      value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign );
 
-      if ( gxv_glyphid_validate( glyph, valid ) )
+      if ( gxv_glyphid_validate( glyph, gxvalid ) )
         GXV_TRACE(( " endmarker found within defined range"
                     " (entry %d < nUnits=%d)\n",
                     unit, nUnits ));
@@ -703,13 +703,13 @@
       }
       prev_glyph = glyph;
 
-      valid->lookupval_func( glyph, &value, valid );
+      gxvalid->lookupval_func( glyph, &value, gxvalid );
     }
 
-    gxv_LookupTable_fmt6_skip_endmarkers( p, unitSize, valid );
-    p += valid->subtable_length;
+    gxv_LookupTable_fmt6_skip_endmarkers( p, unitSize, gxvalid );
+    p += gxvalid->subtable_length;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -718,7 +718,7 @@
   static void
   gxv_LookupTable_fmt8_validate( FT_Bytes       table,
                                  FT_Bytes       limit,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_Bytes              p = table;
     FT_UShort             i;
@@ -735,18 +735,18 @@
     firstGlyph = FT_NEXT_USHORT( p );
     glyphCount = FT_NEXT_USHORT( p );
 
-    gxv_glyphid_validate( firstGlyph, valid );
-    gxv_glyphid_validate( (FT_UShort)( firstGlyph + glyphCount ), valid );
+    gxv_glyphid_validate( firstGlyph, gxvalid );
+    gxv_glyphid_validate( (FT_UShort)( firstGlyph + glyphCount ), gxvalid );
 
     /* valueArray */
     for ( i = 0; i < glyphCount; i++ )
     {
       GXV_LIMIT_CHECK( 2 );
-      value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign );
-      valid->lookupval_func( (FT_UShort)( firstGlyph + i ), &value, valid );
+      value = GXV_LOOKUP_VALUE_LOAD( p, gxvalid->lookupval_sign );
+      gxvalid->lookupval_func( (FT_UShort)( firstGlyph + i ), &value, gxvalid );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -754,7 +754,7 @@
   FT_LOCAL_DEF( void )
   gxv_LookupTable_validate( FT_Bytes       table,
                             FT_Bytes       limit,
-                            GXV_Validator  valid )
+                            GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  format;
@@ -778,7 +778,7 @@
     GXV_NAME_ENTER( "LookupTable" );
 
     /* lookuptbl_head may be used in fmt4 transit function. */
-    valid->lookuptbl_head = table;
+    gxvalid->lookuptbl_head = table;
 
     /* format */
     GXV_LIMIT_CHECK( 2 );
@@ -792,10 +792,10 @@
     if ( func == NULL )
       FT_INVALID_FORMAT;
 
-    func( p, limit, valid );
-    p += valid->subtable_length;
+    func( p, limit, gxvalid );
+    p += gxvalid->subtable_length;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -811,7 +811,7 @@
 
   FT_LOCAL_DEF( FT_Int )
   gxv_glyphid_validate( FT_UShort      gid,
-                        GXV_Validator  valid )
+                        GXV_Validator  gxvalid )
   {
     FT_Face  face;
 
@@ -822,7 +822,7 @@
       return 1;
     }
 
-    face = valid->face;
+    face = gxvalid->face;
     if ( face->num_glyphs < gid )
     {
       GXV_TRACE(( " gxv_glyphid_check() gid overflow: num_glyphs %d < %d\n",
@@ -845,7 +845,7 @@
   FT_LOCAL_DEF( void )
   gxv_ctlPoint_validate( FT_UShort      gid,
                          FT_Short       ctl_point,
-                         GXV_Validator  valid )
+                         GXV_Validator  gxvalid )
   {
     FT_Face       face;
     FT_Error      error;
@@ -855,7 +855,7 @@
     short         n_points;
 
 
-    face = valid->face;
+    face = gxvalid->face;
 
     error = FT_Load_Glyph( face,
                            gid,
@@ -885,7 +885,7 @@
   gxv_sfntName_validate( FT_UShort      name_index,
                          FT_UShort      min_index,
                          FT_UShort      max_index,
-                         GXV_Validator  valid )
+                         GXV_Validator  gxvalid )
   {
     FT_SfntName  name;
     FT_UInt      i;
@@ -897,10 +897,10 @@
     if ( name_index < min_index || max_index < name_index )
       FT_INVALID_FORMAT;
 
-    nnames = FT_Get_Sfnt_Name_Count( valid->face );
+    nnames = FT_Get_Sfnt_Name_Count( gxvalid->face );
     for ( i = 0; i < nnames; i++ )
     {
-      if ( FT_Get_Sfnt_Name( valid->face, i, &name ) != FT_Err_Ok )
+      if ( FT_Get_Sfnt_Name( gxvalid->face, i, &name ) != FT_Err_Ok )
         continue ;
 
       if ( name.name_id == name_index )
@@ -944,7 +944,7 @@
                            FT_UShort*     length_p,
                            FT_UShort      stateSize,
                            FT_Byte*       maxClassID_p,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
     FT_Bytes   p     = table;
     FT_Bytes   limit = table + *length_p;
@@ -965,7 +965,7 @@
     if ( !nGlyphs )
       goto Out;
 
-    gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs ), valid );
+    gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs ), gxvalid );
 
     {
       FT_Byte    nGlyphInClass[256];
@@ -1022,9 +1022,9 @@
                            FT_UShort      stateSize,
                            FT_Byte*       maxState_p,
                            FT_Byte*       maxEntry_p,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
-    FT_Bytes  p = table;
+    FT_Bytes  p     = table;
     FT_Bytes  limit = table + *length_p;
     FT_Byte   clazz;
     FT_Byte   entry;
@@ -1076,7 +1076,7 @@
                            FT_Byte        maxClassID,
                            FT_Bytes       statetable_table,
                            FT_Bytes       statetable_limit,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
     FT_Bytes  p     = table;
     FT_Bytes  limit = table + *length_p;
@@ -1166,13 +1166,13 @@
         goto Exit;
       }
 
-      if ( NULL != valid->statetable.entry_validate_func )
-        valid->statetable.entry_validate_func( state,
-                                               flags,
-                                               &glyphOffset,
-                                               statetable_table,
-                                               statetable_limit,
-                                               valid );
+      if ( NULL != gxvalid->statetable.entry_validate_func )
+        gxvalid->statetable.entry_validate_func( state,
+                                                 flags,
+                                                 &glyphOffset,
+                                                 statetable_table,
+                                                 statetable_limit,
+                                                 gxvalid );
     }
 
   Exit:
@@ -1192,7 +1192,7 @@
                                  FT_UShort*     classTable_length_p,
                                  FT_UShort*     stateArray_length_p,
                                  FT_UShort*     entryTable_length_p,
-                                 GXV_Validator  valid )
+                                 GXV_Validator  gxvalid )
   {
     FT_UShort   o[3];
     FT_UShort*  l[3];
@@ -1206,14 +1206,14 @@
     l[1] = stateArray_length_p;
     l[2] = entryTable_length_p;
 
-    gxv_set_length_by_ushort_offset( o, l, buff, 3, table_size, valid );
+    gxv_set_length_by_ushort_offset( o, l, buff, 3, table_size, gxvalid );
   }
 
 
   FT_LOCAL_DEF( void )
   gxv_StateTable_validate( FT_Bytes       table,
                            FT_Bytes       limit,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
     FT_UShort   stateSize;
     FT_UShort   classTable;     /* offset to Class(Sub)Table */
@@ -1250,11 +1250,11 @@
     if ( stateSize > 0xFF )
       FT_INVALID_DATA;
 
-    if ( valid->statetable.optdata_load_func != NULL )
-      valid->statetable.optdata_load_func( p, limit, valid );
+    if ( gxvalid->statetable.optdata_load_func != NULL )
+      gxvalid->statetable.optdata_load_func( p, limit, gxvalid );
 
-    if ( valid->statetable.subtable_setup_func != NULL)
-      setup_func = valid->statetable.subtable_setup_func;
+    if ( gxvalid->statetable.subtable_setup_func != NULL)
+      setup_func = gxvalid->statetable.subtable_setup_func;
     else
       setup_func = gxv_StateTable_subtable_setup;
 
@@ -1265,7 +1265,7 @@
                 &classTable_length,
                 &stateArray_length,
                 &entryTable_length,
-                valid );
+                gxvalid );
 
     GXV_TRACE(( "StateTable Subtables\n" ));
 
@@ -1274,7 +1274,7 @@
                                &classTable_length,
                                stateSize,
                                &maxClassID,
-                               valid );
+                               gxvalid );
     else
       maxClassID = (FT_Byte)( stateSize - 1 );
 
@@ -1285,7 +1285,7 @@
                                stateSize,
                                &maxState,
                                &maxEntry,
-                               valid );
+                               gxvalid );
     else
     {
 #if 0
@@ -1306,7 +1306,7 @@
                                maxClassID,
                                table,
                                limit,
-                               valid );
+                               gxvalid );
 
     GXV_EXIT;
   }
@@ -1322,7 +1322,7 @@
                                   FT_ULong*      classTable_length_p,
                                   FT_ULong*      stateArray_length_p,
                                   FT_ULong*      entryTable_length_p,
-                                  GXV_Validator  valid )
+                                  GXV_Validator  gxvalid )
   {
     FT_ULong   o[3];
     FT_ULong*  l[3];
@@ -1336,21 +1336,21 @@
     l[1] = stateArray_length_p;
     l[2] = entryTable_length_p;
 
-    gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, valid );
+    gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, gxvalid );
   }
 
 
   static void
   gxv_XClassTable_lookupval_validate( FT_UShort            glyph,
                                       GXV_LookupValueCPtr  value_p,
-                                      GXV_Validator        valid )
+                                      GXV_Validator        gxvalid )
   {
     FT_UNUSED( glyph );
 
-    if ( value_p->u >= valid->xstatetable.nClasses )
+    if ( value_p->u >= gxvalid->xstatetable.nClasses )
       FT_INVALID_DATA;
-    if ( value_p->u > valid->xstatetable.maxClassID )
-      valid->xstatetable.maxClassID = value_p->u;
+    if ( value_p->u > gxvalid->xstatetable.maxClassID )
+      gxvalid->xstatetable.maxClassID = value_p->u;
   }
 
 
@@ -1384,7 +1384,7 @@
   gxv_XClassTable_lookupfmt4_transit( FT_UShort            relative_gindex,
                                       GXV_LookupValueCPtr  base_value_p,
                                       FT_Bytes             lookuptbl_limit,
-                                      GXV_Validator        valid )
+                                      GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -1395,7 +1395,7 @@
     offset = (FT_UShort)( base_value_p->u +
                           relative_gindex * sizeof ( FT_UShort ) );
 
-    p     = valid->lookuptbl_head + offset;
+    p     = gxvalid->lookuptbl_head + offset;
     limit = lookuptbl_limit;
 
     GXV_LIMIT_CHECK ( 2 );
@@ -1412,7 +1412,7 @@
                             FT_ULong       stateSize,
                             FT_UShort*     maxState_p,
                             FT_UShort*     maxEntry_p,
-                            GXV_Validator  valid )
+                            GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_Bytes   limit = table + *length_p;
@@ -1463,7 +1463,7 @@
                             FT_UShort      maxClassID,
                             FT_Bytes       xstatetable_table,
                             FT_Bytes       xstatetable_limit,
-                            GXV_Validator  valid )
+                            GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_Bytes   limit = table + *length_p;
@@ -1540,13 +1540,13 @@
         goto Exit;
       }
 
-      if ( NULL != valid->xstatetable.entry_validate_func )
-        valid->xstatetable.entry_validate_func( state,
-                                                flags,
-                                                &glyphOffset,
-                                                xstatetable_table,
-                                                xstatetable_limit,
-                                                valid );
+      if ( NULL != gxvalid->xstatetable.entry_validate_func )
+        gxvalid->xstatetable.entry_validate_func( state,
+                                                  flags,
+                                                  &glyphOffset,
+                                                  xstatetable_table,
+                                                  xstatetable_limit,
+                                                  gxvalid );
     }
 
   Exit:
@@ -1559,7 +1559,7 @@
   FT_LOCAL_DEF( void )
   gxv_XStateTable_validate( FT_Bytes       table,
                             FT_Bytes       limit,
-                            GXV_Validator  valid )
+                            GXV_Validator  gxvalid )
   {
     /* StateHeader members */
     FT_ULong   classTable;      /* offset to Class(Sub)Table */
@@ -1582,26 +1582,26 @@
     GXV_TRACE(( "XStateTable header\n" ));
 
     GXV_LIMIT_CHECK( 4 + 4 + 4 + 4 );
-    valid->xstatetable.nClasses = FT_NEXT_ULONG( p );
+    gxvalid->xstatetable.nClasses = FT_NEXT_ULONG( p );
     classTable = FT_NEXT_ULONG( p );
     stateArray = FT_NEXT_ULONG( p );
     entryTable = FT_NEXT_ULONG( p );
 
-    GXV_TRACE(( "nClasses =0x%08x\n", valid->xstatetable.nClasses ));
+    GXV_TRACE(( "nClasses =0x%08x\n", gxvalid->xstatetable.nClasses ));
     GXV_TRACE(( "offset to classTable=0x%08x\n", classTable ));
     GXV_TRACE(( "offset to stateArray=0x%08x\n", stateArray ));
     GXV_TRACE(( "offset to entryTable=0x%08x\n", entryTable ));
 
-    if ( valid->xstatetable.nClasses > 0xFFFFU )
+    if ( gxvalid->xstatetable.nClasses > 0xFFFFU )
       FT_INVALID_DATA;
 
     GXV_TRACE(( "StateTable Subtables\n" ));
 
-    if ( valid->xstatetable.optdata_load_func != NULL )
-      valid->xstatetable.optdata_load_func( p, limit, valid );
+    if ( gxvalid->xstatetable.optdata_load_func != NULL )
+      gxvalid->xstatetable.optdata_load_func( p, limit, gxvalid );
 
-    if ( valid->xstatetable.subtable_setup_func != NULL )
-      setup_func = valid->xstatetable.subtable_setup_func;
+    if ( gxvalid->xstatetable.subtable_setup_func != NULL )
+      setup_func = gxvalid->xstatetable.subtable_setup_func;
     else
       setup_func = gxv_XStateTable_subtable_setup;
 
@@ -1612,37 +1612,37 @@
                 &classTable_length,
                 &stateArray_length,
                 &entryTable_length,
-                valid );
+                gxvalid );
 
     if ( classTable != 0 )
     {
-      valid->xstatetable.maxClassID = 0;
-      valid->lookupval_sign         = GXV_LOOKUPVALUE_UNSIGNED;
-      valid->lookupval_func         = gxv_XClassTable_lookupval_validate;
-      valid->lookupfmt4_trans       = gxv_XClassTable_lookupfmt4_transit;
+      gxvalid->xstatetable.maxClassID = 0;
+      gxvalid->lookupval_sign         = GXV_LOOKUPVALUE_UNSIGNED;
+      gxvalid->lookupval_func         = gxv_XClassTable_lookupval_validate;
+      gxvalid->lookupfmt4_trans       = gxv_XClassTable_lookupfmt4_transit;
       gxv_LookupTable_validate( table + classTable,
                                 table + classTable + classTable_length,
-                                valid );
+                                gxvalid );
 #if 0
-      if ( valid->subtable_length < classTable_length )
-        classTable_length = valid->subtable_length;
+      if ( gxvalid->subtable_length < classTable_length )
+        classTable_length = gxvalid->subtable_length;
 #endif
     }
     else
     {
       /* XXX: check range? */
-      valid->xstatetable.maxClassID =
-        (FT_UShort)( valid->xstatetable.nClasses - 1 );
+      gxvalid->xstatetable.maxClassID =
+        (FT_UShort)( gxvalid->xstatetable.nClasses - 1 );
     }
 
     if ( stateArray != 0 )
       gxv_XStateArray_validate( table + stateArray,
                                 &stateArray_length,
-                                valid->xstatetable.maxClassID,
-                                valid->xstatetable.nClasses,
+                                gxvalid->xstatetable.maxClassID,
+                                gxvalid->xstatetable.nClasses,
                                 &maxState,
                                 &maxEntry,
-                                valid );
+                                gxvalid );
     else
     {
 #if 0
@@ -1659,10 +1659,10 @@
                                 &entryTable_length,
                                 maxEntry,
                                 stateArray_length,
-                                valid->xstatetable.maxClassID,
+                                gxvalid->xstatetable.maxClassID,
                                 table,
                                 limit,
-                                valid );
+                                gxvalid );
 
     GXV_EXIT;
   }
@@ -1719,7 +1719,7 @@
 
   FT_LOCAL_DEF( void )
   gxv_odtect_validate( GXV_odtect_Range  odtect,
-                       GXV_Validator     valid )
+                       GXV_Validator     gxvalid )
   {
     FT_UInt  i, j;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvcommn.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvcommn.h
index 2f44a7515e3..f1143457fff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvcommn.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT common tables validation (specification).             */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2012                                             */
+/*  Copyright 2004, 2005, 2012, 2014                                       */
 /*  by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
@@ -62,7 +62,7 @@ FT_BEGIN_HEADER
 
 #undef GXV_LOAD_UNUSED_VARS /* debug purpose */
 
-#define IS_PARANOID_VALIDATION          ( valid->root->level >= FT_VALIDATE_PARANOID )
+#define IS_PARANOID_VALIDATION          ( gxvalid->root->level >= FT_VALIDATE_PARANOID )
 #define GXV_SET_ERR_IF_PARANOID( err )  { if ( IS_PARANOID_VALIDATION ) ( err ); }
 
   /*************************************************************************/
@@ -81,7 +81,7 @@ FT_BEGIN_HEADER
   typedef void
   (*GXV_Validate_Func)( FT_Bytes       table,
                         FT_Bytes       limit,
-                        GXV_Validator  valid );
+                        GXV_Validator  gxvalid );
 
 
   /* ====================== LookupTable Validator ======================== */
@@ -106,13 +106,13 @@ FT_BEGIN_HEADER
   typedef void
   (*GXV_Lookup_Value_Validate_Func)( FT_UShort            glyph,
                                      GXV_LookupValueCPtr  value_p,
-                                     GXV_Validator        valid );
+                                     GXV_Validator        gxvalid );
 
   typedef GXV_LookupValueDesc
   (*GXV_Lookup_Fmt4_Transit_Func)( FT_UShort            relative_gindex,
                                    GXV_LookupValueCPtr  base_value_p,
                                    FT_Bytes             lookuptbl_limit,
-                                   GXV_Validator        valid );
+                                   GXV_Validator        gxvalid );
 
 
   /* ====================== StateTable Validator ========================= */
@@ -131,10 +131,10 @@ FT_BEGIN_HEADER
 
 
 #define GXV_GLYPHOFFSET_FMT( table )           \
-        ( valid->table.entry_glyphoffset_fmt )
+        ( gxvalid->table.entry_glyphoffset_fmt )
 
 #define GXV_GLYPHOFFSET_SIZE( table )              \
-        ( valid->table.entry_glyphoffset_fmt / 2 )
+        ( gxvalid->table.entry_glyphoffset_fmt / 2 )
 
 
   /* ----------------------- 16bit StateTable ---------------------------- */
@@ -160,7 +160,7 @@ FT_BEGIN_HEADER
                                          FT_UShort*     classTable_length_p,
                                          FT_UShort*     stateArray_length_p,
                                          FT_UShort*     entryTable_length_p,
-                                         GXV_Validator  valid );
+                                         GXV_Validator  gxvalid );
 
   typedef void
   (*GXV_StateTable_Entry_Validate_Func)(
@@ -169,12 +169,12 @@ FT_BEGIN_HEADER
      GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
      FT_Bytes                        statetable_table,
      FT_Bytes                        statetable_limit,
-     GXV_Validator                   valid );
+     GXV_Validator                   gxvalid );
 
   typedef void
   (*GXV_StateTable_OptData_Load_Func)( FT_Bytes       table,
                                        FT_Bytes       limit,
-                                       GXV_Validator  valid );
+                                       GXV_Validator  gxvalid );
 
   typedef struct  GXV_StateTable_ValidatorRec_
   {
@@ -202,7 +202,7 @@ FT_BEGIN_HEADER
                                           FT_ULong*      classTable_length_p,
                                           FT_ULong*      stateArray_length_p,
                                           FT_ULong*      entryTable_length_p,
-                                          GXV_Validator  valid );
+                                          GXV_Validator  gxvalid );
 
   typedef void
   (*GXV_XStateTable_Entry_Validate_Func)(
@@ -211,7 +211,7 @@ FT_BEGIN_HEADER
      GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
      FT_Bytes                        xstatetable_table,
      FT_Bytes                        xstatetable_limit,
-     GXV_Validator                   valid );
+     GXV_Validator                   gxvalid );
 
 
   typedef GXV_StateTable_OptData_Load_Func  GXV_XStateTable_OptData_Load_Func;
@@ -263,35 +263,35 @@ FT_BEGIN_HEADER
 
 
 #define GXV_TABLE_DATA( tag, field )                           \
-        ( ( (GXV_ ## tag ## _Data)valid->table_data )->field )
+        ( ( (GXV_ ## tag ## _Data)gxvalid->table_data )->field )
 
 #undef  FT_INVALID_
-#define FT_INVALID_( _prefix, _error )                         \
-          ft_validator_error( valid->root, _prefix ## _error )
+#define FT_INVALID_( _error ) \
+          ft_validator_error( gxvalid->root, FT_THROW( _error ) )
 
 #define GXV_LIMIT_CHECK( _count )                                     \
           FT_BEGIN_STMNT                                              \
-            if ( p + _count > ( limit? limit : valid->root->limit ) ) \
+            if ( p + _count > ( limit? limit : gxvalid->root->limit ) ) \
               FT_INVALID_TOO_SHORT;                                   \
           FT_END_STMNT
 
 
 #ifdef FT_DEBUG_LEVEL_TRACE
 
-#define GXV_INIT  valid->debug_indent = 0
+#define GXV_INIT  gxvalid->debug_indent = 0
 
 #define GXV_NAME_ENTER( name )                             \
           FT_BEGIN_STMNT                                   \
-            valid->debug_indent += 2;                      \
-            FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \
+            gxvalid->debug_indent += 2;                      \
+            FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \
             FT_TRACE4(( "%s table\n", name ));             \
           FT_END_STMNT
 
-#define GXV_EXIT  valid->debug_indent -= 2
+#define GXV_EXIT  gxvalid->debug_indent -= 2
 
 #define GXV_TRACE( s )                                     \
           FT_BEGIN_STMNT                                   \
-            FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \
+            FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \
             FT_TRACE4( s );                                \
           FT_END_STMNT
 
@@ -349,7 +349,7 @@ FT_BEGIN_HEADER
                                                         \
                                                         \
               for ( b = p; b < (FT_Bytes)p + len; b++ ) \
-                if ( 0x40 < *b && *b < 0x7e )           \
+                if ( 0x40 < *b && *b < 0x7E )           \
                   FT_TRACE1(("%c", *b)) ;               \
                 else                                    \
                   FT_TRACE1(("\\x%02x", *b)) ;          \
@@ -373,12 +373,12 @@ FT_BEGIN_HEADER
                               FT_Bytes       limit,
                               FT_UShort*     unitSize_p,
                               FT_UShort*     nUnits_p,
-                              GXV_Validator  valid );
+                              GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_LookupTable_validate( FT_Bytes       table,
                             FT_Bytes       limit,
-                            GXV_Validator  valid );
+                            GXV_Validator  gxvalid );
 
 
   /*************************************************************************/
@@ -391,7 +391,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( FT_Int )
   gxv_glyphid_validate( FT_UShort      gid,
-                        GXV_Validator  valid );
+                        GXV_Validator  gxvalid );
 
 
   /*************************************************************************/
@@ -405,7 +405,7 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   gxv_ctlPoint_validate( FT_UShort      gid,
                          FT_Short       ctl_point,
-                         GXV_Validator  valid );
+                         GXV_Validator  gxvalid );
 
 
   /*************************************************************************/
@@ -420,7 +420,7 @@ FT_BEGIN_HEADER
   gxv_sfntName_validate( FT_UShort      name_index,
                          FT_UShort      min_index,
                          FT_UShort      max_index,
-                         GXV_Validator  valid );
+                         GXV_Validator  gxvalid );
 
 
   /*************************************************************************/
@@ -439,7 +439,7 @@ FT_BEGIN_HEADER
                                  FT_UShort*     classTable_length_p,
                                  FT_UShort*     stateArray_length_p,
                                  FT_UShort*     entryTable_length_p,
-                                 GXV_Validator  valid );
+                                 GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_XStateTable_subtable_setup( FT_ULong       table_size,
@@ -449,17 +449,17 @@ FT_BEGIN_HEADER
                                   FT_ULong*      classTable_length_p,
                                   FT_ULong*      stateArray_length_p,
                                   FT_ULong*      entryTable_length_p,
-                                  GXV_Validator  valid );
+                                  GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_StateTable_validate( FT_Bytes       table,
                            FT_Bytes       limit,
-                           GXV_Validator  valid );
+                           GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_XStateTable_validate( FT_Bytes       table,
                             FT_Bytes       limit,
-                            GXV_Validator  valid );
+                            GXV_Validator  gxvalid );
 
 
   /*************************************************************************/
@@ -475,14 +475,14 @@ FT_BEGIN_HEADER
                             FT_Bytes       limit,
                             FT_Byte*       min,
                             FT_Byte*       max,
-                            GXV_Validator  valid );
+                            GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_array_getlimits_ushort( FT_Bytes       table,
                               FT_Bytes       limit,
                               FT_UShort*     min,
                               FT_UShort*     max,
-                              GXV_Validator  valid );
+                              GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_set_length_by_ushort_offset( FT_UShort*     offset,
@@ -490,7 +490,7 @@ FT_BEGIN_HEADER
                                    FT_UShort*     buff,
                                    FT_UInt        nmemb,
                                    FT_UShort      limit,
-                                   GXV_Validator  valid );
+                                   GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_set_length_by_ulong_offset( FT_ULong*      offset,
@@ -498,19 +498,19 @@ FT_BEGIN_HEADER
                                   FT_ULong*      buff,
                                   FT_UInt        nmemb,
                                   FT_ULong       limit,
-                                  GXV_Validator  valid);
+                                  GXV_Validator  gxvalid);
 
 
 #define GXV_SUBTABLE_OFFSET_CHECK( _offset )          \
           FT_BEGIN_STMNT                              \
-            if ( (_offset) > valid->subtable_length ) \
+            if ( (_offset) > gxvalid->subtable_length ) \
               FT_INVALID_OFFSET;                      \
           FT_END_STMNT
 
 #define GXV_SUBTABLE_LIMIT_CHECK( _count )                  \
           FT_BEGIN_STMNT                                    \
-            if ( ( p + (_count) - valid->subtable_start ) > \
-                   valid->subtable_length )                 \
+            if ( ( p + (_count) - gxvalid->subtable_start ) > \
+                   gxvalid->subtable_length )                 \
               FT_INVALID_TOO_SHORT;                         \
           FT_END_STMNT
 
@@ -556,7 +556,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   gxv_odtect_validate( GXV_odtect_Range  odtect,
-                       GXV_Validator     valid );
+                       GXV_Validator     gxvalid );
 
 
 #define GXV_ODTECT( n, odtect )                              \
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxverror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxverror.h
index c573b72de7d..c573b72de7d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxverror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxverror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfeat.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfeat.c
index 6f75650991a..69298b2869a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfeat.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfeat.c
@@ -82,7 +82,7 @@
   gxv_feat_registry_validate( FT_UShort      feature,
                               FT_UShort      nSettings,
                               FT_Bool        exclusive,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     GXV_NAME_ENTER( "feature in registry" );
 
@@ -108,7 +108,7 @@
     {
       /* Don't use here. Apple is reserved. */
       GXV_TRACE(( "feature number %d is reserved by Apple\n", feature ));
-      if ( valid->root->level >= FT_VALIDATE_TIGHT )
+      if ( gxvalid->root->level >= FT_VALIDATE_TIGHT )
         FT_INVALID_DATA;
     }
 
@@ -117,7 +117,7 @@
       GXV_TRACE(( "feature %d: nSettings %d != defined nSettings %d\n",
                   feature, nSettings,
                   gxv_feat_registry[feature].nSettings ));
-      if ( valid->root->level >= FT_VALIDATE_TIGHT )
+      if ( gxvalid->root->level >= FT_VALIDATE_TIGHT )
         FT_INVALID_DATA;
     }
 
@@ -125,7 +125,7 @@
     {
       GXV_TRACE(( "exclusive flag %d differs from predefined value\n",
                   exclusive ));
-      if ( valid->root->level >= FT_VALIDATE_TIGHT )
+      if ( gxvalid->root->level >= FT_VALIDATE_TIGHT )
         FT_INVALID_DATA;
     }
 
@@ -137,7 +137,7 @@
   static void
   gxv_feat_name_index_validate( FT_Bytes       table,
                                 FT_Bytes       limit,
-                                GXV_Validator  valid )
+                                GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -153,7 +153,7 @@
     gxv_sfntName_validate( (FT_UShort)nameIndex,
                            255,
                            32768U,
-                           valid );
+                           gxvalid );
 
     GXV_EXIT;
   }
@@ -163,7 +163,7 @@
   gxv_feat_setting_validate( FT_Bytes       table,
                              FT_Bytes       limit,
                              FT_Bool        exclusive,
-                             GXV_Validator  valid )
+                             GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  setting;
@@ -179,7 +179,7 @@
     if ( exclusive && ( setting & 1 ) == 0 )
       FT_INVALID_DATA;
 
-    gxv_feat_name_index_validate( p, limit, valid );
+    gxv_feat_name_index_validate( p, limit, gxvalid );
 
     GXV_FEAT_DATA( setting ) = setting;
 
@@ -190,7 +190,7 @@
   static void
   gxv_feat_name_validate( FT_Bytes       table,
                           FT_Bytes       limit,
-                          GXV_Validator  valid )
+                          GXV_Validator  gxvalid )
   {
     FT_Bytes   p             = table;
     FT_UInt    reserved_size = GXV_FEAT_DATA( reserved_size );
@@ -240,14 +240,14 @@
         FT_INVALID_FORMAT;
     }
 
-    gxv_feat_registry_validate( feature, nSettings, exclusive, valid );
+    gxv_feat_registry_validate( feature, nSettings, exclusive, gxvalid );
 
-    gxv_feat_name_index_validate( p, limit, valid );
+    gxv_feat_name_index_validate( p, limit, gxvalid );
 
-    p = valid->root->base + settingTable;
+    p = gxvalid->root->base + settingTable;
     for ( last_setting = -1, i = 0; i < nSettings; i++ )
     {
-      gxv_feat_setting_validate( p, limit, exclusive, valid );
+      gxv_feat_setting_validate( p, limit, exclusive, gxvalid );
 
       if ( (FT_Int)GXV_FEAT_DATA( setting ) <= last_setting )
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_FORMAT );
@@ -274,8 +274,8 @@
                      FT_Face       face,
                      FT_Validator  ftvalid )
   {
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
 
     GXV_feat_DataRec  featrec;
     GXV_feat_Data     feat = &featrec;
@@ -289,9 +289,9 @@
     FT_Int            last_feature;
 
 
-    valid->root       = ftvalid;
-    valid->table_data = feat;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = feat;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `feat' table\n" ));
     GXV_INIT;
@@ -323,7 +323,7 @@
 
     for ( last_feature = -1, i = 0; i < featureNameCount; i++ )
     {
-      gxv_feat_name_validate( p, limit, valid );
+      gxv_feat_name_validate( p, limit, gxvalid );
 
       if ( (FT_Int)GXV_FEAT_DATA( feature ) <= last_feature )
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_FORMAT );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfeat.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfeat.h
index 049d23a0b92..049d23a0b92 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfeat.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfeat.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfgen.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfgen.c
index e48778a2a15..e48778a2a15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvfgen.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvfgen.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvjust.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvjust.c
index 7816e0b7fb8..24c26a56554 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvjust.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvjust.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT just table validation (body).                         */
 /*                                                                         */
-/*  Copyright 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K.,       */
+/*  Copyright 2005, 2014 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -69,14 +69,14 @@
   static void
   gxv_just_check_max_gid( FT_UShort         gid,
                           const FT_String*  msg_tag,
-                          GXV_Validator     valid )
+                          GXV_Validator     gxvalid )
   {
-    if ( gid < valid->face->num_glyphs )
+    if ( gid < gxvalid->face->num_glyphs )
       return;
 
     GXV_TRACE(( "just table includes too large %s"
                 " GID=%d > %d (in maxp)\n",
-                msg_tag, gid, valid->face->num_glyphs ));
+                msg_tag, gid, gxvalid->face->num_glyphs ));
     GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
   }
 
@@ -84,7 +84,7 @@
   static void
   gxv_just_wdp_entry_validate( FT_Bytes       table,
                                FT_Bytes       limit,
-                               GXV_Validator  valid )
+                               GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_ULong   justClass;
@@ -112,7 +112,7 @@
 #endif
 
     /* According to Apple spec, only 7bits in justClass is used */
-    if ( ( justClass & 0xFFFFFF80 ) != 0 )
+    if ( ( justClass & 0xFFFFFF80UL ) != 0 )
     {
       GXV_TRACE(( "just table includes non-zero value"
                   " in unused justClass higher bits"
@@ -120,14 +120,14 @@
       GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_just_wdc_entry_validate( FT_Bytes       table,
                                FT_Bytes       limit,
-                               GXV_Validator  valid )
+                               GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
     FT_ULong  count, i;
@@ -138,18 +138,18 @@
     for ( i = 0; i < count; i++ )
     {
       GXV_TRACE(( "validating wdc pair %d/%d\n", i + 1, count ));
-      gxv_just_wdp_entry_validate( p, limit, valid );
-      p += valid->subtable_length;
+      gxv_just_wdp_entry_validate( p, limit, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_just_widthDeltaClusters_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes  p         = table ;
     FT_Bytes  wdc_end   = table + GXV_JUST_DATA( wdc_offset_max );
@@ -163,11 +163,11 @@
 
     for ( i = 0; p <= wdc_end; i++ )
     {
-      gxv_just_wdc_entry_validate( p, limit, valid );
-      p += valid->subtable_length;
+      gxv_just_wdc_entry_validate( p, limit, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -176,7 +176,7 @@
   static void
   gxv_just_actSubrecord_type0_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
 
@@ -214,17 +214,17 @@
 
       GXV_LIMIT_CHECK( 2 );
       glyphs = FT_NEXT_USHORT( p );
-      gxv_just_check_max_gid( glyphs, "type0:glyphs", valid );
+      gxv_just_check_max_gid( glyphs, "type0:glyphs", gxvalid );
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_just_actSubrecord_type1_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  addGlyph;
@@ -233,20 +233,20 @@
     GXV_LIMIT_CHECK( 2 );
     addGlyph = FT_NEXT_USHORT( p );
 
-    gxv_just_check_max_gid( addGlyph, "type1:addGlyph", valid );
+    gxv_just_check_max_gid( addGlyph, "type1:addGlyph", gxvalid );
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_just_actSubrecord_type2_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
 #ifdef GXV_LOAD_UNUSED_VARS
-    FT_Fixed   substThreshhold; /* Apple misspelled "Threshhold" */
+    FT_Fixed      substThreshhold; /* Apple misspelled "Threshhold" */
 #endif
     FT_UShort  addGlyph;
     FT_UShort  substGlyph;
@@ -262,18 +262,18 @@
     substGlyph      = FT_NEXT_USHORT( p );
 
     if ( addGlyph != 0xFFFF )
-      gxv_just_check_max_gid( addGlyph, "type2:addGlyph", valid );
+      gxv_just_check_max_gid( addGlyph, "type2:addGlyph", gxvalid );
 
-    gxv_just_check_max_gid( substGlyph, "type2:substGlyph", valid );
+    gxv_just_check_max_gid( substGlyph, "type2:substGlyph", gxvalid );
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
   static void
   gxv_just_actSubrecord_type4_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
     FT_ULong  variantsAxis;
@@ -288,9 +288,9 @@
     noStretchValue = FT_NEXT_ULONG( p );
     maximumLimit   = FT_NEXT_ULONG( p );
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
-    if ( variantsAxis != 0x64756374 ) /* 'duct' */
+    if ( variantsAxis != 0x64756374L ) /* 'duct' */
       GXV_TRACE(( "variantsAxis 0x%08x is non default value",
                    variantsAxis ));
 
@@ -310,7 +310,7 @@
   static void
   gxv_just_actSubrecord_type5_validate( FT_Bytes       table,
                                         FT_Bytes       limit,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  flags;
@@ -324,9 +324,9 @@
     if ( flags )
       GXV_TRACE(( "type5: nonzero value 0x%04x in unused flags\n",
                    flags ));
-    gxv_just_check_max_gid( glyph, "type5:glyph", valid );
+    gxv_just_check_max_gid( glyph, "type5:glyph", gxvalid );
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
   }
 
 
@@ -334,7 +334,7 @@
   static void
   gxv_just_actSubrecord_validate( FT_Bytes       table,
                                   FT_Bytes       limit,
-                                  GXV_Validator  valid )
+                                  GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  actionClass;
@@ -354,21 +354,21 @@
       GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
 
     if ( actionType == 0 )
-      gxv_just_actSubrecord_type0_validate( p, limit, valid );
+      gxv_just_actSubrecord_type0_validate( p, limit, gxvalid );
     else if ( actionType == 1 )
-      gxv_just_actSubrecord_type1_validate( p, limit, valid );
+      gxv_just_actSubrecord_type1_validate( p, limit, gxvalid );
     else if ( actionType == 2 )
-      gxv_just_actSubrecord_type2_validate( p, limit, valid );
+      gxv_just_actSubrecord_type2_validate( p, limit, gxvalid );
     else if ( actionType == 3 )
       ;                         /* Stretch glyph action: no actionData */
     else if ( actionType == 4 )
-      gxv_just_actSubrecord_type4_validate( p, limit, valid );
+      gxv_just_actSubrecord_type4_validate( p, limit, gxvalid );
     else if ( actionType == 5 )
-      gxv_just_actSubrecord_type5_validate( p, limit, valid );
+      gxv_just_actSubrecord_type5_validate( p, limit, gxvalid );
     else
       FT_INVALID_DATA;
 
-    valid->subtable_length = actionLength;
+    gxvalid->subtable_length = actionLength;
 
     GXV_EXIT;
   }
@@ -377,7 +377,7 @@
   static void
   gxv_just_pcActionRecord_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
     FT_ULong  actionCount;
@@ -390,11 +390,11 @@
 
     for ( i = 0; i < actionCount; i++ )
     {
-      gxv_just_actSubrecord_validate( p, limit, valid );
-      p += valid->subtable_length;
+      gxv_just_actSubrecord_validate( p, limit, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -403,7 +403,7 @@
   static void
   gxv_just_pcTable_LookupValue_entry_validate( FT_UShort            glyph,
                                                GXV_LookupValueCPtr  value_p,
-                                               GXV_Validator        valid )
+                                               GXV_Validator        gxvalid )
   {
     FT_UNUSED( glyph );
 
@@ -417,19 +417,19 @@
   static void
   gxv_just_pcLookupTable_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
-    FT_Bytes p = table;
+    FT_Bytes  p = table;
 
 
     GXV_NAME_ENTER( "just pcLookupTable" );
     GXV_JUST_DATA( pc_offset_max ) = 0x0000;
     GXV_JUST_DATA( pc_offset_min ) = 0xFFFFU;
 
-    valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func = gxv_just_pcTable_LookupValue_entry_validate;
+    gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func = gxv_just_pcTable_LookupValue_entry_validate;
 
-    gxv_LookupTable_validate( p, limit, valid );
+    gxv_LookupTable_validate( p, limit, gxvalid );
 
     /* subtable_length is set by gxv_LookupTable_validate() */
 
@@ -440,20 +440,20 @@
   static void
   gxv_just_postcompTable_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
 
     GXV_NAME_ENTER( "just postcompTable" );
 
-    gxv_just_pcLookupTable_validate( p, limit, valid );
-    p += valid->subtable_length;
+    gxv_just_pcLookupTable_validate( p, limit, gxvalid );
+    p += gxvalid->subtable_length;
 
-    gxv_just_pcActionRecord_validate( p, limit, valid );
-    p += valid->subtable_length;
+    gxv_just_pcActionRecord_validate( p, limit, gxvalid );
+    p += gxvalid->subtable_length;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -466,7 +466,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     /* TODO: validate markClass & currentClass */
@@ -480,7 +480,7 @@
     FT_UNUSED( glyphOffset_p );
     FT_UNUSED( table );
     FT_UNUSED( limit );
-    FT_UNUSED( valid );
+    FT_UNUSED( gxvalid );
 
 #ifndef GXV_LOAD_UNUSED_VARS
     FT_UNUSED( flags );
@@ -496,7 +496,7 @@
   static void
   gxv_just_justClassTable_validate ( FT_Bytes       table,
                                      FT_Bytes       limit,
-                                     GXV_Validator  valid )
+                                     GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  length;
@@ -521,14 +521,14 @@
       GXV_TRACE(( "  justClassTable: nonzero value (0x%08x)"
                   " in unused subFeatureFlags\n", subFeatureFlags ));
 
-    valid->statetable.optdata               = NULL;
-    valid->statetable.optdata_load_func     = NULL;
-    valid->statetable.subtable_setup_func   = NULL;
-    valid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
-    valid->statetable.entry_validate_func   =
+    gxvalid->statetable.optdata               = NULL;
+    gxvalid->statetable.optdata_load_func     = NULL;
+    gxvalid->statetable.subtable_setup_func   = NULL;
+    gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
+    gxvalid->statetable.entry_validate_func   =
       gxv_just_classTable_entry_validate;
 
-    gxv_StateTable_validate( p, table + length, valid );
+    gxv_StateTable_validate( p, table + length, gxvalid );
 
     /* subtable_length is set by gxv_LookupTable_validate() */
 
@@ -539,7 +539,7 @@
   static void
   gxv_just_wdcTable_LookupValue_validate( FT_UShort            glyph,
                                           GXV_LookupValueCPtr  value_p,
-                                          GXV_Validator        valid )
+                                          GXV_Validator        gxvalid )
   {
     FT_UNUSED( glyph );
 
@@ -553,7 +553,7 @@
   static void
   gxv_just_justData_lookuptable_validate( FT_Bytes       table,
                                           FT_Bytes       limit,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -561,10 +561,10 @@
     GXV_JUST_DATA( wdc_offset_max ) = 0x0000;
     GXV_JUST_DATA( wdc_offset_min ) = 0xFFFFU;
 
-    valid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func = gxv_just_wdcTable_LookupValue_validate;
+    gxvalid->lookupval_sign = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func = gxv_just_wdcTable_LookupValue_validate;
 
-    gxv_LookupTable_validate( p, limit, valid );
+    gxv_LookupTable_validate( p, limit, gxvalid );
 
     /* subtable_length is set by gxv_LookupTable_validate() */
 
@@ -578,7 +578,7 @@
   static void
   gxv_just_justData_validate( FT_Bytes       table,
                               FT_Bytes       limit,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     /*
      * following 3 offsets are measured from the start of `just'
@@ -604,36 +604,36 @@
     GXV_TRACE(( " (wdcTableOffset = 0x%04x)\n", wdcTableOffset ));
     GXV_TRACE(( " (pcTableOffset = 0x%04x)\n", pcTableOffset ));
 
-    gxv_just_justData_lookuptable_validate( p, limit, valid );
-    gxv_odtect_add_range( p, valid->subtable_length,
+    gxv_just_justData_lookuptable_validate( p, limit, gxvalid );
+    gxv_odtect_add_range( p, gxvalid->subtable_length,
                           "just_LookupTable", odtect );
 
     if ( wdcTableOffset )
     {
       gxv_just_widthDeltaClusters_validate(
-        valid->root->base + wdcTableOffset, limit, valid );
-      gxv_odtect_add_range( valid->root->base + wdcTableOffset,
-                            valid->subtable_length, "just_wdcTable", odtect );
+        gxvalid->root->base + wdcTableOffset, limit, gxvalid );
+      gxv_odtect_add_range( gxvalid->root->base + wdcTableOffset,
+                            gxvalid->subtable_length, "just_wdcTable", odtect );
     }
 
     if ( pcTableOffset )
     {
-      gxv_just_postcompTable_validate( valid->root->base + pcTableOffset,
-                                       limit, valid );
-      gxv_odtect_add_range( valid->root->base + pcTableOffset,
-                            valid->subtable_length, "just_pcTable", odtect );
+      gxv_just_postcompTable_validate( gxvalid->root->base + pcTableOffset,
+                                       limit, gxvalid );
+      gxv_odtect_add_range( gxvalid->root->base + pcTableOffset,
+                            gxvalid->subtable_length, "just_pcTable", odtect );
     }
 
     if ( justClassTableOffset )
     {
       gxv_just_justClassTable_validate(
-        valid->root->base + justClassTableOffset, limit, valid );
-      gxv_odtect_add_range( valid->root->base + justClassTableOffset,
-                            valid->subtable_length, "just_justClassTable",
+        gxvalid->root->base + justClassTableOffset, limit, gxvalid );
+      gxv_odtect_add_range( gxvalid->root->base + justClassTableOffset,
+                            gxvalid->subtable_length, "just_justClassTable",
                             odtect );
     }
 
-    gxv_odtect_validate( odtect, valid );
+    gxv_odtect_validate( odtect, gxvalid );
 
     GXV_EXIT;
   }
@@ -647,8 +647,8 @@
     FT_Bytes           p     = table;
     FT_Bytes           limit = 0;
 
-    GXV_ValidatorRec   validrec;
-    GXV_Validator      valid = &validrec;
+    GXV_ValidatorRec   gxvalidrec;
+    GXV_Validator      gxvalid = &gxvalidrec;
     GXV_just_DataRec   justrec;
     GXV_just_Data      just = &justrec;
 
@@ -662,14 +662,14 @@
 
     GXV_ODTECT_INIT( odtect );
 
-    valid->root       = ftvalid;
-    valid->table_data = just;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = just;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `just' table\n" ));
     GXV_INIT;
 
-    limit      = valid->root->limit;
+    limit      = gxvalid->root->limit;
 
     GXV_LIMIT_CHECK( 4 + 2 + 2 + 2 );
     version     = FT_NEXT_ULONG( p );
@@ -696,19 +696,19 @@
     /* validate justData */
     if ( 0 < horizOffset )
     {
-      gxv_just_justData_validate( table + horizOffset, limit, valid );
-      gxv_odtect_add_range( table + horizOffset, valid->subtable_length,
+      gxv_just_justData_validate( table + horizOffset, limit, gxvalid );
+      gxv_odtect_add_range( table + horizOffset, gxvalid->subtable_length,
                             "horizJustData", odtect );
     }
 
     if ( 0 < vertOffset )
     {
-      gxv_just_justData_validate( table + vertOffset, limit, valid );
-      gxv_odtect_add_range( table + vertOffset, valid->subtable_length,
+      gxv_just_justData_validate( table + vertOffset, limit, gxvalid );
+      gxv_odtect_add_range( table + vertOffset, gxvalid->subtable_length,
                             "vertJustData", odtect );
     }
 
-    gxv_odtect_validate( odtect, valid );
+    gxv_odtect_validate( odtect, gxvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvkern.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvkern.c
index 557c5f1fe4e..787e3db8303 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvkern.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvkern.c
@@ -79,20 +79,20 @@
 
 #define GXV_KERN_DATA( field )  GXV_TABLE_DATA( kern, field )
 
-#define KERN_IS_CLASSIC( valid )                               \
+#define KERN_IS_CLASSIC( gxvalid )                               \
           ( KERN_VERSION_CLASSIC == GXV_KERN_DATA( version ) )
-#define KERN_IS_NEW( valid )                                   \
+#define KERN_IS_NEW( gxvalid )                                   \
           ( KERN_VERSION_NEW     == GXV_KERN_DATA( version ) )
 
-#define KERN_DIALECT( valid )              \
+#define KERN_DIALECT( gxvalid )              \
           GXV_KERN_DATA( dialect_request )
-#define KERN_ALLOWS_MS( valid )                       \
-          ( KERN_DIALECT( valid ) & KERN_DIALECT_MS )
-#define KERN_ALLOWS_APPLE( valid )                       \
-          ( KERN_DIALECT( valid ) & KERN_DIALECT_APPLE )
+#define KERN_ALLOWS_MS( gxvalid )                       \
+          ( KERN_DIALECT( gxvalid ) & KERN_DIALECT_MS )
+#define KERN_ALLOWS_APPLE( gxvalid )                       \
+          ( KERN_DIALECT( gxvalid ) & KERN_DIALECT_APPLE )
 
-#define GXV_KERN_HEADER_SIZE           ( KERN_IS_NEW( valid ) ? 8 : 4 )
-#define GXV_KERN_SUBTABLE_HEADER_SIZE  ( KERN_IS_NEW( valid ) ? 8 : 6 )
+#define GXV_KERN_HEADER_SIZE           ( KERN_IS_NEW( gxvalid ) ? 8 : 4 )
+#define GXV_KERN_SUBTABLE_HEADER_SIZE  ( KERN_IS_NEW( gxvalid ) ? 8 : 6 )
 
 
   /*************************************************************************/
@@ -110,7 +110,7 @@
   gxv_kern_subtable_fmt0_pairs_validate( FT_Bytes       table,
                                          FT_Bytes       limit,
                                          FT_UShort      nPairs,
-                                         GXV_Validator  valid )
+                                         GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  i;
@@ -134,11 +134,11 @@
 
       /* left */
       gid_left  = FT_NEXT_USHORT( p );
-      gxv_glyphid_validate( gid_left, valid );
+      gxv_glyphid_validate( gid_left, gxvalid );
 
       /* right */
       gid_right = FT_NEXT_USHORT( p );
-      gxv_glyphid_validate( gid_right, valid );
+      gxv_glyphid_validate( gid_right, gxvalid );
 
       /* Pairs of left and right GIDs must be unique and sorted. */
       GXV_TRACE(( "left gid = %u, right gid = %u\n", gid_left, gid_right ));
@@ -171,7 +171,7 @@
   static void
   gxv_kern_subtable_fmt0_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table + GXV_KERN_SUBTABLE_HEADER_SIZE;
 
@@ -186,10 +186,10 @@
 
     /* nPairs, searchRange, entrySelector, rangeShift */
     GXV_LIMIT_CHECK( 2 + 2 + 2 + 2 );
-    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nPairs, valid );
+    gxv_BinSrchHeader_validate( p, limit, &unitSize, &nPairs, gxvalid );
     p += 2 + 2 + 2 + 2;
 
-    gxv_kern_subtable_fmt0_pairs_validate( p, limit, nPairs, valid );
+    gxv_kern_subtable_fmt0_pairs_validate( p, limit, nPairs, gxvalid );
 
     GXV_EXIT;
   }
@@ -209,11 +209,11 @@
   static void
   gxv_kern_subtable_fmt1_valueTable_load( FT_Bytes       table,
                                           FT_Bytes       limit,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_Bytes                       p = table;
     GXV_kern_fmt1_StateOptRecData  optdata =
-      (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata;
+      (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata;
 
 
     GXV_LIMIT_CHECK( 2 );
@@ -232,14 +232,14 @@
                                          FT_UShort*     classTable_length_p,
                                          FT_UShort*     stateArray_length_p,
                                          FT_UShort*     entryTable_length_p,
-                                         GXV_Validator  valid )
+                                         GXV_Validator  gxvalid )
   {
     FT_UShort  o[4];
     FT_UShort  *l[4];
     FT_UShort  buff[5];
 
     GXV_kern_fmt1_StateOptRecData  optdata =
-      (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata;
+      (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata;
 
 
     o[0] = classTable;
@@ -251,7 +251,7 @@
     l[2] = entryTable_length_p;
     l[3] = &(optdata->valueTable_length);
 
-    gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, valid );
+    gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, gxvalid );
   }
 
 
@@ -265,7 +265,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_UShort  push;
@@ -289,7 +289,7 @@
 
     {
       GXV_kern_fmt1_StateOptRecData  vt_rec =
-        (GXV_kern_fmt1_StateOptRecData)valid->statetable.optdata;
+        (GXV_kern_fmt1_StateOptRecData)gxvalid->statetable.optdata;
       FT_Bytes  p;
 
 
@@ -311,7 +311,7 @@
   static void
   gxv_kern_subtable_fmt1_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     FT_Bytes                   p = table;
     GXV_kern_fmt1_StateOptRec  vt_rec;
@@ -319,18 +319,18 @@
 
     GXV_NAME_ENTER( "kern subtable format 1" );
 
-    valid->statetable.optdata =
+    gxvalid->statetable.optdata =
       &vt_rec;
-    valid->statetable.optdata_load_func =
+    gxvalid->statetable.optdata_load_func =
       gxv_kern_subtable_fmt1_valueTable_load;
-    valid->statetable.subtable_setup_func =
+    gxvalid->statetable.subtable_setup_func =
       gxv_kern_subtable_fmt1_subtable_setup;
-    valid->statetable.entry_glyphoffset_fmt =
+    gxvalid->statetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_NONE;
-    valid->statetable.entry_validate_func =
+    gxvalid->statetable.entry_validate_func =
       gxv_kern_subtable_fmt1_entry_validate;
 
-    gxv_StateTable_validate( p, limit, valid );
+    gxv_StateTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
@@ -373,7 +373,7 @@
   gxv_kern_subtable_fmt2_clstbl_validate( FT_Bytes            table,
                                           FT_Bytes            limit,
                                           GXV_kern_ClassSpec  spec,
-                                          GXV_Validator       valid )
+                                          GXV_Validator       gxvalid )
   {
     const FT_String*  tag    = GXV_KERN_FMT2_DATA( class_tag[spec] );
     GXV_odtect_Range  odtect = GXV_KERN_FMT2_DATA( odtect );
@@ -391,13 +391,13 @@
     GXV_TRACE(( " %s firstGlyph=%d, nGlyphs=%d\n",
                 tag, firstGlyph, nGlyphs ));
 
-    gxv_glyphid_validate( firstGlyph, valid );
-    gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs - 1 ), valid );
+    gxv_glyphid_validate( firstGlyph, gxvalid );
+    gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs - 1 ), gxvalid );
 
     gxv_array_getlimits_ushort( p, p + ( 2 * nGlyphs ),
                                 &( GXV_KERN_FMT2_DATA( offset_min[spec] ) ),
                                 &( GXV_KERN_FMT2_DATA( offset_max[spec] ) ),
-                                valid );
+                                gxvalid );
 
     gxv_odtect_add_range( table, 2 * nGlyphs, tag, odtect );
 
@@ -408,7 +408,7 @@
   static void
   gxv_kern_subtable_fmt2_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     GXV_ODTECT( 3, odtect );
     GXV_kern_subtable_fmt2_DataRec  fmt2_rec =
@@ -439,10 +439,10 @@
     GXV_LIMIT_CHECK( GXV_KERN_FMT2_DATA( array ) );
 
     gxv_kern_subtable_fmt2_clstbl_validate( table + leftOffsetTable, limit,
-                                            GXV_KERN_CLS_L, valid );
+                                            GXV_KERN_CLS_L, gxvalid );
 
     gxv_kern_subtable_fmt2_clstbl_validate( table + rightOffsetTable, limit,
-                                            GXV_KERN_CLS_R, valid );
+                                            GXV_KERN_CLS_R, gxvalid );
 
     if ( GXV_KERN_FMT2_DATA( offset_min[GXV_KERN_CLS_L] ) +
            GXV_KERN_FMT2_DATA( offset_min[GXV_KERN_CLS_R] )
@@ -455,7 +455,7 @@
                             - GXV_KERN_FMT2_DATA( array ),
                           "array", odtect );
 
-    gxv_odtect_validate( odtect, valid );
+    gxv_odtect_validate( odtect, gxvalid );
 
     GXV_EXIT;
   }
@@ -466,7 +466,7 @@
   static void
   gxv_kern_subtable_fmt3_validate( FT_Bytes       table,
                                    FT_Bytes       limit,
-                                   GXV_Validator  valid )
+                                   GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table + GXV_KERN_SUBTABLE_HEADER_SIZE;
     FT_UShort  glyphCount;
@@ -485,10 +485,10 @@
     rightClassCount = FT_NEXT_BYTE( p );
     flags           = FT_NEXT_BYTE( p );
 
-    if ( valid->face->num_glyphs != glyphCount )
+    if ( gxvalid->face->num_glyphs != glyphCount )
     {
       GXV_TRACE(( "maxGID=%d, but glyphCount=%d\n",
-                  valid->face->num_glyphs, glyphCount ));
+                  gxvalid->face->num_glyphs, glyphCount ));
       GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
     }
 
@@ -509,8 +509,8 @@
 
 
       GXV_LIMIT_CHECK( glyphCount );
-      gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, valid );
-      p += valid->subtable_length;
+      gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, gxvalid );
+      p += gxvalid->subtable_length;
 
       if ( leftClassCount < max )
         FT_INVALID_DATA;
@@ -524,8 +524,8 @@
 
 
       GXV_LIMIT_CHECK( glyphCount );
-      gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, valid );
-      p += valid->subtable_length;
+      gxv_array_getlimits_byte( p, p + glyphCount, &min, &max, gxvalid );
+      p += gxvalid->subtable_length;
 
       if ( rightClassCount < max )
         FT_INVALID_DATA;
@@ -549,7 +549,7 @@
       }
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -558,7 +558,7 @@
   static FT_Bool
   gxv_kern_coverage_new_apple_validate( FT_UShort      coverage,
                                         FT_UShort*     format,
-                                        GXV_Validator  valid )
+                                        GXV_Validator  gxvalid )
   {
     /* new Apple-dialect */
 #ifdef GXV_LOAD_TRACE_VARS
@@ -567,7 +567,7 @@
     FT_Bool  kernVariation;
 #endif
 
-    FT_UNUSED( valid );
+    FT_UNUSED( gxvalid );
 
 
     /* reserved bits = 0 */
@@ -595,7 +595,7 @@
   static FT_Bool
   gxv_kern_coverage_classic_apple_validate( FT_UShort      coverage,
                                             FT_UShort*     format,
-                                            GXV_Validator  valid )
+                                            GXV_Validator  gxvalid )
   {
     /* classic Apple-dialect */
 #ifdef GXV_LOAD_TRACE_VARS
@@ -605,7 +605,7 @@
 
 
     /* check expected flags, but don't check if MS-dialect is impossible */
-    if ( !( coverage & 0xFD00 ) && KERN_ALLOWS_MS( valid ) )
+    if ( !( coverage & 0xFD00 ) && KERN_ALLOWS_MS( gxvalid ) )
       return FALSE;
 
     /* reserved bits = 0 */
@@ -636,7 +636,7 @@
   static FT_Bool
   gxv_kern_coverage_classic_microsoft_validate( FT_UShort      coverage,
                                                 FT_UShort*     format,
-                                                GXV_Validator  valid )
+                                                GXV_Validator  gxvalid )
   {
     /* classic Microsoft-dialect */
 #ifdef GXV_LOAD_TRACE_VARS
@@ -646,7 +646,7 @@
     FT_Bool  override;
 #endif
 
-    FT_UNUSED( valid );
+    FT_UNUSED( gxvalid );
 
 
     /* reserved bits = 0 */
@@ -686,7 +686,7 @@
   static GXV_kern_Dialect
   gxv_kern_coverage_validate( FT_UShort      coverage,
                               FT_UShort*     format,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     GXV_kern_Dialect  result = KERN_DIALECT_UNKNOWN;
 
@@ -695,33 +695,33 @@
 
     GXV_TRACE(( "interprete coverage 0x%04x by Apple style\n", coverage ));
 
-    if ( KERN_IS_NEW( valid ) )
+    if ( KERN_IS_NEW( gxvalid ) )
     {
       if ( gxv_kern_coverage_new_apple_validate( coverage,
                                                  format,
-                                                 valid ) )
+                                                 gxvalid ) )
       {
         result = KERN_DIALECT_APPLE;
         goto Exit;
       }
     }
 
-    if ( KERN_IS_CLASSIC( valid ) && KERN_ALLOWS_APPLE( valid ) )
+    if ( KERN_IS_CLASSIC( gxvalid ) && KERN_ALLOWS_APPLE( gxvalid ) )
     {
       if ( gxv_kern_coverage_classic_apple_validate( coverage,
                                                      format,
-                                                     valid ) )
+                                                     gxvalid ) )
       {
         result = KERN_DIALECT_APPLE;
         goto Exit;
       }
     }
 
-    if ( KERN_IS_CLASSIC( valid ) && KERN_ALLOWS_MS( valid ) )
+    if ( KERN_IS_CLASSIC( gxvalid ) && KERN_ALLOWS_MS( gxvalid ) )
     {
       if ( gxv_kern_coverage_classic_microsoft_validate( coverage,
                                                          format,
-                                                         valid ) )
+                                                         gxvalid ) )
       {
         result = KERN_DIALECT_MS;
         goto Exit;
@@ -739,7 +739,7 @@
   static void
   gxv_kern_subtable_validate( FT_Bytes       table,
                               FT_Bytes       limit,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
 #ifdef GXV_LOAD_TRACE_VARS
@@ -761,7 +761,7 @@
     u16[1]   = FT_NEXT_USHORT( p ); /* Apple: length_lo MS: length */
     coverage = FT_NEXT_USHORT( p );
 
-    switch ( gxv_kern_coverage_validate( coverage, &format, valid ) )
+    switch ( gxv_kern_coverage_validate( coverage, &format, gxvalid ) )
     {
     case KERN_DIALECT_MS:
 #ifdef GXV_LOAD_TRACE_VARS
@@ -785,7 +785,7 @@
 #endif
       GXV_TRACE(( "Subtable length = %d\n", length ));
 
-      if ( KERN_IS_NEW( valid ) )
+      if ( KERN_IS_NEW( gxvalid ) )
       {
         GXV_LIMIT_CHECK( 2 );
 #ifdef GXV_LOAD_TRACE_VARS
@@ -806,18 +806,18 @@
 
     /* formats 1, 2, 3 require the position of the start of this subtable */
     if ( format == 0 )
-      gxv_kern_subtable_fmt0_validate( table, table + length, valid );
+      gxv_kern_subtable_fmt0_validate( table, table + length, gxvalid );
     else if ( format == 1 )
-      gxv_kern_subtable_fmt1_validate( table, table + length, valid );
+      gxv_kern_subtable_fmt1_validate( table, table + length, gxvalid );
     else if ( format == 2 )
-      gxv_kern_subtable_fmt2_validate( table, table + length, valid );
+      gxv_kern_subtable_fmt2_validate( table, table + length, gxvalid );
     else if ( format == 3 )
-      gxv_kern_subtable_fmt3_validate( table, table + length, valid );
+      gxv_kern_subtable_fmt3_validate( table, table + length, gxvalid );
     else
       FT_INVALID_DATA;
 
   Exit:
-    valid->subtable_length = length;
+    gxvalid->subtable_length = length;
     GXV_EXIT;
   }
 
@@ -837,8 +837,8 @@
                              GXV_kern_Dialect  dialect_request,
                              FT_Validator      ftvalid )
   {
-    GXV_ValidatorRec   validrec;
-    GXV_Validator      valid = &validrec;
+    GXV_ValidatorRec   gxvalidrec;
+    GXV_Validator      gxvalid = &gxvalidrec;
 
     GXV_kern_DataRec   kernrec;
     GXV_kern_Data      kern = &kernrec;
@@ -850,13 +850,13 @@
     FT_UInt            i;
 
 
-    valid->root       = ftvalid;
-    valid->table_data = kern;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = kern;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `kern' table\n" ));
     GXV_INIT;
-    KERN_DIALECT( valid ) = dialect_request;
+    KERN_DIALECT( gxvalid ) = dialect_request;
 
     GXV_LIMIT_CHECK( 2 );
     GXV_KERN_DATA( version ) = (GXV_kern_Version)FT_NEXT_USHORT( p );
@@ -865,12 +865,12 @@
 
     if ( 0x0001 < GXV_KERN_DATA( version ) )
       FT_INVALID_FORMAT;
-    else if ( KERN_IS_CLASSIC( valid ) )
+    else if ( KERN_IS_CLASSIC( gxvalid ) )
     {
       GXV_LIMIT_CHECK( 2 );
       nTables = FT_NEXT_USHORT( p );
     }
-    else if ( KERN_IS_NEW( valid ) )
+    else if ( KERN_IS_NEW( gxvalid ) )
     {
       if ( classic_only )
         FT_INVALID_FORMAT;
@@ -886,8 +886,8 @@
     {
       GXV_TRACE(( "validating subtable %d/%d\n", i, nTables ));
       /* p should be 32bit-aligned? */
-      gxv_kern_subtable_validate( p, 0, valid );
-      p += valid->subtable_length;
+      gxv_kern_subtable_validate( p, 0, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvlcar.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvlcar.c
index f14fa5b1313..48308b0246e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvlcar.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvlcar.c
@@ -67,14 +67,14 @@
   static void
   gxv_lcar_partial_validate( FT_UShort      partial,
                              FT_UShort      glyph,
-                             GXV_Validator  valid )
+                             GXV_Validator  gxvalid )
   {
     GXV_NAME_ENTER( "partial" );
 
     if ( GXV_LCAR_DATA( format ) != 1 )
       goto Exit;
 
-    gxv_ctlPoint_validate( glyph, partial, valid );
+    gxv_ctlPoint_validate( glyph, partial, gxvalid );
 
   Exit:
     GXV_EXIT;
@@ -84,10 +84,10 @@
   static void
   gxv_lcar_LookupValue_validate( FT_UShort            glyph,
                                  GXV_LookupValueCPtr  value_p,
-                                 GXV_Validator        valid )
+                                 GXV_Validator        gxvalid )
   {
-    FT_Bytes   p     = valid->root->base + value_p->u;
-    FT_Bytes   limit = valid->root->limit;
+    FT_Bytes   p     = gxvalid->root->base + value_p->u;
+    FT_Bytes   limit = gxvalid->root->limit;
     FT_UShort  count;
     FT_Short   partial;
     FT_UShort  i;
@@ -102,7 +102,7 @@
     for ( i = 0; i < count; i++ )
     {
       partial = FT_NEXT_SHORT( p );
-      gxv_lcar_partial_validate( partial, glyph, valid );
+      gxv_lcar_partial_validate( partial, glyph, gxvalid );
     }
 
     GXV_EXIT;
@@ -148,7 +148,7 @@
   gxv_lcar_LookupFmt4_transit( FT_UShort            relative_gindex,
                                GXV_LookupValueCPtr  base_value_p,
                                FT_Bytes             lookuptbl_limit,
-                               GXV_Validator        valid )
+                               GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -160,8 +160,8 @@
     /* XXX: check range? */
     offset = (FT_UShort)( base_value_p->u +
                           relative_gindex * sizeof ( FT_UShort ) );
-    p      = valid->root->base + offset;
-    limit  = valid->root->limit;
+    p      = gxvalid->root->base + offset;
+    limit  = gxvalid->root->limit;
 
     GXV_LIMIT_CHECK ( 2 );
     value.u = FT_NEXT_USHORT( p );
@@ -185,8 +185,8 @@
   {
     FT_Bytes          p     = table;
     FT_Bytes          limit = 0;
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
 
     GXV_lcar_DataRec  lcarrec;
     GXV_lcar_Data     lcar = &lcarrec;
@@ -194,9 +194,9 @@
     FT_Fixed          version;
 
 
-    valid->root       = ftvalid;
-    valid->table_data = lcar;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = lcar;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `lcar' table\n" ));
     GXV_INIT;
@@ -211,10 +211,10 @@
     if ( GXV_LCAR_DATA( format ) > 1 )
       FT_INVALID_FORMAT;
 
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_lcar_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_lcar_LookupFmt4_transit;
-    gxv_LookupTable_validate( p, limit, valid );
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_lcar_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_lcar_LookupFmt4_transit;
+    gxv_LookupTable_validate( p, limit, gxvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmod.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmod.c
index 278d47688ab..278d47688ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmod.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmod.h
index 22732ba9920..22732ba9920 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort.c
index c4d49b32d35..55ff5a851e0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort.c
@@ -40,7 +40,7 @@
 
   static void
   gxv_mort_feature_validate( GXV_mort_feature  f,
-                             GXV_Validator     valid )
+                             GXV_Validator     gxvalid )
   {
     if ( f->featureType >= gxv_feat_registry_length )
     {
@@ -89,7 +89,7 @@
   gxv_mort_featurearray_validate( FT_Bytes       table,
                                   FT_Bytes       limit,
                                   FT_ULong       nFeatureFlags,
-                                  GXV_Validator  valid )
+                                  GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
     FT_ULong  i;
@@ -106,22 +106,22 @@
       f.enableFlags    = FT_NEXT_ULONG( p );
       f.disableFlags   = FT_NEXT_ULONG( p );
 
-      gxv_mort_feature_validate( &f, valid );
+      gxv_mort_feature_validate( &f, gxvalid );
     }
 
     if ( !IS_GXV_MORT_FEATURE_OFF( f ) )
       FT_INVALID_DATA;
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
 
   FT_LOCAL_DEF( void )
   gxv_mort_coverage_validate( FT_UShort      coverage,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
-    FT_UNUSED( valid );
+    FT_UNUSED( gxvalid );
 
 #ifdef FT_DEBUG_LEVEL_TRACE
     if ( coverage & 0x8000U )
@@ -150,7 +150,7 @@
   gxv_mort_subtables_validate( FT_Bytes       table,
                                FT_Bytes       limit,
                                FT_UShort      nSubtables,
-                               GXV_Validator  valid )
+                               GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -198,7 +198,7 @@
       rest = length - ( 2 + 2 + 4 );
 
       GXV_LIMIT_CHECK( rest );
-      gxv_mort_coverage_validate( coverage, valid );
+      gxv_mort_coverage_validate( coverage, gxvalid );
 
       if ( type > 5 )
         FT_INVALID_FORMAT;
@@ -207,13 +207,13 @@
       if ( func == NULL )
         GXV_TRACE(( "morx type %d is reserved\n", type ));
 
-      func( p, p + rest, valid );
+      func( p, p + rest, gxvalid );
 
       p += rest;
       /* TODO: validate subFeatureFlags */
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -222,7 +222,7 @@
   static void
   gxv_mort_chain_validate( FT_Bytes       table,
                            FT_Bytes       limit,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
 #ifdef GXV_LOAD_UNUSED_VARS
@@ -246,10 +246,10 @@
     nSubtables    = FT_NEXT_USHORT( p );
 
     gxv_mort_featurearray_validate( p, table + chainLength,
-                                    nFeatureFlags, valid );
-    p += valid->subtable_length;
-    gxv_mort_subtables_validate( p, table + chainLength, nSubtables, valid );
-    valid->subtable_length = chainLength;
+                                    nFeatureFlags, gxvalid );
+    p += gxvalid->subtable_length;
+    gxv_mort_subtables_validate( p, table + chainLength, nSubtables, gxvalid );
+    gxvalid->subtable_length = chainLength;
 
     /* TODO: validate defaultFlags */
     GXV_EXIT;
@@ -261,8 +261,8 @@
                      FT_Face       face,
                      FT_Validator  ftvalid )
   {
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
     FT_Bytes          p     = table;
     FT_Bytes          limit = 0;
     FT_ULong          version;
@@ -270,9 +270,9 @@
     FT_ULong          i;
 
 
-    valid->root = ftvalid;
-    valid->face = face;
-    limit       = valid->root->limit;
+    gxvalid->root = ftvalid;
+    gxvalid->face = face;
+    limit         = gxvalid->root->limit;
 
     FT_TRACE3(( "validating `mort' table\n" ));
     GXV_INIT;
@@ -288,8 +288,8 @@
     {
       GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains ));
       GXV_32BIT_ALIGNMENT_VALIDATE( p - table );
-      gxv_mort_chain_validate( p, limit, valid );
-      p += valid->subtable_length;
+      gxv_mort_chain_validate( p, limit, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort.h
index 1e5a1f5ab68..8e62e52dbff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort.h
@@ -55,36 +55,36 @@
   gxv_mort_featurearray_validate( FT_Bytes       table,
                                   FT_Bytes       limit,
                                   FT_ULong       nFeatureFlags,
-                                  GXV_Validator  valid );
+                                  GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_coverage_validate( FT_UShort      coverage,
-                              GXV_Validator  valid );
+                              GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_subtable_type0_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_subtable_type1_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_subtable_type2_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_subtable_type4_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_mort_subtable_type5_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
 
 #endif /* __GXVMORT_H__ */
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort0.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort0.c
index b136ceda275..f19016efdba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort0.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort0.c
@@ -67,7 +67,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
     FT_UShort  markFirst;
     FT_UShort  dontAdvance;
@@ -125,7 +125,7 @@
   FT_LOCAL_DEF( void )
   gxv_mort_subtable_type0_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -135,14 +135,14 @@
 
     GXV_LIMIT_CHECK( GXV_STATETABLE_HEADER_SIZE );
 
-    valid->statetable.optdata               = NULL;
-    valid->statetable.optdata_load_func     = NULL;
-    valid->statetable.subtable_setup_func   = NULL;
-    valid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
-    valid->statetable.entry_validate_func =
+    gxvalid->statetable.optdata               = NULL;
+    gxvalid->statetable.optdata_load_func     = NULL;
+    gxvalid->statetable.subtable_setup_func   = NULL;
+    gxvalid->statetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
+    gxvalid->statetable.entry_validate_func =
       gxv_mort_subtable_type0_entry_validate;
 
-    gxv_StateTable_validate( p, limit, valid );
+    gxv_StateTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort1.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort1.c
index 1c17a5d92ad..0189504edf6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort1.c
@@ -53,12 +53,12 @@
   static void
   gxv_mort_subtable_type1_substitutionTable_load( FT_Bytes       table,
                                                   FT_Bytes       limit,
-                                                  GXV_Validator  valid )
+                                                  GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
     GXV_mort_subtable_type1_StateOptRecData  optdata =
-      (GXV_mort_subtable_type1_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type1_StateOptRecData)gxvalid->statetable.optdata;
 
 
     GXV_LIMIT_CHECK( 2 );
@@ -74,14 +74,14 @@
                                           FT_UShort*     classTable_length_p,
                                           FT_UShort*     stateArray_length_p,
                                           FT_UShort*     entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_UShort  o[4];
     FT_UShort  *l[4];
     FT_UShort  buff[5];
 
     GXV_mort_subtable_type1_StateOptRecData  optdata =
-      (GXV_mort_subtable_type1_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type1_StateOptRecData)gxvalid->statetable.optdata;
 
 
     o[0] = classTable;
@@ -93,7 +93,7 @@
     l[2] = entryTable_length_p;
     l[3] = &( optdata->substitutionTable_length );
 
-    gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, valid );
+    gxv_set_length_by_ushort_offset( o, l, buff, 4, table_size, gxvalid );
   }
 
 
@@ -102,7 +102,7 @@
     FT_Short          wordOffset,
     const FT_String*  tag,
     FT_Byte           state,
-    GXV_Validator     valid )
+    GXV_Validator     gxvalid )
   {
     FT_UShort  substTable;
     FT_UShort  substTable_limit;
@@ -113,16 +113,16 @@
 
     substTable =
       ((GXV_mort_subtable_type1_StateOptRec *)
-       (valid->statetable.optdata))->substitutionTable;
+       (gxvalid->statetable.optdata))->substitutionTable;
     substTable_limit =
       (FT_UShort)( substTable +
                    ((GXV_mort_subtable_type1_StateOptRec *)
-                    (valid->statetable.optdata))->substitutionTable_length );
+                    (gxvalid->statetable.optdata))->substitutionTable_length );
 
-    valid->min_gid = (FT_UShort)( ( substTable       - wordOffset * 2 ) / 2 );
-    valid->max_gid = (FT_UShort)( ( substTable_limit - wordOffset * 2 ) / 2 );
-    valid->max_gid = (FT_UShort)( FT_MAX( valid->max_gid,
-                                          valid->face->num_glyphs ) );
+    gxvalid->min_gid = (FT_UShort)( ( substTable       - wordOffset * 2 ) / 2 );
+    gxvalid->max_gid = (FT_UShort)( ( substTable_limit - wordOffset * 2 ) / 2 );
+    gxvalid->max_gid = (FT_UShort)( FT_MAX( gxvalid->max_gid,
+                                            gxvalid->face->num_glyphs ) );
 
     /* XXX: check range? */
 
@@ -137,7 +137,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_UShort  setMark;
@@ -169,24 +169,24 @@
     gxv_mort_subtable_type1_offset_to_subst_validate( markOffset,
                                                       "markOffset",
                                                       state,
-                                                      valid );
+                                                      gxvalid );
 
     gxv_mort_subtable_type1_offset_to_subst_validate( currentOffset,
                                                       "currentOffset",
                                                       state,
-                                                      valid );
+                                                      gxvalid );
   }
 
 
   static void
   gxv_mort_subtable_type1_substTable_validate( FT_Bytes       table,
                                                FT_Bytes       limit,
-                                               GXV_Validator  valid )
+                                               GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  num_gids = (FT_UShort)(
                  ((GXV_mort_subtable_type1_StateOptRec *)
-                  (valid->statetable.optdata))->substitutionTable_length / 2 );
+                  (gxvalid->statetable.optdata))->substitutionTable_length / 2 );
     FT_UShort  i;
 
 
@@ -202,11 +202,11 @@
       if ( dst_gid >= 0xFFFFU )
         continue;
 
-      if ( dst_gid < valid->min_gid || valid->max_gid < dst_gid )
+      if ( dst_gid < gxvalid->min_gid || gxvalid->max_gid < dst_gid )
       {
         GXV_TRACE(( "substTable include a strange gid[%d]=%d >"
                     " out of define range (%d..%d)\n",
-                    i, dst_gid, valid->min_gid, valid->max_gid ));
+                    i, dst_gid, gxvalid->min_gid, gxvalid->max_gid ));
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
       }
     }
@@ -223,7 +223,7 @@
   FT_LOCAL_DEF( void )
   gxv_mort_subtable_type1_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -234,23 +234,23 @@
 
     GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE );
 
-    valid->statetable.optdata =
+    gxvalid->statetable.optdata =
       &st_rec;
-    valid->statetable.optdata_load_func =
+    gxvalid->statetable.optdata_load_func =
       gxv_mort_subtable_type1_substitutionTable_load;
-    valid->statetable.subtable_setup_func =
+    gxvalid->statetable.subtable_setup_func =
       gxv_mort_subtable_type1_subtable_setup;
-    valid->statetable.entry_glyphoffset_fmt =
+    gxvalid->statetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_ULONG;
-    valid->statetable.entry_validate_func =
+    gxvalid->statetable.entry_validate_func =
 
       gxv_mort_subtable_type1_entry_validate;
-    gxv_StateTable_validate( p, limit, valid );
+    gxv_StateTable_validate( p, limit, gxvalid );
 
     gxv_mort_subtable_type1_substTable_validate(
       table + st_rec.substitutionTable,
       table + st_rec.substitutionTable + st_rec.substitutionTable_length,
-      valid );
+      gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort2.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort2.c
index 9e08fb792a2..099ffd48c9a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort2.c
@@ -57,11 +57,11 @@
   static void
   gxv_mort_subtable_type2_opttable_load( FT_Bytes       table,
                                          FT_Bytes       limit,
-                                         GXV_Validator  valid )
+                                         GXV_Validator  gxvalid )
   {
-    FT_Bytes p = table;
+    FT_Bytes  p = table;
     GXV_mort_subtable_type2_StateOptRecData  optdata =
-      (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata;
 
 
     GXV_LIMIT_CHECK( 2 + 2 + 2 );
@@ -86,14 +86,14 @@
                                           FT_UShort      *classTable_length_p,
                                           FT_UShort      *stateArray_length_p,
                                           FT_UShort      *entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_UShort  o[6];
     FT_UShort  *l[6];
     FT_UShort  buff[7];
 
     GXV_mort_subtable_type2_StateOptRecData  optdata =
-      (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata;
 
 
     GXV_NAME_ENTER( "subtable boundaries setup" );
@@ -111,7 +111,7 @@
     l[4] = &(optdata->componentTable_length);
     l[5] = &(optdata->ligatureTable_length);
 
-    gxv_set_length_by_ushort_offset( o, l, buff, 6, table_size, valid );
+    gxv_set_length_by_ushort_offset( o, l, buff, 6, table_size, gxvalid );
 
     GXV_TRACE(( "classTable: offset=0x%04x length=0x%04x\n",
                 classTable, *classTable_length_p ));
@@ -137,11 +137,11 @@
   gxv_mort_subtable_type2_ligActionOffset_validate(
     FT_Bytes       table,
     FT_UShort      ligActionOffset,
-    GXV_Validator  valid )
+    GXV_Validator  gxvalid )
   {
     /* access ligActionTable */
     GXV_mort_subtable_type2_StateOptRecData  optdata =
-      (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata;
 
     FT_Bytes lat_base  = table + optdata->ligActionTable;
     FT_Bytes p         = table + ligActionOffset;
@@ -214,7 +214,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_UShort setComponent;
@@ -236,16 +236,16 @@
 
     if ( 0 < offset )
       gxv_mort_subtable_type2_ligActionOffset_validate( table, offset,
-                                                        valid );
+                                                        gxvalid );
   }
 
 
   static void
   gxv_mort_subtable_type2_ligatureTable_validate( FT_Bytes       table,
-                                                  GXV_Validator  valid )
+                                                  GXV_Validator  gxvalid )
   {
     GXV_mort_subtable_type2_StateOptRecData  optdata =
-      (GXV_mort_subtable_type2_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type2_StateOptRecData)gxvalid->statetable.optdata;
 
     FT_Bytes p     = table + optdata->ligatureTable;
     FT_Bytes limit = table + optdata->ligatureTable
@@ -264,7 +264,7 @@
         GXV_LIMIT_CHECK( 2 );
         lig_gid = FT_NEXT_USHORT( p );
 
-        if ( valid->face->num_glyphs < lig_gid )
+        if ( gxvalid->face->num_glyphs < lig_gid )
           GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
       }
     }
@@ -275,7 +275,7 @@
   FT_LOCAL_DEF( void )
   gxv_mort_subtable_type2_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -286,23 +286,23 @@
 
     GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE );
 
-    valid->statetable.optdata =
+    gxvalid->statetable.optdata =
       &lig_rec;
-    valid->statetable.optdata_load_func =
+    gxvalid->statetable.optdata_load_func =
       gxv_mort_subtable_type2_opttable_load;
-    valid->statetable.subtable_setup_func =
+    gxvalid->statetable.subtable_setup_func =
       gxv_mort_subtable_type2_subtable_setup;
-    valid->statetable.entry_glyphoffset_fmt =
+    gxvalid->statetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_NONE;
-    valid->statetable.entry_validate_func =
+    gxvalid->statetable.entry_validate_func =
       gxv_mort_subtable_type2_entry_validate;
 
-    gxv_StateTable_validate( p, limit, valid );
+    gxv_StateTable_validate( p, limit, gxvalid );
 
-    p += valid->subtable_length;
-    gxv_mort_subtable_type2_ligatureTable_validate( table, valid );
+    p += gxvalid->subtable_length;
+    gxv_mort_subtable_type2_ligatureTable_validate( table, gxvalid );
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort4.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort4.c
index 83470988c09..9e86af4dd57 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort4.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort4.c
@@ -41,11 +41,11 @@
   static void
   gxv_mort_subtable_type4_lookupval_validate( FT_UShort            glyph,
                                               GXV_LookupValueCPtr  value_p,
-                                              GXV_Validator        valid )
+                                              GXV_Validator        gxvalid )
   {
     FT_UNUSED( glyph );
 
-    gxv_glyphid_validate( value_p->u, valid );
+    gxv_glyphid_validate( value_p->u, gxvalid );
   }
 
   /*
@@ -80,7 +80,7 @@
     FT_UShort            relative_gindex,
     GXV_LookupValueCPtr  base_value_p,
     FT_Bytes             lookuptbl_limit,
-    GXV_Validator        valid )
+    GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -91,7 +91,7 @@
     offset = (FT_UShort)( base_value_p->u +
                           relative_gindex * sizeof ( FT_UShort ) );
 
-    p     = valid->lookuptbl_head + offset;
+    p     = gxvalid->lookuptbl_head + offset;
     limit = lookuptbl_limit;
 
     GXV_LIMIT_CHECK( 2 );
@@ -104,7 +104,7 @@
   FT_LOCAL_DEF( void )
   gxv_mort_subtable_type4_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -112,11 +112,11 @@
     GXV_NAME_ENTER( "mort chain subtable type4 "
                     "(Non-Contextual Glyph Substitution)" );
 
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_mort_subtable_type4_lookupval_validate;
-    valid->lookupfmt4_trans = gxv_mort_subtable_type4_lookupfmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_mort_subtable_type4_lookupval_validate;
+    gxvalid->lookupfmt4_trans = gxv_mort_subtable_type4_lookupfmt4_transit;
 
-    gxv_LookupTable_validate( p, limit, valid );
+    gxv_LookupTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort5.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort5.c
index 32cfb036399..9498b10855c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmort5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmort5.c
@@ -70,10 +70,10 @@
                                           FT_UShort*     classTable_length_p,
                                           FT_UShort*     stateArray_length_p,
                                           FT_UShort*     entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     GXV_mort_subtable_type5_StateOptRecData  optdata =
-      (GXV_mort_subtable_type5_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type5_StateOptRecData)gxvalid->statetable.optdata;
 
 
     gxv_StateTable_subtable_setup( table_size,
@@ -83,7 +83,7 @@
                                    classTable_length_p,
                                    stateArray_length_p,
                                    entryTable_length_p,
-                                   valid );
+                                   gxvalid );
 
     optdata->classTable = classTable;
     optdata->stateArray = stateArray;
@@ -100,7 +100,7 @@
                                                FT_UShort      count,
                                                FT_Bytes       table,
                                                FT_Bytes       limit,
-                                               GXV_Validator  valid )
+                                               GXV_Validator  gxvalid )
   {
     /*
      * We don't know the range of insertion-glyph-list.
@@ -109,7 +109,7 @@
     FT_Bytes  p = table + offset;
 
     GXV_mort_subtable_type5_StateOptRecData  optdata =
-      (GXV_mort_subtable_type5_StateOptRecData)valid->statetable.optdata;
+      (GXV_mort_subtable_type5_StateOptRecData)gxvalid->statetable.optdata;
 
     if ( optdata->classTable < offset                                   &&
          offset < optdata->classTable + *(optdata->classTable_length_p) )
@@ -145,7 +145,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_Bool    setMark;
@@ -184,7 +184,7 @@
                                                    currentInsertCount,
                                                    table,
                                                    limit,
-                                                   valid );
+                                                   gxvalid );
     }
 
     if ( 0 != markedInsertList && 0 != markedInsertCount )
@@ -193,7 +193,7 @@
                                                    markedInsertCount,
                                                    table,
                                                    limit,
-                                                   valid );
+                                                   gxvalid );
     }
   }
 
@@ -201,7 +201,7 @@
   FT_LOCAL_DEF( void )
   gxv_mort_subtable_type5_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -213,18 +213,18 @@
 
     GXV_LIMIT_CHECK( GXV_MORT_SUBTABLE_TYPE5_HEADER_SIZE );
 
-    valid->statetable.optdata =
+    gxvalid->statetable.optdata =
       et;
-    valid->statetable.optdata_load_func =
+    gxvalid->statetable.optdata_load_func =
       NULL;
-    valid->statetable.subtable_setup_func =
+    gxvalid->statetable.subtable_setup_func =
       gxv_mort_subtable_type5_subtable_setup;
-    valid->statetable.entry_glyphoffset_fmt =
+    gxvalid->statetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_ULONG;
-    valid->statetable.entry_validate_func =
+    gxvalid->statetable.entry_validate_func =
       gxv_mort_subtable_type5_entry_validate;
 
-    gxv_StateTable_validate( p, limit, valid );
+    gxv_StateTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx.c
index 5ae04d32125..96dba631c4e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx.c
@@ -42,7 +42,7 @@
   gxv_morx_subtables_validate( FT_Bytes       table,
                                FT_Bytes       limit,
                                FT_UShort      nSubtables,
-                               GXV_Validator  valid )
+                               GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -93,7 +93,7 @@
 
       /* morx coverage consists of mort_coverage & 16bit padding */
       gxv_mort_coverage_validate( (FT_UShort)( ( coverage >> 16 ) | coverage ),
-                                  valid );
+                                  gxvalid );
       if ( type > 5 )
         FT_INVALID_FORMAT;
 
@@ -101,13 +101,13 @@
       if ( func == NULL )
         GXV_TRACE(( "morx type %d is reserved\n", type ));
 
-      func( p, p + rest, valid );
+      func( p, p + rest, gxvalid );
 
       /* TODO: subFeatureFlags should be unique in a table? */
       p += rest;
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
 
     GXV_EXIT;
   }
@@ -116,7 +116,7 @@
   static void
   gxv_morx_chain_validate( FT_Bytes       table,
                            FT_Bytes       limit,
-                           GXV_Validator  valid )
+                           GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 #ifdef GXV_LOAD_UNUSED_VARS
@@ -140,16 +140,16 @@
     nSubtables    = FT_NEXT_ULONG( p );
 
     /* feature-array of morx is same with that of mort */
-    gxv_mort_featurearray_validate( p, limit, nFeatureFlags, valid );
-    p += valid->subtable_length;
+    gxv_mort_featurearray_validate( p, limit, nFeatureFlags, gxvalid );
+    p += gxvalid->subtable_length;
 
     if ( nSubtables >= 0x10000L )
       FT_INVALID_DATA;
 
     gxv_morx_subtables_validate( p, table + chainLength,
-                                 (FT_UShort)nSubtables, valid );
+                                 (FT_UShort)nSubtables, gxvalid );
 
-    valid->subtable_length = chainLength;
+    gxvalid->subtable_length = chainLength;
 
     /* TODO: defaultFlags should be compared with the flags in tables */
 
@@ -162,8 +162,8 @@
                      FT_Face       face,
                      FT_Validator  ftvalid )
   {
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
     FT_Bytes          p     = table;
     FT_Bytes          limit = 0;
     FT_ULong          version;
@@ -171,8 +171,8 @@
     FT_ULong          i;
 
 
-    valid->root = ftvalid;
-    valid->face = face;
+    gxvalid->root = ftvalid;
+    gxvalid->face = face;
 
     FT_TRACE3(( "validating `morx' table\n" ));
     GXV_INIT;
@@ -188,8 +188,8 @@
     {
       GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains ));
       GXV_32BIT_ALIGNMENT_VALIDATE( p - table );
-      gxv_morx_chain_validate( p, limit, valid );
-      p += valid->subtable_length;
+      gxv_morx_chain_validate( p, limit, gxvalid );
+      p += gxvalid->subtable_length;
     }
 
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx.h
index 28c1a44f6fb..9ed907acd76 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx.h
@@ -38,27 +38,27 @@
   FT_LOCAL( void )
   gxv_morx_subtable_type0_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_morx_subtable_type1_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_morx_subtable_type2_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_morx_subtable_type4_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
   FT_LOCAL( void )
   gxv_morx_subtable_type5_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid );
+                                    GXV_Validator  gxvalid );
 
 
 #endif /* __GXVMORX_H__ */
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx0.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx0.c
index 6a736c17750..db165f4e892 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx0.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx0.c
@@ -45,7 +45,7 @@
     GXV_XStateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                         table,
     FT_Bytes                         limit,
-    GXV_Validator                    valid )
+    GXV_Validator                    gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_UShort  markFirst;
@@ -85,7 +85,7 @@
   FT_LOCAL_DEF( void )
   gxv_morx_subtable_type0_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -95,14 +95,14 @@
 
     GXV_LIMIT_CHECK( GXV_STATETABLE_HEADER_SIZE );
 
-    valid->xstatetable.optdata               = NULL;
-    valid->xstatetable.optdata_load_func     = NULL;
-    valid->xstatetable.subtable_setup_func   = NULL;
-    valid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
-    valid->xstatetable.entry_validate_func =
+    gxvalid->xstatetable.optdata               = NULL;
+    gxvalid->xstatetable.optdata_load_func     = NULL;
+    gxvalid->xstatetable.subtable_setup_func   = NULL;
+    gxvalid->xstatetable.entry_glyphoffset_fmt = GXV_GLYPHOFFSET_NONE;
+    gxvalid->xstatetable.entry_validate_func =
       gxv_morx_subtable_type0_entry_validate;
 
-    gxv_XStateTable_validate( p, limit, valid );
+    gxv_XStateTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx1.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx1.c
index ce0009a16f1..49f53d1854b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx1.c
@@ -55,12 +55,12 @@
   static void
   gxv_morx_subtable_type1_substitutionTable_load( FT_Bytes       table,
                                                   FT_Bytes       limit,
-                                                  GXV_Validator  valid )
+                                                  GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
     GXV_morx_subtable_type1_StateOptRecData  optdata =
-      (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     GXV_LIMIT_CHECK( 2 );
@@ -76,14 +76,14 @@
                                           FT_ULong*      classTable_length_p,
                                           FT_ULong*      stateArray_length_p,
                                           FT_ULong*      entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_ULong  o[4];
     FT_ULong  *l[4];
     FT_ULong  buff[5];
 
     GXV_morx_subtable_type1_StateOptRecData  optdata =
-      (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     o[0] = classTable;
@@ -95,7 +95,7 @@
     l[2] = entryTable_length_p;
     l[3] = &(optdata->substitutionTable_length);
 
-    gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid );
+    gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, gxvalid );
   }
 
 
@@ -106,7 +106,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_TRACE_VARS
     FT_UShort  setMark;
@@ -117,7 +117,7 @@
     FT_Short   currentIndex;
 
     GXV_morx_subtable_type1_StateOptRecData  optdata =
-      (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata;
 
     FT_UNUSED( state );
     FT_UNUSED( table );
@@ -159,13 +159,13 @@
   static void
   gxv_morx_subtable_type1_LookupValue_validate( FT_UShort            glyph,
                                                 GXV_LookupValueCPtr  value_p,
-                                                GXV_Validator        valid )
+                                                GXV_Validator        gxvalid )
   {
     FT_UNUSED( glyph ); /* for the non-debugging case */
 
     GXV_TRACE(( "morx subtable type1 subst.: %d -> %d\n", glyph, value_p->u ));
 
-    if ( value_p->u > valid->face->num_glyphs )
+    if ( value_p->u > gxvalid->face->num_glyphs )
       FT_INVALID_GLYPH_ID;
   }
 
@@ -175,7 +175,7 @@
     FT_UShort            relative_gindex,
     GXV_LookupValueCPtr  base_value_p,
     FT_Bytes             lookuptbl_limit,
-    GXV_Validator        valid )
+    GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -186,7 +186,7 @@
     offset = (FT_UShort)( base_value_p->u +
                           relative_gindex * sizeof ( FT_UShort ) );
 
-    p     = valid->lookuptbl_head + offset;
+    p     = gxvalid->lookuptbl_head + offset;
     limit = lookuptbl_limit;
 
     GXV_LIMIT_CHECK ( 2 );
@@ -202,19 +202,19 @@
   static void
   gxv_morx_subtable_type1_substitutionTable_validate( FT_Bytes       table,
                                                       FT_Bytes       limit,
-                                                      GXV_Validator  valid )
+                                                      GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  i;
 
     GXV_morx_subtable_type1_StateOptRecData  optdata =
-      (GXV_morx_subtable_type1_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type1_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     /* TODO: calculate offset/length for each lookupTables */
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_morx_subtable_type1_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_morx_subtable_type1_LookupFmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_morx_subtable_type1_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_morx_subtable_type1_LookupFmt4_transit;
 
     for ( i = 0; i < optdata->substitutionTable_num_lookupTables; i++ )
     {
@@ -224,7 +224,7 @@
       GXV_LIMIT_CHECK( 4 );
       offset = FT_NEXT_ULONG( p );
 
-      gxv_LookupTable_validate( table + offset, limit, valid );
+      gxv_LookupTable_validate( table + offset, limit, gxvalid );
     }
 
     /* TODO: overlapping of lookupTables in substitutionTable */
@@ -239,7 +239,7 @@
   FT_LOCAL_DEF( void )
   gxv_morx_subtable_type1_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -252,23 +252,23 @@
 
     st_rec.substitutionTable_num_lookupTables = 0;
 
-    valid->xstatetable.optdata =
+    gxvalid->xstatetable.optdata =
       &st_rec;
-    valid->xstatetable.optdata_load_func =
+    gxvalid->xstatetable.optdata_load_func =
       gxv_morx_subtable_type1_substitutionTable_load;
-    valid->xstatetable.subtable_setup_func =
+    gxvalid->xstatetable.subtable_setup_func =
       gxv_morx_subtable_type1_subtable_setup;
-    valid->xstatetable.entry_glyphoffset_fmt =
+    gxvalid->xstatetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_ULONG;
-    valid->xstatetable.entry_validate_func =
+    gxvalid->xstatetable.entry_validate_func =
       gxv_morx_subtable_type1_entry_validate;
 
-    gxv_XStateTable_validate( p, limit, valid );
+    gxv_XStateTable_validate( p, limit, gxvalid );
 
     gxv_morx_subtable_type1_substitutionTable_validate(
       table + st_rec.substitutionTable,
       table + st_rec.substitutionTable + st_rec.substitutionTable_length,
-      valid );
+      gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx2.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx2.c
index 95b8ea40b44..e44445d141e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx2.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx2.c
@@ -58,12 +58,12 @@
   static void
   gxv_morx_subtable_type2_opttable_load( FT_Bytes       table,
                                          FT_Bytes       limit,
-                                         GXV_Validator  valid )
+                                         GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
     GXV_morx_subtable_type2_StateOptRecData  optdata =
-      (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     GXV_LIMIT_CHECK( 4 + 4 + 4 );
@@ -88,14 +88,14 @@
                                           FT_ULong*      classTable_length_p,
                                           FT_ULong*      stateArray_length_p,
                                           FT_ULong*      entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_ULong   o[6];
     FT_ULong*  l[6];
     FT_ULong   buff[7];
 
     GXV_morx_subtable_type2_StateOptRecData  optdata =
-      (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     GXV_NAME_ENTER( "subtable boundaries setup" );
@@ -113,7 +113,7 @@
     l[4] = &(optdata->componentTable_length);
     l[5] = &(optdata->ligatureTable_length);
 
-    gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, valid );
+    gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, gxvalid );
 
     GXV_TRACE(( "classTable: offset=0x%08x length=0x%08x\n",
                 classTable, *classTable_length_p ));
@@ -142,11 +142,11 @@
   gxv_morx_subtable_type2_ligActionIndex_validate(
     FT_Bytes       table,
     FT_UShort      ligActionIndex,
-    GXV_Validator  valid )
+    GXV_Validator  gxvalid )
   {
     /* access ligActionTable */
     GXV_morx_subtable_type2_StateOptRecData optdata =
-      (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata;
 
     FT_Bytes lat_base  = table + optdata->ligActionTable;
     FT_Bytes p         = lat_base +
@@ -188,7 +188,7 @@
       /* it is different from the location offset in mort */
       if ( ( offset & 0x3FFF0000UL ) == 0x3FFF0000UL )
       { /* negative offset */
-        gid_limit = valid->face->num_glyphs - ( offset & 0x0000FFFFUL );
+        gid_limit = gxvalid->face->num_glyphs - ( offset & 0x0000FFFFUL );
         if ( gid_limit > 0 )
           return;
 
@@ -198,9 +198,9 @@
                     offset & 0xFFFFU ));
         GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
       }
-      else if ( ( offset & 0x3FFF0000UL ) == 0x0000000UL )
+      else if ( ( offset & 0x3FFF0000UL ) == 0x00000000UL )
       { /* positive offset */
-        if ( (FT_Long)offset < valid->face->num_glyphs )
+        if ( (FT_Long)offset < gxvalid->face->num_glyphs )
           return;
 
         GXV_TRACE(( "ligature action table includes"
@@ -225,7 +225,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_UShort  setComponent;
@@ -253,16 +253,16 @@
 
     if ( 0 < ligActionIndex )
       gxv_morx_subtable_type2_ligActionIndex_validate(
-        table, ligActionIndex, valid );
+        table, ligActionIndex, gxvalid );
   }
 
 
   static void
   gxv_morx_subtable_type2_ligatureTable_validate( FT_Bytes       table,
-                                                  GXV_Validator  valid )
+                                                  GXV_Validator  gxvalid )
   {
     GXV_morx_subtable_type2_StateOptRecData  optdata =
-      (GXV_morx_subtable_type2_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type2_StateOptRecData)gxvalid->xstatetable.optdata;
 
     FT_Bytes p     = table + optdata->ligatureTable;
     FT_Bytes limit = table + optdata->ligatureTable
@@ -281,7 +281,7 @@
 
         GXV_LIMIT_CHECK( 2 );
         lig_gid = FT_NEXT_USHORT( p );
-        if ( lig_gid < valid->face->num_glyphs )
+        if ( lig_gid < gxvalid->face->num_glyphs )
           GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
       }
     }
@@ -293,7 +293,7 @@
   FT_LOCAL_DEF( void )
   gxv_morx_subtable_type2_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -304,23 +304,23 @@
 
     GXV_LIMIT_CHECK( GXV_MORX_SUBTABLE_TYPE2_HEADER_SIZE );
 
-    valid->xstatetable.optdata =
+    gxvalid->xstatetable.optdata =
       &lig_rec;
-    valid->xstatetable.optdata_load_func =
+    gxvalid->xstatetable.optdata_load_func =
       gxv_morx_subtable_type2_opttable_load;
-    valid->xstatetable.subtable_setup_func =
+    gxvalid->xstatetable.subtable_setup_func =
       gxv_morx_subtable_type2_subtable_setup;
-    valid->xstatetable.entry_glyphoffset_fmt =
+    gxvalid->xstatetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_USHORT;
-    valid->xstatetable.entry_validate_func =
+    gxvalid->xstatetable.entry_validate_func =
       gxv_morx_subtable_type2_entry_validate;
 
-    gxv_XStateTable_validate( p, limit, valid );
+    gxv_XStateTable_validate( p, limit, gxvalid );
 
 #if 0
-    p += valid->subtable_length;
+    p += gxvalid->subtable_length;
 #endif
-    gxv_morx_subtable_type2_ligatureTable_validate( table, valid );
+    gxv_morx_subtable_type2_ligatureTable_validate( table, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx4.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx4.c
index c0d2f78e397..68ab6784922 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx4.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx4.c
@@ -41,12 +41,12 @@
   FT_LOCAL_DEF( void )
   gxv_morx_subtable_type4_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     GXV_NAME_ENTER( "morx chain subtable type4 "
                     "(Non-Contextual Glyph Substitution)" );
 
-    gxv_mort_subtable_type4_validate( table, limit, valid );
+    gxv_mort_subtable_type4_validate( table, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx5.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx5.c
index d8cf7007978..5e095dd3800 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvmorx5.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvmorx5.c
@@ -64,12 +64,12 @@
   static void
   gxv_morx_subtable_type5_insertionGlyphList_load( FT_Bytes       table,
                                                    FT_Bytes       limit,
-                                                   GXV_Validator  valid )
+                                                   GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
     GXV_morx_subtable_type5_StateOptRecData  optdata =
-      (GXV_morx_subtable_type5_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type5_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     GXV_LIMIT_CHECK( 4 );
@@ -85,14 +85,14 @@
                                           FT_ULong*      classTable_length_p,
                                           FT_ULong*      stateArray_length_p,
                                           FT_ULong*      entryTable_length_p,
-                                          GXV_Validator  valid )
+                                          GXV_Validator  gxvalid )
   {
     FT_ULong   o[4];
     FT_ULong*  l[4];
     FT_ULong   buff[5];
 
     GXV_morx_subtable_type5_StateOptRecData  optdata =
-      (GXV_morx_subtable_type5_StateOptRecData)valid->xstatetable.optdata;
+      (GXV_morx_subtable_type5_StateOptRecData)gxvalid->xstatetable.optdata;
 
 
     o[0] = classTable;
@@ -104,7 +104,7 @@
     l[2] = entryTable_length_p;
     l[3] = &(optdata->insertionGlyphList_length);
 
-    gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid );
+    gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, gxvalid );
   }
 
 
@@ -113,9 +113,9 @@
                                                FT_UShort      count,
                                                FT_Bytes       table,
                                                FT_Bytes       limit,
-                                               GXV_Validator  valid )
+                                               GXV_Validator  gxvalid )
   {
-    FT_Bytes p = table + table_index * 2;
+    FT_Bytes  p = table + table_index * 2;
 
 
 #ifndef GXV_LOAD_TRACE_VARS
@@ -143,7 +143,7 @@
     GXV_StateTable_GlyphOffsetCPtr  glyphOffset_p,
     FT_Bytes                        table,
     FT_Bytes                        limit,
-    GXV_Validator                   valid )
+    GXV_Validator                   gxvalid )
   {
 #ifdef GXV_LOAD_UNUSED_VARS
     FT_Bool    setMark;
@@ -180,20 +180,20 @@
       gxv_morx_subtable_type5_InsertList_validate( currentInsertList,
                                                    currentInsertCount,
                                                    table, limit,
-                                                   valid );
+                                                   gxvalid );
 
     if ( markedInsertList && 0 != markedInsertCount )
       gxv_morx_subtable_type5_InsertList_validate( markedInsertList,
                                                    markedInsertCount,
                                                    table, limit,
-                                                   valid );
+                                                   gxvalid );
   }
 
 
   FT_LOCAL_DEF( void )
   gxv_morx_subtable_type5_validate( FT_Bytes       table,
                                     FT_Bytes       limit,
-                                    GXV_Validator  valid )
+                                    GXV_Validator  gxvalid )
   {
     FT_Bytes  p = table;
 
@@ -205,18 +205,18 @@
 
     GXV_LIMIT_CHECK( GXV_MORX_SUBTABLE_TYPE5_HEADER_SIZE );
 
-    valid->xstatetable.optdata =
+    gxvalid->xstatetable.optdata =
       et;
-    valid->xstatetable.optdata_load_func =
+    gxvalid->xstatetable.optdata_load_func =
       gxv_morx_subtable_type5_insertionGlyphList_load;
-    valid->xstatetable.subtable_setup_func =
+    gxvalid->xstatetable.subtable_setup_func =
       gxv_morx_subtable_type5_subtable_setup;
-    valid->xstatetable.entry_glyphoffset_fmt =
+    gxvalid->xstatetable.entry_glyphoffset_fmt =
       GXV_GLYPHOFFSET_ULONG;
-    valid->xstatetable.entry_validate_func =
+    gxvalid->xstatetable.entry_validate_func =
       gxv_morx_subtable_type5_entry_validate;
 
-    gxv_XStateTable_validate( p, limit, valid );
+    gxv_XStateTable_validate( p, limit, gxvalid );
 
     GXV_EXIT;
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvopbd.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvopbd.c
index e1250609460..ab0cd72bf26 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvopbd.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvopbd.c
@@ -68,11 +68,11 @@
   static void
   gxv_opbd_LookupValue_validate( FT_UShort            glyph,
                                  GXV_LookupValueCPtr  value_p,
-                                 GXV_Validator        valid )
+                                 GXV_Validator        gxvalid )
   {
     /* offset in LookupTable is measured from the head of opbd table */
-    FT_Bytes   p     = valid->root->base + value_p->u;
-    FT_Bytes   limit = valid->root->limit;
+    FT_Bytes   p     = gxvalid->root->base + value_p->u;
+    FT_Bytes   limit = gxvalid->root->limit;
     FT_Short   delta_value;
     int        i;
 
@@ -90,7 +90,7 @@
         if ( delta_value == -1 )
           continue;
 
-        gxv_ctlPoint_validate( glyph, delta_value, valid );
+        gxv_ctlPoint_validate( glyph, delta_value, gxvalid );
       }
       else                              /* format 0, value is distance */
         continue;
@@ -134,12 +134,12 @@
   gxv_opbd_LookupFmt4_transit( FT_UShort            relative_gindex,
                                GXV_LookupValueCPtr  base_value_p,
                                FT_Bytes             lookuptbl_limit,
-                               GXV_Validator        valid )
+                               GXV_Validator        gxvalid )
   {
     GXV_LookupValueDesc  value;
 
     FT_UNUSED( lookuptbl_limit );
-    FT_UNUSED( valid );
+    FT_UNUSED( gxvalid );
 
     /* XXX: check range? */
     value.u = (FT_UShort)( base_value_p->u +
@@ -162,8 +162,8 @@
                      FT_Face       face,
                      FT_Validator  ftvalid )
   {
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
     GXV_opbd_DataRec  opbdrec;
     GXV_opbd_Data     opbd  = &opbdrec;
     FT_Bytes          p     = table;
@@ -172,9 +172,9 @@
     FT_ULong  version;
 
 
-    valid->root       = ftvalid;
-    valid->table_data = opbd;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = opbd;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `opbd' table\n" ));
     GXV_INIT;
@@ -196,12 +196,12 @@
     if ( 0x0001 < GXV_OPBD_DATA( format ) )
       FT_INVALID_FORMAT;
 
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_opbd_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_opbd_LookupFmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_opbd_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_opbd_LookupFmt4_transit;
 
-    gxv_LookupTable_validate( p, limit, valid );
-    p += valid->subtable_length;
+    gxv_LookupTable_validate( p, limit, gxvalid );
+    p += gxvalid->subtable_length;
 
     if ( p > table + GXV_OPBD_DATA( valueOffset_min ) )
     {
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvprop.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvprop.c
index 0be21336f86..aa5c8eed31b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvprop.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvprop.c
@@ -75,7 +75,7 @@
 
   static void
   gxv_prop_zero_advance_validate( FT_UShort      gid,
-                                  GXV_Validator  valid )
+                                  GXV_Validator  gxvalid )
   {
     FT_Face       face;
     FT_Error      error;
@@ -84,7 +84,7 @@
 
     GXV_NAME_ENTER( "zero advance" );
 
-    face = valid->face;
+    face = gxvalid->face;
 
     error = FT_Load_Glyph( face,
                            gid,
@@ -109,10 +109,10 @@
   static void
   gxv_prop_property_validate( FT_UShort      property,
                               FT_UShort      glyph,
-                              GXV_Validator  valid )
+                              GXV_Validator  gxvalid )
   {
     if ( glyph != 0 && ( property & GXV_PROP_FLOATER ) )
-      gxv_prop_zero_advance_validate( glyph, valid );
+      gxv_prop_zero_advance_validate( glyph, gxvalid );
 
     if ( property & GXV_PROP_USE_COMPLEMENTARY_BRACKET )
     {
@@ -145,7 +145,7 @@
       else
       {
         /* The gid for complement must be the face. */
-        gxv_glyphid_validate( (FT_UShort)( glyph + complement ), valid );
+        gxv_glyphid_validate( (FT_UShort)( glyph + complement ), gxvalid );
       }
     }
     else
@@ -187,9 +187,9 @@
   static void
   gxv_prop_LookupValue_validate( FT_UShort            glyph,
                                  GXV_LookupValueCPtr  value_p,
-                                 GXV_Validator        valid )
+                                 GXV_Validator        gxvalid )
   {
-    gxv_prop_property_validate( value_p->u, glyph, valid );
+    gxv_prop_property_validate( value_p->u, glyph, gxvalid );
   }
 
 
@@ -224,7 +224,7 @@
   gxv_prop_LookupFmt4_transit( FT_UShort            relative_gindex,
                                GXV_LookupValueCPtr  base_value_p,
                                FT_Bytes             lookuptbl_limit,
-                               GXV_Validator        valid )
+                               GXV_Validator        gxvalid )
   {
     FT_Bytes             p;
     FT_Bytes             limit;
@@ -234,7 +234,7 @@
     /* XXX: check range? */
     offset = (FT_UShort)( base_value_p->u +
                           relative_gindex * sizeof ( FT_UShort ) );
-    p      = valid->lookuptbl_head + offset;
+    p      = gxvalid->lookuptbl_head + offset;
     limit  = lookuptbl_limit;
 
     GXV_LIMIT_CHECK ( 2 );
@@ -259,8 +259,8 @@
   {
     FT_Bytes          p     = table;
     FT_Bytes          limit = 0;
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
 
     GXV_prop_DataRec  proprec;
     GXV_prop_Data     prop = &proprec;
@@ -270,9 +270,9 @@
     FT_UShort         defaultProp;
 
 
-    valid->root       = ftvalid;
-    valid->table_data = prop;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = prop;
+    gxvalid->face       = face;
 
     FT_TRACE3(( "validating `prop' table\n" ));
     GXV_INIT;
@@ -303,7 +303,7 @@
       FT_INVALID_FORMAT;
     }
 
-    gxv_prop_property_validate( defaultProp, 0, valid );
+    gxv_prop_property_validate( defaultProp, 0, gxvalid );
 
     if ( format == 0 )
     {
@@ -315,11 +315,11 @@
     /* format == 1 */
     GXV_PROP_DATA( version ) = version;
 
-    valid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
-    valid->lookupval_func   = gxv_prop_LookupValue_validate;
-    valid->lookupfmt4_trans = gxv_prop_LookupFmt4_transit;
+    gxvalid->lookupval_sign   = GXV_LOOKUPVALUE_UNSIGNED;
+    gxvalid->lookupval_func   = gxv_prop_LookupValue_validate;
+    gxvalid->lookupfmt4_trans = gxv_prop_LookupFmt4_transit;
 
-    gxv_LookupTable_validate( p, limit, valid );
+    gxv_LookupTable_validate( p, limit, gxvalid );
 
   Exit:
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvtrak.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvtrak.c
index 11fbd7ccfb8..3ec1a56739b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/gxvtrak.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/gxvtrak.c
@@ -93,9 +93,9 @@
   gxv_trak_trackTable_validate( FT_Bytes       table,
                                 FT_Bytes       limit,
                                 FT_UShort      nTracks,
-                                GXV_Validator  valid )
+                                GXV_Validator  gxvalid )
   {
-    FT_Bytes   p = table;
+    FT_Bytes  p = table;
 
     FT_Fixed   track, t;
     FT_UShort  nameIndex;
@@ -122,7 +122,7 @@
       if ( offset > GXV_TRAK_DATA( trackValueOffset_max ) )
         GXV_TRAK_DATA( trackValueOffset_max ) = offset;
 
-      gxv_sfntName_validate( nameIndex, 256, 32767, valid );
+      gxv_sfntName_validate( nameIndex, 256, 32767, gxvalid );
 
       for ( j = i; j < nTracks; j ++ )
       {
@@ -134,7 +134,7 @@
       }
     }
 
-    valid->subtable_length = p - table;
+    gxvalid->subtable_length = p - table;
     GXV_EXIT;
   }
 
@@ -142,7 +142,7 @@
   static void
   gxv_trak_trackData_validate( FT_Bytes       table,
                                FT_Bytes       limit,
-                               GXV_Validator  valid )
+                               GXV_Validator  gxvalid )
   {
     FT_Bytes   p = table;
     FT_UShort  nTracks;
@@ -164,31 +164,31 @@
     gxv_odtect_add_range( table, p - table, "trackData header", odtect );
 
     /* validate trackTable */
-    gxv_trak_trackTable_validate( p, limit, nTracks, valid );
-    gxv_odtect_add_range( p, valid->subtable_length,
+    gxv_trak_trackTable_validate( p, limit, nTracks, gxvalid );
+    gxv_odtect_add_range( p, gxvalid->subtable_length,
                           "trackTable", odtect );
 
     /* sizeTable is array of FT_Fixed, don't check contents */
-    p = valid->root->base + sizeTableOffset;
+    p = gxvalid->root->base + sizeTableOffset;
     GXV_LIMIT_CHECK( nSizes * 4 );
     gxv_odtect_add_range( p, nSizes * 4, "sizeTable", odtect );
 
     /* validate trackValueOffet */
-    p = valid->root->base + GXV_TRAK_DATA( trackValueOffset_min );
+    p = gxvalid->root->base + GXV_TRAK_DATA( trackValueOffset_min );
     if ( limit - p < nTracks * nSizes * 2 )
       GXV_TRACE(( "too short trackValue array\n" ));
 
-    p = valid->root->base + GXV_TRAK_DATA( trackValueOffset_max );
+    p = gxvalid->root->base + GXV_TRAK_DATA( trackValueOffset_max );
     GXV_LIMIT_CHECK( nSizes * 2 );
 
-    gxv_odtect_add_range( valid->root->base
+    gxv_odtect_add_range( gxvalid->root->base
                             + GXV_TRAK_DATA( trackValueOffset_min ),
                           GXV_TRAK_DATA( trackValueOffset_max )
                             - GXV_TRAK_DATA( trackValueOffset_min )
                             + nSizes * 2,
                           "trackValue array", odtect );
 
-    gxv_odtect_validate( odtect, valid );
+    gxv_odtect_validate( odtect, gxvalid );
 
     GXV_EXIT;
   }
@@ -210,8 +210,8 @@
     FT_Bytes          p = table;
     FT_Bytes          limit = 0;
 
-    GXV_ValidatorRec  validrec;
-    GXV_Validator     valid = &validrec;
+    GXV_ValidatorRec  gxvalidrec;
+    GXV_Validator     gxvalid = &gxvalidrec;
     GXV_trak_DataRec  trakrec;
     GXV_trak_Data     trak = &trakrec;
 
@@ -225,11 +225,11 @@
     GXV_ODTECT( 3, odtect );
 
     GXV_ODTECT_INIT( odtect );
-    valid->root       = ftvalid;
-    valid->table_data = trak;
-    valid->face       = face;
+    gxvalid->root       = ftvalid;
+    gxvalid->table_data = trak;
+    gxvalid->face       = face;
 
-    limit      = valid->root->limit;
+    limit      = gxvalid->root->limit;
 
     FT_TRACE3(( "validating `trak' table\n" ));
     GXV_INIT;
@@ -265,19 +265,19 @@
     /* validate trackData */
     if ( 0 < horizOffset )
     {
-      gxv_trak_trackData_validate( table + horizOffset, limit, valid );
-      gxv_odtect_add_range( table + horizOffset, valid->subtable_length,
+      gxv_trak_trackData_validate( table + horizOffset, limit, gxvalid );
+      gxv_odtect_add_range( table + horizOffset, gxvalid->subtable_length,
                             "horizJustData", odtect );
     }
 
     if ( 0 < vertOffset )
     {
-      gxv_trak_trackData_validate( table + vertOffset, limit, valid );
-      gxv_odtect_add_range( table + vertOffset, valid->subtable_length,
+      gxv_trak_trackData_validate( table + vertOffset, limit, gxvalid );
+      gxv_odtect_add_range( table + vertOffset, gxvalid->subtable_length,
                             "vertJustData", odtect );
     }
 
-    gxv_odtect_validate( odtect, valid );
+    gxv_odtect_validate( odtect, gxvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/module.mk
index 9fd098e2c5e..9fd098e2c5e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/rules.mk
index 57bc0823db7..57bc0823db7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gxvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gxvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/Jamfile
index a7aafa05180..a7aafa05180 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/adler32.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/adler32.c
index c53f9dd125d..c53f9dd125d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/adler32.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/adler32.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/ftgzip.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/ftgzip.c
index 83be22ba6ae..2d4200d9fa1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/ftgzip.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/ftgzip.c
@@ -208,8 +208,8 @@
 
     /* head[0] && head[1] are the magic numbers;    */
     /* head[2] is the method, and head[3] the flags */
-    if ( head[0] != 0x1f              ||
-         head[1] != 0x8b              ||
+    if ( head[0] != 0x1F              ||
+         head[1] != 0x8B              ||
          head[2] != Z_DEFLATED        ||
         (head[3] & FT_GZIP_RESERVED)  )
     {
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infblock.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infblock.c
index d6e2dc297da..d6e2dc297da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infblock.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infblock.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infblock.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infblock.h
index c2535a1e452..c2535a1e452 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infblock.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infblock.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infcodes.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infcodes.c
index f7bfd58c4ff..f7bfd58c4ff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infcodes.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infcodes.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infcodes.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infcodes.h
index 154d7f896ca..154d7f896ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infcodes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infcodes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inffixed.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inffixed.h
index 4d4760ea00e..4d4760ea00e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inffixed.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inffixed.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inflate.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inflate.c
index 8877fa3eb2b..8877fa3eb2b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inflate.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inflate.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inftrees.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inftrees.c
index 56f52b1701d..56f52b1701d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inftrees.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inftrees.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inftrees.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inftrees.h
index 07bf2aa0bf8..07bf2aa0bf8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/inftrees.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/inftrees.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infutil.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infutil.c
index 6087b406473..6087b406473 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infutil.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infutil.h
index 7174b6dd0ff..7174b6dd0ff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/infutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/infutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/rules.mk
index 37cd9917653..37cd9917653 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zconf.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zconf.h
index 3abf0ba03b0..3abf0ba03b0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zconf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zconf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zlib.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zlib.h
index 50d0d3f146d..50d0d3f146d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zlib.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zutil.c b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zutil.c
index 7ad0c1f81bb..7ad0c1f81bb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zutil.h b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zutil.h
index c9688cd9c04..c9688cd9c04 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/gzip/zutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/gzip/zutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/Jamfile
index 6f1f516e7cf..6f1f516e7cf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftlzw.c b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftlzw.c
index 6092626b657..e1b3564a5f8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftlzw.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftlzw.c
@@ -96,8 +96,8 @@
       goto Exit;
 
     /* head[0] && head[1] are the magic numbers */
-    if ( head[0] != 0x1f ||
-         head[1] != 0x9d )
+    if ( head[0] != 0x1F ||
+         head[1] != 0x9D )
       error = FT_THROW( Invalid_File_Format );
 
   Exit:
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftzopen.c b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftzopen.c
index d7a64576bad..d7a64576bad 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftzopen.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftzopen.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftzopen.h b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftzopen.h
index f7d2936be2f..cdc8fd7c1ac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/ftzopen.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/ftzopen.h
@@ -41,7 +41,7 @@
 #define LZW_CLEAR         256
 #define LZW_FIRST         257
 
-#define LZW_BIT_MASK      0x1f
+#define LZW_BIT_MASK      0x1F
 #define LZW_BLOCK_MASK    0x80
 #define LZW_MASK( n )     ( ( 1U << (n) ) - 1U )
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/rules.mk
index 5550a48d64b..5550a48d64b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/lzw/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/lzw/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/Jamfile
index b457143de4f..b457143de4f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/module.mk
index 9cadde55e46..9cadde55e46 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvalid.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvalid.c
index d5c2b75abb6..d5c2b75abb6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvalid.h b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvalid.h
index eb99b9cc48e..eb99b9cc48e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvbase.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvbase.c
index d742d2dc95f..4f9d2fa2568 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvbase.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvbase.c
@@ -32,7 +32,7 @@
 
   static void
   otv_BaseCoord_validate( FT_Bytes       table,
-                          OTV_Validator  valid )
+                          OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BaseCoordFormat;
@@ -58,7 +58,7 @@
     case 3:     /* BaseCoordFormat3 */
       OTV_LIMIT_CHECK( 2 );
       /* DeviceTable */
-      otv_Device_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_Device_validate( table + FT_NEXT_USHORT( p ), otvalid );
       break;
 
     default:
@@ -71,7 +71,7 @@
 
   static void
   otv_BaseTagList_validate( FT_Bytes       table,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BaseTagCount;
@@ -93,7 +93,7 @@
 
   static void
   otv_BaseValues_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BaseCoordCount;
@@ -112,7 +112,7 @@
 
     /* BaseCoord */
     for ( ; BaseCoordCount > 0; BaseCoordCount-- )
-      otv_BaseCoord_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_BaseCoord_validate( table + FT_NEXT_USHORT( p ), otvalid );
 
     OTV_EXIT;
   }
@@ -120,7 +120,7 @@
 
   static void
   otv_MinMax_validate( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   table_size;
@@ -144,11 +144,11 @@
 
     OTV_SIZE_CHECK( MinCoord );
     if ( MinCoord )
-      otv_BaseCoord_validate( table + MinCoord, valid );
+      otv_BaseCoord_validate( table + MinCoord, otvalid );
 
     OTV_SIZE_CHECK( MaxCoord );
     if ( MaxCoord )
-      otv_BaseCoord_validate( table + MaxCoord, valid );
+      otv_BaseCoord_validate( table + MaxCoord, otvalid );
 
     OTV_LIMIT_CHECK( FeatMinMaxCount * 8 );
 
@@ -162,11 +162,11 @@
 
       OTV_SIZE_CHECK( MinCoord );
       if ( MinCoord )
-        otv_BaseCoord_validate( table + MinCoord, valid );
+        otv_BaseCoord_validate( table + MinCoord, otvalid );
 
       OTV_SIZE_CHECK( MaxCoord );
       if ( MaxCoord )
-        otv_BaseCoord_validate( table + MaxCoord, valid );
+        otv_BaseCoord_validate( table + MaxCoord, otvalid );
     }
 
     OTV_EXIT;
@@ -175,7 +175,7 @@
 
   static void
   otv_BaseScript_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   table_size;
@@ -198,11 +198,11 @@
 
     OTV_SIZE_CHECK( BaseValues );
     if ( BaseValues )
-      otv_BaseValues_validate( table + BaseValues, valid );
+      otv_BaseValues_validate( table + BaseValues, otvalid );
 
     OTV_SIZE_CHECK( DefaultMinMax );
     if ( DefaultMinMax )
-      otv_MinMax_validate( table + DefaultMinMax, valid );
+      otv_MinMax_validate( table + DefaultMinMax, otvalid );
 
     OTV_LIMIT_CHECK( BaseLangSysCount * 6 );
 
@@ -211,7 +211,7 @@
     {
       p += 4;       /* skip BaseLangSysTag */
 
-      otv_MinMax_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_MinMax_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
@@ -220,7 +220,7 @@
 
   static void
   otv_BaseScriptList_validate( FT_Bytes       table,
-                               OTV_Validator  valid )
+                               OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BaseScriptCount;
@@ -241,7 +241,7 @@
       p += 4;       /* skip BaseScriptTag */
 
       /* BaseScript */
-      otv_BaseScript_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_BaseScript_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
@@ -250,7 +250,7 @@
 
   static void
   otv_Axis_validate( FT_Bytes       table,
-                     OTV_Validator  valid )
+                     OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   table_size;
@@ -267,10 +267,10 @@
 
     OTV_SIZE_CHECK( BaseTagList );
     if ( BaseTagList )
-      otv_BaseTagList_validate( table + BaseTagList, valid );
+      otv_BaseTagList_validate( table + BaseTagList, otvalid );
 
     /* BaseScriptList */
-    otv_BaseScriptList_validate( table + FT_NEXT_USHORT( p ), valid );
+    otv_BaseScriptList_validate( table + FT_NEXT_USHORT( p ), otvalid );
 
     OTV_EXIT;
   }
@@ -280,16 +280,16 @@
   otv_BASE_validate( FT_Bytes      table,
                      FT_Validator  ftvalid )
   {
-    OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
-    FT_Bytes          p     = table;
+    OTV_ValidatorRec  otvalidrec;
+    OTV_Validator     otvalid = &otvalidrec;
+    FT_Bytes          p       = table;
     FT_UInt           table_size;
 
     OTV_OPTIONAL_TABLE( HorizAxis );
     OTV_OPTIONAL_TABLE( VertAxis  );
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
 
     FT_TRACE3(( "validating BASE table\n" ));
     OTV_INIT;
@@ -304,12 +304,12 @@
     OTV_OPTIONAL_OFFSET( HorizAxis );
     OTV_SIZE_CHECK( HorizAxis );
     if ( HorizAxis )
-      otv_Axis_validate( table + HorizAxis, valid );
+      otv_Axis_validate( table + HorizAxis, otvalid );
 
     OTV_OPTIONAL_OFFSET( VertAxis );
     OTV_SIZE_CHECK( VertAxis );
     if ( VertAxis )
-      otv_Axis_validate( table + VertAxis, valid );
+      otv_Axis_validate( table + VertAxis, otvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvcommn.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvcommn.c
index a4f885b51f8..3c3de63ca97 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvcommn.c
@@ -39,7 +39,7 @@
 
   FT_LOCAL_DEF( void )
   otv_Coverage_validate( FT_Bytes       table,
-                         OTV_Validator  valid,
+                         OTV_Validator  otvalid,
                          FT_Int         expected_count )
   {
     FT_Bytes  p = table;
@@ -74,7 +74,7 @@
 
 
           gid = FT_NEXT_USHORT( p );
-          if ( gid >= valid->glyph_count )
+          if ( gid >= otvalid->glyph_count )
             FT_INVALID_GLYPH_ID;
         }
 
@@ -104,7 +104,7 @@
           if ( Start > End || StartCoverageIndex != total )
             FT_INVALID_DATA;
 
-          if ( End >= valid->glyph_count )
+          if ( End >= otvalid->glyph_count )
             FT_INVALID_GLYPH_ID;
 
           if ( n > 0 && Start <= last )
@@ -219,7 +219,7 @@
 
   FT_LOCAL_DEF( void )
   otv_ClassDef_validate( FT_Bytes       table,
-                         OTV_Validator  valid )
+                         OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   ClassFormat;
@@ -249,7 +249,7 @@
 
         OTV_LIMIT_CHECK( GlyphCount * 2 );    /* ClassValueArray */
 
-        if ( StartGlyph + GlyphCount - 1 >= valid->glyph_count )
+        if ( StartGlyph + GlyphCount - 1 >= otvalid->glyph_count )
           FT_INVALID_GLYPH_ID;
       }
       break;
@@ -276,7 +276,7 @@
           if ( Start > End || ( n > 0 && Start <= last ) )
             FT_INVALID_DATA;
 
-          if ( End >= valid->glyph_count )
+          if ( End >= otvalid->glyph_count )
             FT_INVALID_GLYPH_ID;
 
           last = End;
@@ -305,7 +305,7 @@
 
   FT_LOCAL_DEF( void )
   otv_Device_validate( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   StartSize, EndSize, DeltaFormat, count;
@@ -339,12 +339,12 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->type_count */
-  /* uses valid->type_funcs */
+  /* uses otvalid->type_count */
+  /* uses otvalid->type_funcs */
 
   FT_LOCAL_DEF( void )
   otv_Lookup_validate( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            LookupType, SubTableCount;
@@ -360,10 +360,10 @@
 
     OTV_TRACE(( " (type %d)\n", LookupType ));
 
-    if ( LookupType == 0 || LookupType > valid->type_count )
+    if ( LookupType == 0 || LookupType > otvalid->type_count )
       FT_INVALID_DATA;
 
-    validate = valid->type_funcs[LookupType - 1];
+    validate = otvalid->type_funcs[LookupType - 1];
 
     OTV_TRACE(( " (SubTableCount = %d)\n", SubTableCount ));
 
@@ -371,7 +371,7 @@
 
     /* SubTable */
     for ( ; SubTableCount > 0; SubTableCount-- )
-      validate( table + FT_NEXT_USHORT( p ), valid );
+      validate( table + FT_NEXT_USHORT( p ), otvalid );
 
     OTV_EXIT;
   }
@@ -381,7 +381,7 @@
 
   FT_LOCAL_DEF( void )
   otv_LookupList_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   LookupCount;
@@ -396,11 +396,11 @@
 
     OTV_LIMIT_CHECK( LookupCount * 2 );
 
-    valid->lookup_count = LookupCount;
+    otvalid->lookup_count = LookupCount;
 
     /* Lookup */
     for ( ; LookupCount > 0; LookupCount-- )
-      otv_Lookup_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_Lookup_validate( table + FT_NEXT_USHORT( p ), otvalid );
 
     OTV_EXIT;
   }
@@ -421,11 +421,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->lookup_count */
+  /* uses otvalid->lookup_count */
 
   FT_LOCAL_DEF( void )
   otv_Feature_validate( FT_Bytes       table,
-                        OTV_Validator  valid )
+                        OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   LookupCount;
@@ -443,7 +443,7 @@
 
     /* LookupListIndex */
     for ( ; LookupCount > 0; LookupCount-- )
-      if ( FT_NEXT_USHORT( p ) >= valid->lookup_count )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count )
         FT_INVALID_DATA;
 
     OTV_EXIT;
@@ -457,12 +457,12 @@
   }
 
 
-  /* sets valid->lookup_count */
+  /* sets otvalid->lookup_count */
 
   FT_LOCAL_DEF( void )
   otv_FeatureList_validate( FT_Bytes       table,
                             FT_Bytes       lookups,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   FeatureCount;
@@ -477,7 +477,7 @@
 
     OTV_LIMIT_CHECK( FeatureCount * 2 );
 
-    valid->lookup_count = otv_LookupList_get_count( lookups );
+    otvalid->lookup_count = otv_LookupList_get_count( lookups );
 
     /* FeatureRecord */
     for ( ; FeatureCount > 0; FeatureCount-- )
@@ -485,7 +485,7 @@
       p += 4;       /* skip FeatureTag */
 
       /* Feature */
-      otv_Feature_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_Feature_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
@@ -501,11 +501,11 @@
   /*************************************************************************/
 
 
-  /* uses valid->extra1 (number of features) */
+  /* uses otvalid->extra1 (number of features) */
 
   FT_LOCAL_DEF( void )
   otv_LangSys_validate( FT_Bytes       table,
-                        OTV_Validator  valid )
+                        OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   ReqFeatureIndex;
@@ -522,14 +522,14 @@
     OTV_TRACE(( " (ReqFeatureIndex = %d)\n", ReqFeatureIndex ));
     OTV_TRACE(( " (FeatureCount = %d)\n",    FeatureCount    ));
 
-    if ( ReqFeatureIndex != 0xFFFFU && ReqFeatureIndex >= valid->extra1 )
+    if ( ReqFeatureIndex != 0xFFFFU && ReqFeatureIndex >= otvalid->extra1 )
       FT_INVALID_DATA;
 
     OTV_LIMIT_CHECK( FeatureCount * 2 );
 
     /* FeatureIndex */
     for ( ; FeatureCount > 0; FeatureCount-- )
-      if ( FT_NEXT_USHORT( p ) >= valid->extra1 )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 )
         FT_INVALID_DATA;
 
     OTV_EXIT;
@@ -546,7 +546,7 @@
 
   FT_LOCAL_DEF( void )
   otv_Script_validate( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_UInt   DefaultLangSys, LangSysCount;
     FT_Bytes  p = table;
@@ -561,7 +561,7 @@
     OTV_TRACE(( " (LangSysCount = %d)\n", LangSysCount ));
 
     if ( DefaultLangSys != 0 )
-      otv_LangSys_validate( table + DefaultLangSys, valid );
+      otv_LangSys_validate( table + DefaultLangSys, otvalid );
 
     OTV_LIMIT_CHECK( LangSysCount * 6 );
 
@@ -571,19 +571,19 @@
       p += 4;       /* skip LangSysTag */
 
       /* LangSys */
-      otv_LangSys_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_LangSys_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
   }
 
 
-  /* sets valid->extra1 (number of features) */
+  /* sets otvalid->extra1 (number of features) */
 
   FT_LOCAL_DEF( void )
   otv_ScriptList_validate( FT_Bytes       table,
                            FT_Bytes       features,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_UInt   ScriptCount;
     FT_Bytes  p = table;
@@ -598,14 +598,14 @@
 
     OTV_LIMIT_CHECK( ScriptCount * 6 );
 
-    valid->extra1 = otv_Feature_get_count( features );
+    otvalid->extra1 = otv_Feature_get_count( features );
 
     /* ScriptRecord */
     for ( ; ScriptCount > 0; ScriptCount-- )
     {
       p += 4;       /* skip ScriptTag */
 
-      otv_Script_validate( table + FT_NEXT_USHORT( p ), valid ); /* Script */
+      otv_Script_validate( table + FT_NEXT_USHORT( p ), otvalid ); /* Script */
     }
 
     OTV_EXIT;
@@ -640,7 +640,7 @@
 
   FT_LOCAL_DEF( void )
   otv_x_Ox( FT_Bytes       table,
-            OTV_Validator  valid )
+            OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            Count;
@@ -656,13 +656,13 @@
 
     OTV_LIMIT_CHECK( Count * 2 );
 
-    valid->nesting_level++;
-    func = valid->func[valid->nesting_level];
+    otvalid->nesting_level++;
+    func = otvalid->func[otvalid->nesting_level];
 
     for ( ; Count > 0; Count-- )
-      func( table + FT_NEXT_USHORT( p ), valid );
+      func( table + FT_NEXT_USHORT( p ), otvalid );
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
@@ -670,7 +670,7 @@
 
   FT_LOCAL_DEF( void )
   otv_u_C_x_Ox( FT_Bytes       table,
-                OTV_Validator  valid )
+                OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            Count, Coverage;
@@ -687,27 +687,27 @@
 
     OTV_TRACE(( " (Count = %d)\n", Count ));
 
-    otv_Coverage_validate( table + Coverage, valid, Count );
+    otv_Coverage_validate( table + Coverage, otvalid, Count );
 
     OTV_LIMIT_CHECK( Count * 2 );
 
-    valid->nesting_level++;
-    func = valid->func[valid->nesting_level];
+    otvalid->nesting_level++;
+    func = otvalid->func[otvalid->nesting_level];
 
     for ( ; Count > 0; Count-- )
-      func( table + FT_NEXT_USHORT( p ), valid );
+      func( table + FT_NEXT_USHORT( p ), otvalid );
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
 
 
-  /* uses valid->extra1 (if > 0: array value limit) */
+  /* uses otvalid->extra1 (if > 0: array value limit) */
 
   FT_LOCAL_DEF( void )
   otv_x_ux( FT_Bytes       table,
-            OTV_Validator  valid )
+            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   Count;
@@ -722,10 +722,10 @@
 
     OTV_LIMIT_CHECK( Count * 2 );
 
-    if ( valid->extra1 )
+    if ( otvalid->extra1 )
     {
       for ( ; Count > 0; Count-- )
-        if ( FT_NEXT_USHORT( p ) >= valid->extra1 )
+        if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 )
           FT_INVALID_DATA;
     }
 
@@ -736,11 +736,11 @@
   /* `ux' in the function's name is not really correct since only x-1 */
   /* elements are tested                                              */
 
-  /* uses valid->extra1 (array value limit) */
+  /* uses otvalid->extra1 (array value limit) */
 
   FT_LOCAL_DEF( void )
   otv_x_y_ux_sy( FT_Bytes       table,
-                 OTV_Validator  valid )
+                 OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   Count1, Count2;
@@ -766,7 +766,7 @@
       if ( FT_NEXT_USHORT( p ) >= Count1 )
         FT_INVALID_DATA;
 
-      if ( FT_NEXT_USHORT( p ) >= valid->extra1 )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 )
         FT_INVALID_DATA;
     }
 
@@ -777,11 +777,11 @@
   /* `uy' in the function's name is not really correct since only y-1 */
   /* elements are tested                                              */
 
-  /* uses valid->extra1 (array value limit) */
+  /* uses otvalid->extra1 (array value limit) */
 
   FT_LOCAL_DEF( void )
   otv_x_ux_y_uy_z_uz_p_sp( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BacktrackCount, InputCount, LookaheadCount;
@@ -825,7 +825,7 @@
       if ( FT_NEXT_USHORT( p ) >= InputCount )
         FT_INVALID_DATA;
 
-      if ( FT_NEXT_USHORT( p ) >= valid->extra1 )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->extra1 )
         FT_INVALID_DATA;
     }
 
@@ -833,11 +833,11 @@
   }
 
 
-  /* sets valid->extra1 (valid->lookup_count) */
+  /* sets otvalid->extra1 (valid->lookup_count) */
 
   FT_LOCAL_DEF( void )
   otv_u_O_O_x_Onx( FT_Bytes       table,
-                   OTV_Validator  valid )
+                   OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            Coverage, ClassDef, ClassSetCount;
@@ -855,14 +855,14 @@
 
     OTV_TRACE(( " (ClassSetCount = %d)\n", ClassSetCount ));
 
-    otv_Coverage_validate( table + Coverage, valid, -1 );
-    otv_ClassDef_validate( table + ClassDef, valid );
+    otv_Coverage_validate( table + Coverage, otvalid, -1 );
+    otv_ClassDef_validate( table + ClassDef, otvalid );
 
     OTV_LIMIT_CHECK( ClassSetCount * 2 );
 
-    valid->nesting_level++;
-    func          = valid->func[valid->nesting_level];
-    valid->extra1 = valid->lookup_count;
+    otvalid->nesting_level++;
+    func          = otvalid->func[otvalid->nesting_level];
+    otvalid->extra1 = otvalid->lookup_count;
 
     for ( ; ClassSetCount > 0; ClassSetCount-- )
     {
@@ -870,20 +870,20 @@
 
 
       if ( offset )
-        func( table + offset, valid );
+        func( table + offset, otvalid );
     }
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
 
 
-  /* uses valid->lookup_count */
+  /* uses otvalid->lookup_count */
 
   FT_LOCAL_DEF( void )
   otv_u_x_y_Ox_sy( FT_Bytes       table,
-                   OTV_Validator  valid )
+                   OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   GlyphCount, Count, count1;
@@ -903,14 +903,14 @@
     OTV_LIMIT_CHECK( GlyphCount * 2 + Count * 4 );
 
     for ( count1 = GlyphCount; count1 > 0; count1-- )
-      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
     for ( ; Count > 0; Count-- )
     {
       if ( FT_NEXT_USHORT( p ) >= GlyphCount )
         FT_INVALID_DATA;
 
-      if ( FT_NEXT_USHORT( p ) >= valid->lookup_count )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count )
         FT_INVALID_DATA;
     }
 
@@ -918,11 +918,11 @@
   }
 
 
-  /* sets valid->extra1 (valid->lookup_count)    */
+  /* sets otvalid->extra1 (valid->lookup_count)    */
 
   FT_LOCAL_DEF( void )
   otv_u_O_O_O_O_x_Onx( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            Coverage;
@@ -944,17 +944,17 @@
 
     OTV_TRACE(( " (ChainClassSetCount = %d)\n", ChainClassSetCount ));
 
-    otv_Coverage_validate( table + Coverage, valid, -1 );
+    otv_Coverage_validate( table + Coverage, otvalid, -1 );
 
-    otv_ClassDef_validate( table + BacktrackClassDef,  valid );
-    otv_ClassDef_validate( table + InputClassDef, valid );
-    otv_ClassDef_validate( table + LookaheadClassDef, valid );
+    otv_ClassDef_validate( table + BacktrackClassDef,  otvalid );
+    otv_ClassDef_validate( table + InputClassDef, otvalid );
+    otv_ClassDef_validate( table + LookaheadClassDef, otvalid );
 
     OTV_LIMIT_CHECK( ChainClassSetCount * 2 );
 
-    valid->nesting_level++;
-    func          = valid->func[valid->nesting_level];
-    valid->extra1 = valid->lookup_count;
+    otvalid->nesting_level++;
+    func          = otvalid->func[otvalid->nesting_level];
+    otvalid->extra1 = otvalid->lookup_count;
 
     for ( ; ChainClassSetCount > 0; ChainClassSetCount-- )
     {
@@ -962,20 +962,20 @@
 
 
       if ( offset )
-        func( table + offset, valid );
+        func( table + offset, otvalid );
     }
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
 
 
-  /* uses valid->lookup_count */
+  /* uses otvalid->lookup_count */
 
   FT_LOCAL_DEF( void )
   otv_u_x_Ox_y_Oy_z_Oz_p_sp( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   BacktrackGlyphCount, InputGlyphCount, LookaheadGlyphCount;
@@ -994,7 +994,7 @@
     OTV_LIMIT_CHECK( BacktrackGlyphCount * 2 + 2 );
 
     for ( ; BacktrackGlyphCount > 0; BacktrackGlyphCount-- )
-      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
     InputGlyphCount = FT_NEXT_USHORT( p );
 
@@ -1003,7 +1003,7 @@
     OTV_LIMIT_CHECK( InputGlyphCount * 2 + 2 );
 
     for ( count1 = InputGlyphCount; count1 > 0; count1-- )
-      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
     LookaheadGlyphCount = FT_NEXT_USHORT( p );
 
@@ -1012,7 +1012,7 @@
     OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 );
 
     for ( ; LookaheadGlyphCount > 0; LookaheadGlyphCount-- )
-      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+      otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
     count2 = FT_NEXT_USHORT( p );
 
@@ -1025,7 +1025,7 @@
       if ( FT_NEXT_USHORT( p ) >= InputGlyphCount )
         FT_INVALID_DATA;
 
-      if ( FT_NEXT_USHORT( p ) >= valid->lookup_count )
+      if ( FT_NEXT_USHORT( p ) >= otvalid->lookup_count )
         FT_INVALID_DATA;
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvcommn.h b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvcommn.h
index 898887fc954..5c93ba7efff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvcommn.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType common tables validation (specification).                   */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2007, 2009 by                                    */
+/*  Copyright 2004, 2005, 2007, 2009, 2014 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -39,7 +39,7 @@ FT_BEGIN_HEADER
   typedef struct OTV_ValidatorRec_*  OTV_Validator;
 
   typedef void  (*OTV_Validate_Func)( FT_Bytes       table,
-                                      OTV_Validator  valid );
+                                      OTV_Validator  otvalid );
 
   typedef struct  OTV_ValidatorRec_
   {
@@ -67,8 +67,8 @@ FT_BEGIN_HEADER
 
 
 #undef  FT_INVALID_
-#define FT_INVALID_( _prefix, _error )                         \
-          ft_validator_error( valid->root, _prefix ## _error )
+#define FT_INVALID_( _error ) \
+          ft_validator_error( otvalid->root, FT_THROW( _error ) )
 
 #define OTV_OPTIONAL_TABLE( _table )  FT_UShort  _table;      \
                                       FT_Bytes   _table ## _p
@@ -81,7 +81,7 @@ FT_BEGIN_HEADER
 
 #define OTV_LIMIT_CHECK( _count )                    \
           FT_BEGIN_STMNT                             \
-            if ( p + (_count) > valid->root->limit ) \
+            if ( p + (_count) > otvalid->root->limit ) \
               FT_INVALID_TOO_SHORT;                  \
           FT_END_STMNT
 
@@ -89,7 +89,7 @@ FT_BEGIN_HEADER
           FT_BEGIN_STMNT                                            \
             if ( _size > 0 && _size < table_size )                  \
             {                                                       \
-              if ( valid->root->level == FT_VALIDATE_PARANOID )     \
+              if ( otvalid->root->level == FT_VALIDATE_PARANOID )     \
                 FT_INVALID_OFFSET;                                  \
               else                                                  \
               {                                                     \
@@ -117,79 +117,79 @@ FT_BEGIN_HEADER
 
 #ifdef FT_DEBUG_LEVEL_TRACE
 
-#define OTV_NEST1( x )                                     \
-          FT_BEGIN_STMNT                                   \
-            valid->nesting_level          = 0;             \
-            valid->func[0]                = OTV_FUNC( x ); \
-            valid->debug_function_name[0] = OTV_NAME( x ); \
+#define OTV_NEST1( x )                                       \
+          FT_BEGIN_STMNT                                     \
+            otvalid->nesting_level          = 0;             \
+            otvalid->func[0]                = OTV_FUNC( x ); \
+            otvalid->debug_function_name[0] = OTV_NAME( x ); \
           FT_END_STMNT
 
-#define OTV_NEST2( x, y )                                  \
-          FT_BEGIN_STMNT                                   \
-            valid->nesting_level          = 0;             \
-            valid->func[0]                = OTV_FUNC( x ); \
-            valid->func[1]                = OTV_FUNC( y ); \
-            valid->debug_function_name[0] = OTV_NAME( x ); \
-            valid->debug_function_name[1] = OTV_NAME( y ); \
+#define OTV_NEST2( x, y )                                    \
+          FT_BEGIN_STMNT                                     \
+            otvalid->nesting_level          = 0;             \
+            otvalid->func[0]                = OTV_FUNC( x ); \
+            otvalid->func[1]                = OTV_FUNC( y ); \
+            otvalid->debug_function_name[0] = OTV_NAME( x ); \
+            otvalid->debug_function_name[1] = OTV_NAME( y ); \
           FT_END_STMNT
 
-#define OTV_NEST3( x, y, z )                               \
-          FT_BEGIN_STMNT                                   \
-            valid->nesting_level          = 0;             \
-            valid->func[0]                = OTV_FUNC( x ); \
-            valid->func[1]                = OTV_FUNC( y ); \
-            valid->func[2]                = OTV_FUNC( z ); \
-            valid->debug_function_name[0] = OTV_NAME( x ); \
-            valid->debug_function_name[1] = OTV_NAME( y ); \
-            valid->debug_function_name[2] = OTV_NAME( z ); \
+#define OTV_NEST3( x, y, z )                                 \
+          FT_BEGIN_STMNT                                     \
+            otvalid->nesting_level          = 0;             \
+            otvalid->func[0]                = OTV_FUNC( x ); \
+            otvalid->func[1]                = OTV_FUNC( y ); \
+            otvalid->func[2]                = OTV_FUNC( z ); \
+            otvalid->debug_function_name[0] = OTV_NAME( x ); \
+            otvalid->debug_function_name[1] = OTV_NAME( y ); \
+            otvalid->debug_function_name[2] = OTV_NAME( z ); \
           FT_END_STMNT
 
-#define OTV_INIT  valid->debug_indent = 0
+#define OTV_INIT  otvalid->debug_indent = 0
 
-#define OTV_ENTER                                                            \
-          FT_BEGIN_STMNT                                                     \
-            valid->debug_indent += 2;                                        \
-            FT_TRACE4(( "%*.s", valid->debug_indent, 0 ));                   \
-            FT_TRACE4(( "%s table\n",                                        \
-                        valid->debug_function_name[valid->nesting_level] )); \
+#define OTV_ENTER                                                              \
+          FT_BEGIN_STMNT                                                       \
+            otvalid->debug_indent += 2;                                        \
+            FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 ));                   \
+            FT_TRACE4(( "%s table\n",                                          \
+                        otvalid->debug_function_name[otvalid->nesting_level] )); \
           FT_END_STMNT
 
-#define OTV_NAME_ENTER( name )                             \
-          FT_BEGIN_STMNT                                   \
-            valid->debug_indent += 2;                      \
-            FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \
-            FT_TRACE4(( "%s table\n", name ));             \
+#define OTV_NAME_ENTER( name )                               \
+          FT_BEGIN_STMNT                                     \
+            otvalid->debug_indent += 2;                      \
+            FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \
+            FT_TRACE4(( "%s table\n", name ));               \
           FT_END_STMNT
 
-#define OTV_EXIT  valid->debug_indent -= 2
+#define OTV_EXIT  otvalid->debug_indent -= 2
 
-#define OTV_TRACE( s )                                     \
-          FT_BEGIN_STMNT                                   \
-            FT_TRACE4(( "%*.s", valid->debug_indent, 0 )); \
-            FT_TRACE4( s );                                \
+#define OTV_TRACE( s )                                       \
+          FT_BEGIN_STMNT                                     \
+            FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \
+            FT_TRACE4( s );                                  \
           FT_END_STMNT
 
 #else   /* !FT_DEBUG_LEVEL_TRACE */
 
-#define OTV_NEST1( x )                            \
-          FT_BEGIN_STMNT                          \
-            valid->nesting_level = 0;             \
-            valid->func[0]       = OTV_FUNC( x ); \
+#define OTV_NEST1( x )                              \
+          FT_BEGIN_STMNT                            \
+            otvalid->nesting_level = 0;             \
+            otvalid->func[0]       = OTV_FUNC( x ); \
           FT_END_STMNT
 
-#define OTV_NEST2( x, y )                         \
-          FT_BEGIN_STMNT                          \
-            valid->nesting_level = 0;             \
-            valid->func[0]       = OTV_FUNC( x ); \
-            valid->func[1]       = OTV_FUNC( y ); \
+#define OTV_NEST2( x, y )                           \
+          FT_BEGIN_STMNT                            \
+            otvalid->nesting_level = 0;             \
+            otvalid->func[0]       = OTV_FUNC( x ); \
+            otvalid->func[1]       = OTV_FUNC( y ); \
           FT_END_STMNT
 
-#define OTV_NEST3( x, y, z )                      \
-          FT_BEGIN_STMNT                          \
-            valid->nesting_level = 0;             \
-            valid->func[0]       = OTV_FUNC( x ); \
-            valid->func[1]       = OTV_FUNC( y ); \
-            valid->func[2]       = OTV_FUNC( z ); \
+#define OTV_NEST3( x, y, z )                        \
+          FT_BEGIN_STMNT                            \
+            otvalid->nesting_level = 0;             \
+            otvalid->func[0]       = OTV_FUNC( x ); \
+            otvalid->func[1]       = OTV_FUNC( y ); \
+            otvalid->func[2]       = OTV_FUNC( z ); \
           FT_END_STMNT
 
 #define OTV_INIT                do { } while ( 0 )
@@ -202,7 +202,7 @@ FT_BEGIN_HEADER
 #endif  /* !FT_DEBUG_LEVEL_TRACE */
 
 
-#define OTV_RUN  valid->func[0]
+#define OTV_RUN  otvalid->func[0]
 
 
   /*************************************************************************/
@@ -215,7 +215,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_Coverage_validate( FT_Bytes       table,
-                         OTV_Validator  valid,
+                         OTV_Validator  otvalid,
                          FT_Int         expected_count );
 
   /* return first covered glyph */
@@ -241,7 +241,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_ClassDef_validate( FT_Bytes       table,
-                         OTV_Validator  valid );
+                         OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -254,7 +254,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_Device_validate( FT_Bytes       table,
-                       OTV_Validator  valid );
+                       OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -267,11 +267,11 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_Lookup_validate( FT_Bytes       table,
-                       OTV_Validator  valid );
+                       OTV_Validator  otvalid );
 
   FT_LOCAL( void )
   otv_LookupList_validate( FT_Bytes       table,
-                           OTV_Validator  valid );
+                           OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -284,13 +284,13 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_Feature_validate( FT_Bytes       table,
-                        OTV_Validator  valid );
+                        OTV_Validator  otvalid );
 
   /* lookups must already be validated */
   FT_LOCAL( void )
   otv_FeatureList_validate( FT_Bytes       table,
                             FT_Bytes       lookups,
-                            OTV_Validator  valid );
+                            OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -303,7 +303,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_LangSys_validate( FT_Bytes       table,
-                        OTV_Validator  valid );
+                        OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -316,13 +316,13 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_Script_validate( FT_Bytes       table,
-                       OTV_Validator  valid );
+                       OTV_Validator  otvalid );
 
   /* features must already be validated */
   FT_LOCAL( void )
   otv_ScriptList_validate( FT_Bytes       table,
                            FT_Bytes       features,
-                           OTV_Validator  valid );
+                           OTV_Validator  otvalid );
 
 
   /*************************************************************************/
@@ -349,7 +349,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_x_Ox ( FT_Bytes       table,
-             OTV_Validator  valid );
+             OTV_Validator  otvalid );
 
 #define AlternateSubstFormat1Func     otv_u_C_x_Ox
 #define ChainContextPosFormat1Func    otv_u_C_x_Ox
@@ -361,7 +361,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_u_C_x_Ox( FT_Bytes       table,
-                OTV_Validator  valid );
+                OTV_Validator  otvalid );
 
 #define AlternateSetFunc     otv_x_ux
 #define AttachPointFunc      otv_x_ux
@@ -372,7 +372,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_x_ux( FT_Bytes       table,
-            OTV_Validator  valid );
+            OTV_Validator  otvalid );
 
 #define PosClassRuleFunc  otv_x_y_ux_sy
 #define PosRuleFunc       otv_x_y_ux_sy
@@ -381,7 +381,7 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_x_y_ux_sy( FT_Bytes       table,
-                 OTV_Validator  valid );
+                 OTV_Validator  otvalid );
 
 #define ChainPosClassRuleFunc  otv_x_ux_y_uy_z_uz_p_sp
 #define ChainPosRuleFunc       otv_x_ux_y_uy_z_uz_p_sp
@@ -390,35 +390,35 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( void )
   otv_x_ux_y_uy_z_uz_p_sp( FT_Bytes       table,
-                           OTV_Validator  valid );
+                           OTV_Validator  otvalid );
 
 #define ContextPosFormat2Func    otv_u_O_O_x_Onx
 #define ContextSubstFormat2Func  otv_u_O_O_x_Onx
 
   FT_LOCAL( void )
   otv_u_O_O_x_Onx( FT_Bytes       table,
-                   OTV_Validator  valid );
+                   OTV_Validator  otvalid );
 
 #define ContextPosFormat3Func    otv_u_x_y_Ox_sy
 #define ContextSubstFormat3Func  otv_u_x_y_Ox_sy
 
   FT_LOCAL( void )
   otv_u_x_y_Ox_sy( FT_Bytes       table,
-                   OTV_Validator  valid );
+                   OTV_Validator  otvalid );
 
 #define ChainContextPosFormat2Func    otv_u_O_O_O_O_x_Onx
 #define ChainContextSubstFormat2Func  otv_u_O_O_O_O_x_Onx
 
   FT_LOCAL( void )
   otv_u_O_O_O_O_x_Onx( FT_Bytes       table,
-                       OTV_Validator  valid );
+                       OTV_Validator  otvalid );
 
 #define ChainContextPosFormat3Func    otv_u_x_Ox_y_Oy_z_Oz_p_sp
 #define ChainContextSubstFormat3Func  otv_u_x_Ox_y_Oy_z_Oz_p_sp
 
   FT_LOCAL( void )
   otv_u_x_Ox_y_Oy_z_Oz_p_sp( FT_Bytes       table,
-                             OTV_Validator  valid );
+                             OTV_Validator  otvalid );
 
 
   FT_LOCAL( FT_UInt )
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otverror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otverror.h
index b6f00c9dba2..b6f00c9dba2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otverror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otverror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgdef.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgdef.c
index 3633ad0de18..e60ef363d8b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgdef.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgdef.c
@@ -45,7 +45,7 @@
 
   static void
   otv_O_x_Ox( FT_Bytes       table,
-              OTV_Validator  valid )
+              OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_Bytes           Coverage;
@@ -61,20 +61,20 @@
 
     OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
 
-    otv_Coverage_validate( Coverage, valid, GlyphCount );
+    otv_Coverage_validate( Coverage, otvalid, GlyphCount );
     if ( GlyphCount != otv_Coverage_get_count( Coverage ) )
       FT_INVALID_DATA;
 
     OTV_LIMIT_CHECK( GlyphCount * 2 );
 
-    valid->nesting_level++;
-    func          = valid->func[valid->nesting_level];
-    valid->extra1 = 0;
+    otvalid->nesting_level++;
+    func          = otvalid->func[otvalid->nesting_level];
+    otvalid->extra1 = 0;
 
     for ( ; GlyphCount > 0; GlyphCount-- )
-      func( table + FT_NEXT_USHORT( p ), valid );
+      func( table + FT_NEXT_USHORT( p ), otvalid );
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
@@ -92,7 +92,7 @@
 
   static void
   otv_CaretValue_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   CaretValueFormat;
@@ -122,7 +122,7 @@
       OTV_LIMIT_CHECK( 2 );
 
       /* DeviceTable */
-      otv_Device_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_Device_validate( table + FT_NEXT_USHORT( p ), otvalid );
       break;
 
     default:
@@ -141,7 +141,7 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->glyph_count */
+  /* sets otvalid->glyph_count */
 
   FT_LOCAL_DEF( void )
   otv_GDEF_validate( FT_Bytes      table,
@@ -150,8 +150,8 @@
                      FT_UInt       glyph_count,
                      FT_Validator  ftvalid )
   {
-    OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
+    OTV_ValidatorRec  otvalidrec;
+    OTV_Validator     otvalid = &otvalidrec;
     FT_Bytes          p     = table;
     FT_UInt           table_size;
     FT_Bool           need_MarkAttachClassDef;
@@ -162,7 +162,7 @@
     OTV_OPTIONAL_TABLE( MarkAttachClassDef );
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
 
     FT_TRACE3(( "validating GDEF table\n" ));
     OTV_INIT;
@@ -186,19 +186,19 @@
     else
       table_size = 10;              /* OpenType < 1.2  */
 
-    valid->glyph_count = glyph_count;
+    otvalid->glyph_count = glyph_count;
 
     OTV_OPTIONAL_OFFSET( GlyphClassDef );
     OTV_SIZE_CHECK( GlyphClassDef );
     if ( GlyphClassDef )
-      otv_ClassDef_validate( table + GlyphClassDef, valid );
+      otv_ClassDef_validate( table + GlyphClassDef, otvalid );
 
     OTV_OPTIONAL_OFFSET( AttachListOffset );
     OTV_SIZE_CHECK( AttachListOffset );
     if ( AttachListOffset )
     {
       OTV_NEST2( AttachList, AttachPoint );
-      OTV_RUN( table + AttachListOffset, valid );
+      OTV_RUN( table + AttachListOffset, otvalid );
     }
 
     OTV_OPTIONAL_OFFSET( LigCaretListOffset );
@@ -206,7 +206,7 @@
     if ( LigCaretListOffset )
     {
       OTV_NEST3( LigCaretList, LigGlyph, CaretValue );
-      OTV_RUN( table + LigCaretListOffset, valid );
+      OTV_RUN( table + LigCaretListOffset, otvalid );
     }
 
     if ( need_MarkAttachClassDef )
@@ -214,7 +214,7 @@
       OTV_OPTIONAL_OFFSET( MarkAttachClassDef );
       OTV_SIZE_CHECK( MarkAttachClassDef );
       if ( MarkAttachClassDef )
-        otv_ClassDef_validate( table + MarkAttachClassDef, valid );
+        otv_ClassDef_validate( table + MarkAttachClassDef, otvalid );
     }
 
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgpos.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgpos.c
index 49b46183a32..1a9dbaaa031 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgpos.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgpos.c
@@ -57,7 +57,7 @@
 
   static void
   otv_x_sxy( FT_Bytes       table,
-             OTV_Validator  valid )
+             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   Count, count1, table_size;
@@ -71,26 +71,26 @@
 
     OTV_TRACE(( " (Count = %d)\n", Count ));
 
-    OTV_LIMIT_CHECK( Count * valid->extra1 * 2 );
+    OTV_LIMIT_CHECK( Count * otvalid->extra1 * 2 );
 
-    table_size = Count * valid->extra1 * 2 + 2;
+    table_size = Count * otvalid->extra1 * 2 + 2;
 
     for ( ; Count > 0; Count-- )
-      for ( count1 = valid->extra1; count1 > 0; count1-- )
+      for ( count1 = otvalid->extra1; count1 > 0; count1-- )
       {
         OTV_OPTIONAL_TABLE( anchor_offset );
 
 
         OTV_OPTIONAL_OFFSET( anchor_offset );
 
-        if ( valid->extra2 )
+        if ( otvalid->extra2 )
         {
           OTV_SIZE_CHECK( anchor_offset );
           if ( anchor_offset )
-            otv_Anchor_validate( table + anchor_offset, valid );
+            otv_Anchor_validate( table + anchor_offset, otvalid );
         }
         else
-          otv_Anchor_validate( table + anchor_offset, valid );
+          otv_Anchor_validate( table + anchor_offset, otvalid );
       }
 
     OTV_EXIT;
@@ -101,11 +101,11 @@
 #define MarkLigPosFormat1Func   otv_u_O_O_u_O_O
 #define MarkMarkPosFormat1Func  otv_u_O_O_u_O_O
 
-  /* sets valid->extra1 (class count) */
+  /* sets otvalid->extra1 (class count) */
 
   static void
   otv_u_O_O_u_O_O( FT_Bytes       table,
-                   OTV_Validator  valid )
+                   OTV_Validator  otvalid )
   {
     FT_Bytes           p = table;
     FT_UInt            Coverage1, Coverage2, ClassCount;
@@ -124,18 +124,18 @@
     Array1     = FT_NEXT_USHORT( p );
     Array2     = FT_NEXT_USHORT( p );
 
-    otv_Coverage_validate( table + Coverage1, valid, -1 );
-    otv_Coverage_validate( table + Coverage2, valid, -1 );
+    otv_Coverage_validate( table + Coverage1, otvalid, -1 );
+    otv_Coverage_validate( table + Coverage2, otvalid, -1 );
 
-    otv_MarkArray_validate( table + Array1, valid );
+    otv_MarkArray_validate( table + Array1, otvalid );
 
-    valid->nesting_level++;
-    func          = valid->func[valid->nesting_level];
-    valid->extra1 = ClassCount;
+    otvalid->nesting_level++;
+    func          = otvalid->func[otvalid->nesting_level];
+    otvalid->extra1 = ClassCount;
 
-    func( table + Array2, valid );
+    func( table + Array2, otvalid );
 
-    valid->nesting_level--;
+    otvalid->nesting_level--;
 
     OTV_EXIT;
   }
@@ -163,12 +163,12 @@
   }
 
 
-  /* uses valid->extra3 (pointer to base table) */
+  /* uses otvalid->extra3 (pointer to base table) */
 
   static void
   otv_ValueRecord_validate( FT_Bytes       table,
                             FT_UInt        format,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   count;
@@ -222,11 +222,11 @@
         /* ValueRecord is part of an array -- getting the correct table    */
         /* size is probably not worth the trouble                          */
 
-        table_size = p - valid->extra3;
+        table_size = p - otvalid->extra3;
 
         OTV_SIZE_CHECK( device );
         if ( device )
-          otv_Device_validate( valid->extra3 + device, valid );
+          otv_Device_validate( otvalid->extra3 + device, otvalid );
       }
       format >>= 1;
     }
@@ -245,7 +245,7 @@
 
   static void
   otv_Anchor_validate( FT_Bytes       table,
-                       OTV_Validator  valid )
+                       OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   AnchorFormat;
@@ -285,11 +285,11 @@
 
         OTV_SIZE_CHECK( XDeviceTable );
         if ( XDeviceTable )
-          otv_Device_validate( table + XDeviceTable, valid );
+          otv_Device_validate( table + XDeviceTable, otvalid );
 
         OTV_SIZE_CHECK( YDeviceTable );
         if ( YDeviceTable )
-          otv_Device_validate( table + YDeviceTable, valid );
+          otv_Device_validate( table + YDeviceTable, otvalid );
       }
       break;
 
@@ -311,7 +311,7 @@
 
   static void
   otv_MarkArray_validate( FT_Bytes       table,
-                          OTV_Validator  valid )
+                          OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   MarkCount;
@@ -331,7 +331,7 @@
     {
       p += 2;   /* skip Class */
       /* MarkAnchor */
-      otv_Anchor_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_Anchor_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
@@ -346,11 +346,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra3 (pointer to base table) */
+  /* sets otvalid->extra3 (pointer to base table) */
 
   static void
   otv_SinglePos_validate( FT_Bytes       table,
-                          OTV_Validator  valid )
+                          OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -363,7 +363,7 @@
 
     OTV_TRACE(( " (format %d)\n", PosFormat ));
 
-    valid->extra3 = table;
+    otvalid->extra3 = table;
 
     switch ( PosFormat )
     {
@@ -376,8 +376,8 @@
         Coverage    = FT_NEXT_USHORT( p );
         ValueFormat = FT_NEXT_USHORT( p );
 
-        otv_Coverage_validate( table + Coverage, valid, -1 );
-        otv_ValueRecord_validate( p, ValueFormat, valid ); /* Value */
+        otv_Coverage_validate( table + Coverage, otvalid, -1 );
+        otv_ValueRecord_validate( p, ValueFormat, otvalid ); /* Value */
       }
       break;
 
@@ -395,14 +395,14 @@
 
         len_value = otv_value_length( ValueFormat );
 
-        otv_Coverage_validate( table + Coverage, valid, ValueCount );
+        otv_Coverage_validate( table + Coverage, otvalid, ValueCount );
 
         OTV_LIMIT_CHECK( ValueCount * len_value );
 
         /* Value */
         for ( ; ValueCount > 0; ValueCount-- )
         {
-          otv_ValueRecord_validate( p, ValueFormat, valid );
+          otv_ValueRecord_validate( p, ValueFormat, otvalid );
           p += len_value;
         }
       }
@@ -428,7 +428,7 @@
   otv_PairSet_validate( FT_Bytes       table,
                         FT_UInt        format1,
                         FT_UInt        format2,
-                        OTV_Validator  valid )
+                        OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   value_len1, value_len2, PairValueCount;
@@ -452,11 +452,11 @@
       p += 2;       /* skip SecondGlyph */
 
       if ( format1 )
-        otv_ValueRecord_validate( p, format1, valid ); /* Value1 */
+        otv_ValueRecord_validate( p, format1, otvalid ); /* Value1 */
       p += value_len1;
 
       if ( format2 )
-        otv_ValueRecord_validate( p, format2, valid ); /* Value2 */
+        otv_ValueRecord_validate( p, format2, otvalid ); /* Value2 */
       p += value_len2;
     }
 
@@ -464,11 +464,11 @@
   }
 
 
-  /* sets valid->extra3 (pointer to base table) */
+  /* sets otvalid->extra3 (pointer to base table) */
 
   static void
   otv_PairPos_validate( FT_Bytes       table,
-                        OTV_Validator  valid )
+                        OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -481,7 +481,7 @@
 
     OTV_TRACE(( " (format %d)\n", PosFormat ));
 
-    valid->extra3 = table;
+    otvalid->extra3 = table;
 
     switch ( PosFormat )
     {
@@ -498,14 +498,14 @@
 
         OTV_TRACE(( " (PairSetCount = %d)\n", PairSetCount ));
 
-        otv_Coverage_validate( table + Coverage, valid, -1 );
+        otv_Coverage_validate( table + Coverage, otvalid, -1 );
 
         OTV_LIMIT_CHECK( PairSetCount * 2 );
 
         /* PairSetOffset */
         for ( ; PairSetCount > 0; PairSetCount-- )
           otv_PairSet_validate( table + FT_NEXT_USHORT( p ),
-                                ValueFormat1, ValueFormat2, valid );
+                                ValueFormat1, ValueFormat2, otvalid );
       }
       break;
 
@@ -530,9 +530,9 @@
         len_value1 = otv_value_length( ValueFormat1 );
         len_value2 = otv_value_length( ValueFormat2 );
 
-        otv_Coverage_validate( table + Coverage, valid, -1 );
-        otv_ClassDef_validate( table + ClassDef1, valid );
-        otv_ClassDef_validate( table + ClassDef2, valid );
+        otv_Coverage_validate( table + Coverage, otvalid, -1 );
+        otv_ClassDef_validate( table + ClassDef1, otvalid );
+        otv_ClassDef_validate( table + ClassDef2, otvalid );
 
         OTV_LIMIT_CHECK( ClassCount1 * ClassCount2 *
                      ( len_value1 + len_value2 ) );
@@ -545,12 +545,12 @@
           {
             if ( ValueFormat1 )
               /* Value1 */
-              otv_ValueRecord_validate( p, ValueFormat1, valid );
+              otv_ValueRecord_validate( p, ValueFormat1, otvalid );
             p += len_value1;
 
             if ( ValueFormat2 )
               /* Value2 */
-              otv_ValueRecord_validate( p, ValueFormat2, valid );
+              otv_ValueRecord_validate( p, ValueFormat2, otvalid );
             p += len_value2;
           }
         }
@@ -575,7 +575,7 @@
 
   static void
   otv_CursivePos_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -605,7 +605,7 @@
 
         OTV_TRACE(( " (EntryExitCount = %d)\n", EntryExitCount ));
 
-        otv_Coverage_validate( table + Coverage, valid, EntryExitCount );
+        otv_Coverage_validate( table + Coverage, otvalid, EntryExitCount );
 
         OTV_LIMIT_CHECK( EntryExitCount * 4 );
 
@@ -619,11 +619,11 @@
 
           OTV_SIZE_CHECK( EntryAnchor );
           if ( EntryAnchor )
-            otv_Anchor_validate( table + EntryAnchor, valid );
+            otv_Anchor_validate( table + EntryAnchor, otvalid );
 
           OTV_SIZE_CHECK( ExitAnchor );
           if ( ExitAnchor )
-            otv_Anchor_validate( table + ExitAnchor, valid );
+            otv_Anchor_validate( table + ExitAnchor, otvalid );
         }
       }
       break;
@@ -647,11 +647,11 @@
   /* UNDOCUMENTED (in OpenType 1.5):              */
   /* BaseRecord tables can contain NULL pointers. */
 
-  /* sets valid->extra2 (1) */
+  /* sets otvalid->extra2 (1) */
 
   static void
   otv_MarkBasePos_validate( FT_Bytes       table,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -667,9 +667,9 @@
     switch ( PosFormat )
     {
     case 1:
-      valid->extra2 = 1;
+      otvalid->extra2 = 1;
       OTV_NEST2( MarkBasePosFormat1, BaseArray );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -688,11 +688,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra2 (1) */
+  /* sets otvalid->extra2 (1) */
 
   static void
   otv_MarkLigPos_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -708,9 +708,9 @@
     switch ( PosFormat )
     {
     case 1:
-      valid->extra2 = 1;
+      otvalid->extra2 = 1;
       OTV_NEST3( MarkLigPosFormat1, LigatureArray, LigatureAttach );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -729,11 +729,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra2 (0) */
+  /* sets otvalid->extra2 (0) */
 
   static void
   otv_MarkMarkPos_validate( FT_Bytes       table,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -749,9 +749,9 @@
     switch ( PosFormat )
     {
     case 1:
-      valid->extra2 = 0;
+      otvalid->extra2 = 0;
       OTV_NEST2( MarkMarkPosFormat1, Mark2Array );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -770,11 +770,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (lookup count) */
+  /* sets otvalid->extra1 (lookup count) */
 
   static void
   otv_ContextPos_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -794,9 +794,9 @@
       /* context rules since even invalid glyph indices/classes return  */
       /* meaningful results                                             */
 
-      valid->extra1 = valid->lookup_count;
+      otvalid->extra1 = otvalid->lookup_count;
       OTV_NEST3( ContextPosFormat1, PosRuleSet, PosRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 2:
@@ -805,12 +805,12 @@
       /* meaningful results                                             */
 
       OTV_NEST3( ContextPosFormat2, PosClassSet, PosClassRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 3:
       OTV_NEST1( ContextPosFormat3 );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -829,11 +829,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (lookup count) */
+  /* sets otvalid->extra1 (lookup count) */
 
   static void
   otv_ChainContextPos_validate( FT_Bytes       table,
-                                OTV_Validator  valid )
+                                OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -853,10 +853,10 @@
       /* context rules since even invalid glyph indices/classes return  */
       /* meaningful results                                             */
 
-      valid->extra1 = valid->lookup_count;
+      otvalid->extra1 = otvalid->lookup_count;
       OTV_NEST3( ChainContextPosFormat1,
                  ChainPosRuleSet, ChainPosRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 2:
@@ -866,12 +866,12 @@
 
       OTV_NEST3( ChainContextPosFormat2,
                  ChainPosClassSet, ChainPosClassRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 3:
       OTV_NEST1( ChainContextPosFormat3 );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -890,11 +890,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->type_funcs */
+  /* uses otvalid->type_funcs */
 
   static void
   otv_ExtensionPos_validate( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   PosFormat;
@@ -923,8 +923,8 @@
         if ( ExtensionLookupType == 0 || ExtensionLookupType >= 9 )
           FT_INVALID_DATA;
 
-        validate = valid->type_funcs[ExtensionLookupType - 1];
-        validate( table + ExtensionOffset, valid );
+        validate = otvalid->type_funcs[ExtensionLookupType - 1];
+        validate( table + ExtensionOffset, otvalid );
       }
       break;
 
@@ -950,17 +950,17 @@
   };
 
 
-  /* sets valid->type_count */
-  /* sets valid->type_funcs */
+  /* sets otvalid->type_count */
+  /* sets otvalid->type_funcs */
 
   FT_LOCAL_DEF( void )
   otv_GPOS_subtable_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
-    valid->type_count = 9;
-    valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs;
+    otvalid->type_count = 9;
+    otvalid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs;
 
-    otv_Lookup_validate( table, valid );
+    otv_Lookup_validate( table, otvalid );
   }
 
 
@@ -972,7 +972,7 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->glyph_count */
+  /* sets otvalid->glyph_count */
 
   FT_LOCAL_DEF( void )
   otv_GPOS_validate( FT_Bytes      table,
@@ -980,12 +980,12 @@
                      FT_Validator  ftvalid )
   {
     OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
+    OTV_Validator     otvalid = &validrec;
     FT_Bytes          p     = table;
     FT_UInt           ScriptList, FeatureList, LookupList;
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
 
     FT_TRACE3(( "validating GPOS table\n" ));
     OTV_INIT;
@@ -999,16 +999,16 @@
     FeatureList = FT_NEXT_USHORT( p );
     LookupList  = FT_NEXT_USHORT( p );
 
-    valid->type_count  = 9;
-    valid->type_funcs  = (OTV_Validate_Func*)otv_gpos_validate_funcs;
-    valid->glyph_count = glyph_count;
+    otvalid->type_count  = 9;
+    otvalid->type_funcs  = (OTV_Validate_Func*)otv_gpos_validate_funcs;
+    otvalid->glyph_count = glyph_count;
 
     otv_LookupList_validate( table + LookupList,
-                             valid );
+                             otvalid );
     otv_FeatureList_validate( table + FeatureList, table + LookupList,
-                              valid );
+                              otvalid );
     otv_ScriptList_validate( table + ScriptList, table + FeatureList,
-                             valid );
+                             otvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgpos.h b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgpos.h
index 14ca408261d..14ca408261d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgpos.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgpos.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgsub.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgsub.c
index ed499d1e92d..024b8ca68cd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvgsub.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvgsub.c
@@ -38,11 +38,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->glyph_count */
+  /* uses otvalid->glyph_count */
 
   static void
   otv_SingleSubst_validate( FT_Bytes       table,
-                            OTV_Validator  valid )
+                            OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -68,14 +68,14 @@
         Coverage     = table + FT_NEXT_USHORT( p );
         DeltaGlyphID = FT_NEXT_SHORT( p );
 
-        otv_Coverage_validate( Coverage, valid, -1 );
+        otv_Coverage_validate( Coverage, otvalid, -1 );
 
         idx = otv_Coverage_get_first( Coverage ) + DeltaGlyphID;
         if ( idx < 0 )
           FT_INVALID_DATA;
 
         idx = otv_Coverage_get_last( Coverage ) + DeltaGlyphID;
-        if ( (FT_UInt)idx >= valid->glyph_count )
+        if ( (FT_UInt)idx >= otvalid->glyph_count )
           FT_INVALID_DATA;
       }
       break;
@@ -91,13 +91,13 @@
 
         OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
 
-        otv_Coverage_validate( table + Coverage, valid, GlyphCount );
+        otv_Coverage_validate( table + Coverage, otvalid, GlyphCount );
 
         OTV_LIMIT_CHECK( GlyphCount * 2 );
 
         /* Substitute */
         for ( ; GlyphCount > 0; GlyphCount-- )
-          if ( FT_NEXT_USHORT( p ) >= valid->glyph_count )
+          if ( FT_NEXT_USHORT( p ) >= otvalid->glyph_count )
             FT_INVALID_GLYPH_ID;
       }
       break;
@@ -118,11 +118,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (glyph count) */
+  /* sets otvalid->extra1 (glyph count) */
 
   static void
   otv_MultipleSubst_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -138,9 +138,9 @@
     switch ( SubstFormat )
     {
     case 1:
-      valid->extra1 = valid->glyph_count;
+      otvalid->extra1 = otvalid->glyph_count;
       OTV_NEST2( MultipleSubstFormat1, Sequence );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -159,11 +159,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (glyph count) */
+  /* sets otvalid->extra1 (glyph count) */
 
   static void
   otv_AlternateSubst_validate( FT_Bytes       table,
-                               OTV_Validator  valid )
+                               OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -179,9 +179,9 @@
     switch ( SubstFormat )
     {
     case 1:
-      valid->extra1 = valid->glyph_count;
+      otvalid->extra1 = otvalid->glyph_count;
       OTV_NEST2( AlternateSubstFormat1, AlternateSet );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -202,11 +202,11 @@
 
 #define LigatureFunc  otv_Ligature_validate
 
-  /* uses valid->glyph_count */
+  /* uses otvalid->glyph_count */
 
   static void
   otv_Ligature_validate( FT_Bytes       table,
-                         OTV_Validator  valid )
+                         OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   LigatureGlyph, CompCount;
@@ -216,7 +216,7 @@
 
     OTV_LIMIT_CHECK( 4 );
     LigatureGlyph = FT_NEXT_USHORT( p );
-    if ( LigatureGlyph >= valid->glyph_count )
+    if ( LigatureGlyph >= otvalid->glyph_count )
       FT_INVALID_DATA;
 
     CompCount = FT_NEXT_USHORT( p );
@@ -238,7 +238,7 @@
 
   static void
   otv_LigatureSubst_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -255,7 +255,7 @@
     {
     case 1:
       OTV_NEST3( LigatureSubstFormat1, LigatureSet, Ligature );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -274,11 +274,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (lookup count) */
+  /* sets otvalid->extra1 (lookup count) */
 
   static void
   otv_ContextSubst_validate( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -298,9 +298,9 @@
       /* context rules since even invalid glyph indices/classes return  */
       /* meaningful results                                             */
 
-      valid->extra1 = valid->lookup_count;
+      otvalid->extra1 = otvalid->lookup_count;
       OTV_NEST3( ContextSubstFormat1, SubRuleSet, SubRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 2:
@@ -309,12 +309,12 @@
       /* meaningful results                                             */
 
       OTV_NEST3( ContextSubstFormat2, SubClassSet, SubClassRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 3:
       OTV_NEST1( ContextSubstFormat3 );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -333,11 +333,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->extra1 (lookup count)            */
+  /* sets otvalid->extra1 (lookup count)            */
 
   static void
   otv_ChainContextSubst_validate( FT_Bytes       table,
-                                  OTV_Validator  valid )
+                                  OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -357,10 +357,10 @@
       /* context rules since even invalid glyph indices/classes return  */
       /* meaningful results                                             */
 
-      valid->extra1 = valid->lookup_count;
+      otvalid->extra1 = otvalid->lookup_count;
       OTV_NEST3( ChainContextSubstFormat1,
                  ChainSubRuleSet, ChainSubRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 2:
@@ -370,12 +370,12 @@
 
       OTV_NEST3( ChainContextSubstFormat2,
                  ChainSubClassSet, ChainSubClassRule );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     case 3:
       OTV_NEST1( ChainContextSubstFormat3 );
-      OTV_RUN( table, valid );
+      OTV_RUN( table, otvalid );
       break;
 
     default:
@@ -394,11 +394,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->type_funcs */
+  /* uses otvalid->type_funcs */
 
   static void
   otv_ExtensionSubst_validate( FT_Bytes       table,
-                               OTV_Validator  valid )
+                               OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   SubstFormat;
@@ -429,8 +429,8 @@
              ExtensionLookupType > 8  )
           FT_INVALID_DATA;
 
-        validate = valid->type_funcs[ExtensionLookupType - 1];
-        validate( table + ExtensionOffset, valid );
+        validate = otvalid->type_funcs[ExtensionLookupType - 1];
+        validate( table + ExtensionOffset, otvalid );
       }
       break;
 
@@ -450,11 +450,11 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* uses valid->glyph_count */
+  /* uses otvalid->glyph_count */
 
   static void
   otv_ReverseChainSingleSubst_validate( FT_Bytes       table,
-                                        OTV_Validator  valid )
+                                        OTV_Validator  otvalid )
   {
     FT_Bytes  p = table, Coverage;
     FT_UInt   SubstFormat;
@@ -477,12 +477,12 @@
 
       OTV_TRACE(( " (BacktrackGlyphCount = %d)\n", BacktrackGlyphCount ));
 
-      otv_Coverage_validate( Coverage, valid, -1 );
+      otv_Coverage_validate( Coverage, otvalid, -1 );
 
       OTV_LIMIT_CHECK( BacktrackGlyphCount * 2 + 2 );
 
       for ( ; BacktrackGlyphCount > 0; BacktrackGlyphCount-- )
-        otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+        otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
       LookaheadGlyphCount = FT_NEXT_USHORT( p );
 
@@ -491,7 +491,7 @@
       OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 );
 
       for ( ; LookaheadGlyphCount > 0; LookaheadGlyphCount-- )
-        otv_Coverage_validate( table + FT_NEXT_USHORT( p ), valid, -1 );
+        otv_Coverage_validate( table + FT_NEXT_USHORT( p ), otvalid, -1 );
 
       GlyphCount = FT_NEXT_USHORT( p );
 
@@ -504,7 +504,7 @@
 
       /* Substitute */
       for ( ; GlyphCount > 0; GlyphCount-- )
-        if ( FT_NEXT_USHORT( p ) >= valid->glyph_count )
+        if ( FT_NEXT_USHORT( p ) >= otvalid->glyph_count )
           FT_INVALID_DATA;
 
       break;
@@ -538,22 +538,22 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->type_count  */
-  /* sets valid->type_funcs  */
-  /* sets valid->glyph_count */
+  /* sets otvalid->type_count  */
+  /* sets otvalid->type_funcs  */
+  /* sets otvalid->glyph_count */
 
   FT_LOCAL_DEF( void )
   otv_GSUB_validate( FT_Bytes      table,
                      FT_UInt       glyph_count,
                      FT_Validator  ftvalid )
   {
-    OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
-    FT_Bytes          p     = table;
+    OTV_ValidatorRec  otvalidrec;
+    OTV_Validator     otvalid = &otvalidrec;
+    FT_Bytes          p       = table;
     FT_UInt           ScriptList, FeatureList, LookupList;
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
 
     FT_TRACE3(( "validating GSUB table\n" ));
     OTV_INIT;
@@ -567,16 +567,16 @@
     FeatureList = FT_NEXT_USHORT( p );
     LookupList  = FT_NEXT_USHORT( p );
 
-    valid->type_count  = 8;
-    valid->type_funcs  = (OTV_Validate_Func*)otv_gsub_validate_funcs;
-    valid->glyph_count = glyph_count;
+    otvalid->type_count  = 8;
+    otvalid->type_funcs  = (OTV_Validate_Func*)otv_gsub_validate_funcs;
+    otvalid->glyph_count = glyph_count;
 
     otv_LookupList_validate( table + LookupList,
-                             valid );
+                             otvalid );
     otv_FeatureList_validate( table + FeatureList, table + LookupList,
-                              valid );
+                              otvalid );
     otv_ScriptList_validate( table + ScriptList, table + FeatureList,
-                             valid );
+                             otvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvjstf.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvjstf.c
index a616a23432c..f273be8bbc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvjstf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvjstf.c
@@ -34,13 +34,13 @@
 #define JstfPriorityFunc  otv_JstfPriority_validate
 #define JstfLookupFunc    otv_GPOS_subtable_validate
 
-  /* uses valid->extra1 (GSUB lookup count) */
-  /* uses valid->extra2 (GPOS lookup count) */
-  /* sets valid->extra1 (counter)           */
+  /* uses otvalid->extra1 (GSUB lookup count) */
+  /* uses otvalid->extra2 (GPOS lookup count) */
+  /* sets otvalid->extra1 (counter)           */
 
   static void
   otv_JstfPriority_validate( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   table_size;
@@ -63,34 +63,34 @@
 
     OTV_LIMIT_CHECK( 20 );
 
-    gsub_lookup_count = valid->extra1;
-    gpos_lookup_count = valid->extra2;
+    gsub_lookup_count = otvalid->extra1;
+    gpos_lookup_count = otvalid->extra2;
 
     table_size = 20;
 
-    valid->extra1 = gsub_lookup_count;
+    otvalid->extra1 = gsub_lookup_count;
 
     OTV_OPTIONAL_OFFSET( ShrinkageEnableGSUB );
     OTV_SIZE_CHECK( ShrinkageEnableGSUB );
     if ( ShrinkageEnableGSUB )
-      otv_x_ux( table + ShrinkageEnableGSUB, valid );
+      otv_x_ux( table + ShrinkageEnableGSUB, otvalid );
 
     OTV_OPTIONAL_OFFSET( ShrinkageDisableGSUB );
     OTV_SIZE_CHECK( ShrinkageDisableGSUB );
     if ( ShrinkageDisableGSUB )
-      otv_x_ux( table + ShrinkageDisableGSUB, valid );
+      otv_x_ux( table + ShrinkageDisableGSUB, otvalid );
 
-    valid->extra1 = gpos_lookup_count;
+    otvalid->extra1 = gpos_lookup_count;
 
     OTV_OPTIONAL_OFFSET( ShrinkageEnableGPOS );
     OTV_SIZE_CHECK( ShrinkageEnableGPOS );
     if ( ShrinkageEnableGPOS )
-      otv_x_ux( table + ShrinkageEnableGPOS, valid );
+      otv_x_ux( table + ShrinkageEnableGPOS, otvalid );
 
     OTV_OPTIONAL_OFFSET( ShrinkageDisableGPOS );
     OTV_SIZE_CHECK( ShrinkageDisableGPOS );
     if ( ShrinkageDisableGPOS )
-      otv_x_ux( table + ShrinkageDisableGPOS, valid );
+      otv_x_ux( table + ShrinkageDisableGPOS, otvalid );
 
     OTV_OPTIONAL_OFFSET( ShrinkageJstfMax );
     OTV_SIZE_CHECK( ShrinkageJstfMax );
@@ -98,32 +98,32 @@
     {
       /* XXX: check lookup types? */
       OTV_NEST2( JstfMax, JstfLookup );
-      OTV_RUN( table + ShrinkageJstfMax, valid );
+      OTV_RUN( table + ShrinkageJstfMax, otvalid );
     }
 
-    valid->extra1 = gsub_lookup_count;
+    otvalid->extra1 = gsub_lookup_count;
 
     OTV_OPTIONAL_OFFSET( ExtensionEnableGSUB );
     OTV_SIZE_CHECK( ExtensionEnableGSUB );
     if ( ExtensionEnableGSUB )
-      otv_x_ux( table + ExtensionEnableGSUB, valid );
+      otv_x_ux( table + ExtensionEnableGSUB, otvalid );
 
     OTV_OPTIONAL_OFFSET( ExtensionDisableGSUB );
     OTV_SIZE_CHECK( ExtensionDisableGSUB );
     if ( ExtensionDisableGSUB )
-      otv_x_ux( table + ExtensionDisableGSUB, valid );
+      otv_x_ux( table + ExtensionDisableGSUB, otvalid );
 
-    valid->extra1 = gpos_lookup_count;
+    otvalid->extra1 = gpos_lookup_count;
 
     OTV_OPTIONAL_OFFSET( ExtensionEnableGPOS );
     OTV_SIZE_CHECK( ExtensionEnableGPOS );
     if ( ExtensionEnableGPOS )
-      otv_x_ux( table + ExtensionEnableGPOS, valid );
+      otv_x_ux( table + ExtensionEnableGPOS, otvalid );
 
     OTV_OPTIONAL_OFFSET( ExtensionDisableGPOS );
     OTV_SIZE_CHECK( ExtensionDisableGPOS );
     if ( ExtensionDisableGPOS )
-      otv_x_ux( table + ExtensionDisableGPOS, valid );
+      otv_x_ux( table + ExtensionDisableGPOS, otvalid );
 
     OTV_OPTIONAL_OFFSET( ExtensionJstfMax );
     OTV_SIZE_CHECK( ExtensionJstfMax );
@@ -131,22 +131,22 @@
     {
       /* XXX: check lookup types? */
       OTV_NEST2( JstfMax, JstfLookup );
-      OTV_RUN( table + ExtensionJstfMax, valid );
+      OTV_RUN( table + ExtensionJstfMax, otvalid );
     }
 
-    valid->extra1 = gsub_lookup_count;
-    valid->extra2 = gpos_lookup_count;
+    otvalid->extra1 = gsub_lookup_count;
+    otvalid->extra2 = gpos_lookup_count;
 
     OTV_EXIT;
   }
 
 
-  /* sets valid->extra (glyph count)               */
-  /* sets valid->func1 (otv_JstfPriority_validate) */
+  /* sets otvalid->extra (glyph count)               */
+  /* sets otvalid->func1 (otv_JstfPriority_validate) */
 
   static void
   otv_JstfScript_validate( FT_Bytes       table,
-                           OTV_Validator  valid )
+                           OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   table_size;
@@ -170,16 +170,16 @@
     OTV_SIZE_CHECK( ExtGlyph );
     if ( ExtGlyph )
     {
-      valid->extra1 = valid->glyph_count;
+      otvalid->extra1 = otvalid->glyph_count;
       OTV_NEST1( ExtenderGlyph );
-      OTV_RUN( table + ExtGlyph, valid );
+      OTV_RUN( table + ExtGlyph, otvalid );
     }
 
     OTV_SIZE_CHECK( DefJstfLangSys );
     if ( DefJstfLangSys )
     {
       OTV_NEST2( JstfLangSys, JstfPriority );
-      OTV_RUN( table + DefJstfLangSys, valid );
+      OTV_RUN( table + DefJstfLangSys, otvalid );
     }
 
     OTV_LIMIT_CHECK( 6 * JstfLangSysCount );
@@ -190,16 +190,16 @@
     {
       p += 4;       /* skip JstfLangSysTag */
 
-      OTV_RUN( table + FT_NEXT_USHORT( p ), valid );
+      OTV_RUN( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     OTV_EXIT;
   }
 
 
-  /* sets valid->extra1 (GSUB lookup count) */
-  /* sets valid->extra2 (GPOS lookup count) */
-  /* sets valid->glyph_count                */
+  /* sets otvalid->extra1 (GSUB lookup count) */
+  /* sets otvalid->extra2 (GPOS lookup count) */
+  /* sets otvalid->glyph_count                */
 
   FT_LOCAL_DEF( void )
   otv_JSTF_validate( FT_Bytes      table,
@@ -208,13 +208,14 @@
                      FT_UInt       glyph_count,
                      FT_Validator  ftvalid )
   {
-    OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
+    OTV_ValidatorRec  otvalidrec;
+    OTV_Validator     otvalid = &otvalidrec;
     FT_Bytes          p     = table;
     FT_UInt           JstfScriptCount;
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
+
 
     FT_TRACE3(( "validating JSTF table\n" ));
     OTV_INIT;
@@ -231,16 +232,16 @@
     OTV_LIMIT_CHECK( JstfScriptCount * 6 );
 
     if ( gsub )
-      valid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub );
+      otvalid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub );
     else
-      valid->extra1 = 0;
+      otvalid->extra1 = 0;
 
     if ( gpos )
-      valid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos );
+      otvalid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos );
     else
-      valid->extra2 = 0;
+      otvalid->extra2 = 0;
 
-    valid->glyph_count = glyph_count;
+    otvalid->glyph_count = glyph_count;
 
     /* JstfScriptRecord */
     for ( ; JstfScriptCount > 0; JstfScriptCount-- )
@@ -248,7 +249,7 @@
       p += 4;       /* skip JstfScriptTag */
 
       /* JstfScript */
-      otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), valid );
+      otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), otvalid );
     }
 
     FT_TRACE4(( "\n" ));
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmath.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmath.c
index 96f841f2a9c..d1791f8debf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmath.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmath.c
@@ -44,7 +44,7 @@
 
   static void
   otv_MathConstants_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   i;
@@ -66,7 +66,7 @@
       OTV_OPTIONAL_OFFSET( DeviceTableOffset );
       OTV_SIZE_CHECK( DeviceTableOffset );
       if ( DeviceTableOffset )
-        otv_Device_validate( table + DeviceTableOffset, valid );
+        otv_Device_validate( table + DeviceTableOffset, otvalid );
     }
 
     OTV_EXIT;
@@ -84,7 +84,7 @@
 
   static void
   otv_MathItalicsCorrectionInfo_validate( FT_Bytes       table,
-                                          OTV_Validator  valid,
+                                          OTV_Validator  otvalid,
                                           FT_Int         isItalic )
   {
     FT_Bytes  p = table;
@@ -108,7 +108,7 @@
     table_size = 4 + 4 * cnt;
 
     OTV_SIZE_CHECK( Coverage );
-    otv_Coverage_validate( table + Coverage, valid, cnt );
+    otv_Coverage_validate( table + Coverage, otvalid, cnt );
 
     for ( i = 0; i < cnt; ++i )
     {
@@ -116,7 +116,7 @@
       OTV_OPTIONAL_OFFSET( DeviceTableOffset );
       OTV_SIZE_CHECK( DeviceTableOffset );
       if ( DeviceTableOffset )
-        otv_Device_validate( table + DeviceTableOffset, valid );
+        otv_Device_validate( table + DeviceTableOffset, otvalid );
     }
 
     OTV_EXIT;
@@ -133,7 +133,7 @@
 
   static void
   otv_MathKern_validate( FT_Bytes       table,
-                         OTV_Validator  valid )
+                         OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   i, cnt, table_size;
@@ -157,7 +157,7 @@
       OTV_OPTIONAL_OFFSET( DeviceTableOffset );
       OTV_SIZE_CHECK( DeviceTableOffset );
       if ( DeviceTableOffset )
-        otv_Device_validate( table + DeviceTableOffset, valid );
+        otv_Device_validate( table + DeviceTableOffset, otvalid );
     }
 
     /* One more Kerning value */
@@ -167,7 +167,7 @@
       OTV_OPTIONAL_OFFSET( DeviceTableOffset );
       OTV_SIZE_CHECK( DeviceTableOffset );
       if ( DeviceTableOffset )
-        otv_Device_validate( table + DeviceTableOffset, valid );
+        otv_Device_validate( table + DeviceTableOffset, otvalid );
     }
 
     OTV_EXIT;
@@ -176,7 +176,7 @@
 
   static void
   otv_MathKernInfo_validate( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   i, j, cnt, table_size;
@@ -196,7 +196,7 @@
     table_size = 4 + 8 * cnt;
 
     OTV_SIZE_CHECK( Coverage );
-    otv_Coverage_validate( table + Coverage, valid, cnt );
+    otv_Coverage_validate( table + Coverage, otvalid, cnt );
 
     for ( i = 0; i < cnt; ++i )
     {
@@ -205,7 +205,7 @@
         OTV_OPTIONAL_OFFSET( MKRecordOffset );
         OTV_SIZE_CHECK( MKRecordOffset );
         if ( MKRecordOffset )
-          otv_MathKern_validate( table + MKRecordOffset, valid );
+          otv_MathKern_validate( table + MKRecordOffset, otvalid );
       }
     }
 
@@ -223,7 +223,7 @@
 
   static void
   otv_MathGlyphInfo_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   MathItalicsCorrectionInfo, MathTopAccentAttachment;
@@ -241,22 +241,22 @@
 
     if ( MathItalicsCorrectionInfo )
       otv_MathItalicsCorrectionInfo_validate(
-        table + MathItalicsCorrectionInfo, valid, TRUE );
+        table + MathItalicsCorrectionInfo, otvalid, TRUE );
 
     /* Italic correction and Top Accent Attachment have the same format */
     if ( MathTopAccentAttachment )
       otv_MathItalicsCorrectionInfo_validate(
-        table + MathTopAccentAttachment, valid, FALSE );
+        table + MathTopAccentAttachment, otvalid, FALSE );
 
     if ( ExtendedShapeCoverage )
     {
       OTV_NAME_ENTER( "ExtendedShapeCoverage" );
-      otv_Coverage_validate( table + ExtendedShapeCoverage, valid, -1 );
+      otv_Coverage_validate( table + ExtendedShapeCoverage, otvalid, -1 );
       OTV_EXIT;
     }
 
     if ( MathKernInfo )
-      otv_MathKernInfo_validate( table + MathKernInfo, valid );
+      otv_MathKernInfo_validate( table + MathKernInfo, otvalid );
 
     OTV_EXIT;
   }
@@ -272,7 +272,7 @@
 
   static void
   otv_GlyphAssembly_validate( FT_Bytes       table,
-                              OTV_Validator  valid )
+                              OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   pcnt, table_size;
@@ -294,7 +294,7 @@
 
     OTV_SIZE_CHECK( DeviceTableOffset );
     if ( DeviceTableOffset )
-      otv_Device_validate( table + DeviceTableOffset, valid );
+      otv_Device_validate( table + DeviceTableOffset, otvalid );
 
     for ( i = 0; i < pcnt; ++i )
     {
@@ -302,7 +302,7 @@
 
 
       gid = FT_NEXT_USHORT( p );
-      if ( gid >= valid->glyph_count )
+      if ( gid >= otvalid->glyph_count )
         FT_INVALID_GLYPH_ID;
       p += 2*4;             /* skip the Start, End, Full, and Flags fields */
     }
@@ -313,7 +313,7 @@
 
   static void
   otv_MathGlyphConstruction_validate( FT_Bytes       table,
-                                      OTV_Validator  valid )
+                                      OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   vcnt, table_size;
@@ -338,14 +338,14 @@
 
 
       gid = FT_NEXT_USHORT( p );
-      if ( gid >= valid->glyph_count )
+      if ( gid >= otvalid->glyph_count )
         FT_INVALID_GLYPH_ID;
       p += 2;                          /* skip the size */
     }
 
     OTV_SIZE_CHECK( GlyphAssembly );
     if ( GlyphAssembly )
-      otv_GlyphAssembly_validate( table+GlyphAssembly, valid );
+      otv_GlyphAssembly_validate( table+GlyphAssembly, otvalid );
 
     /* OTV_EXIT; */
   }
@@ -353,7 +353,7 @@
 
   static void
   otv_MathVariants_validate( FT_Bytes       table,
-                             OTV_Validator  valid )
+                             OTV_Validator  otvalid )
   {
     FT_Bytes  p = table;
     FT_UInt   vcnt, hcnt, i, table_size;
@@ -378,24 +378,24 @@
 
     OTV_SIZE_CHECK( VCoverage );
     if ( VCoverage )
-      otv_Coverage_validate( table + VCoverage, valid, vcnt );
+      otv_Coverage_validate( table + VCoverage, otvalid, vcnt );
 
     OTV_SIZE_CHECK( HCoverage );
     if ( HCoverage )
-      otv_Coverage_validate( table + HCoverage, valid, hcnt );
+      otv_Coverage_validate( table + HCoverage, otvalid, hcnt );
 
     for ( i = 0; i < vcnt; ++i )
     {
       OTV_OPTIONAL_OFFSET( Offset );
       OTV_SIZE_CHECK( Offset );
-      otv_MathGlyphConstruction_validate( table + Offset, valid );
+      otv_MathGlyphConstruction_validate( table + Offset, otvalid );
     }
 
     for ( i = 0; i < hcnt; ++i )
     {
       OTV_OPTIONAL_OFFSET( Offset );
       OTV_SIZE_CHECK( Offset );
-      otv_MathGlyphConstruction_validate( table + Offset, valid );
+      otv_MathGlyphConstruction_validate( table + Offset, otvalid );
     }
 
     OTV_EXIT;
@@ -410,20 +410,20 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  /* sets valid->glyph_count */
+  /* sets otvalid->glyph_count */
 
   FT_LOCAL_DEF( void )
   otv_MATH_validate( FT_Bytes      table,
                      FT_UInt       glyph_count,
                      FT_Validator  ftvalid )
   {
-    OTV_ValidatorRec  validrec;
-    OTV_Validator     valid = &validrec;
-    FT_Bytes          p     = table;
+    OTV_ValidatorRec  otvalidrec;
+    OTV_Validator     otvalid = &otvalidrec;
+    FT_Bytes          p       = table;
     FT_UInt           MathConstants, MathGlyphInfo, MathVariants;
 
 
-    valid->root = ftvalid;
+    otvalid->root = ftvalid;
 
     FT_TRACE3(( "validating MATH table\n" ));
     OTV_INIT;
@@ -437,14 +437,14 @@
     MathGlyphInfo = FT_NEXT_USHORT( p );
     MathVariants  = FT_NEXT_USHORT( p );
 
-    valid->glyph_count = glyph_count;
+    otvalid->glyph_count = glyph_count;
 
     otv_MathConstants_validate( table + MathConstants,
-                                valid );
+                                otvalid );
     otv_MathGlyphInfo_validate( table + MathGlyphInfo,
-                                valid );
+                                otvalid );
     otv_MathVariants_validate ( table + MathVariants,
-                                valid );
+                                otvalid );
 
     FT_TRACE4(( "\n" ));
   }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmod.c b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmod.c
index 37c6e869dd6..37c6e869dd6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmod.h b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmod.h
index f7e1550787a..f7e1550787a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/otvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/otvmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/rules.mk
index 53bd41e5e7d..53bd41e5e7d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/otvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/otvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/Jamfile
index 752fcac2a11..752fcac2a11 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/README b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/README
index 10eff15fbe8..10eff15fbe8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/module.mk
index df383ff0fbe..df383ff0fbe 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcf.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcf.c
index 11d5b7b2a06..11d5b7b2a06 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcf.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcf.h
index af0ffc33781..af0ffc33781 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfdrivr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfdrivr.c
index 96f6912ba95..96f6912ba95 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfdrivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfdrivr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfdrivr.h
index 54614951b5d..54614951b5d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcferror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcferror.h
index e51fff8ea60..e51fff8ea60 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcferror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcferror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfread.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfread.c
index 998cbed6f08..a29a9e371ba 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfread.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfread.c
@@ -2,7 +2,7 @@
 
     FreeType font driver for pcf fonts
 
-  Copyright 2000-2010, 2012, 2013 by
+  Copyright 2000-2010, 2012-2014 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -78,7 +78,7 @@ THE SOFTWARE.
     FT_FRAME_START( 16  ),
       FT_FRAME_ULONG_LE( type ),
       FT_FRAME_ULONG_LE( format ),
-      FT_FRAME_ULONG_LE( size ),
+      FT_FRAME_ULONG_LE( size ),   /* rounded up to a multiple of 4 */
       FT_FRAME_ULONG_LE( offset ),
     FT_FRAME_END
   };
@@ -95,9 +95,11 @@ THE SOFTWARE.
     FT_Memory  memory = FT_FACE( face )->memory;
     FT_UInt    n;
 
+    FT_ULong   size;
 
-    if ( FT_STREAM_SEEK ( 0 )                          ||
-         FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) )
+
+    if ( FT_STREAM_SEEK( 0 )                          ||
+         FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) )
       return FT_THROW( Cannot_Open_Resource );
 
     if ( toc->version != PCF_FILE_VERSION                 ||
@@ -154,14 +156,35 @@ THE SOFTWARE.
         break;
     }
 
-    /* we now check whether the `size' and `offset' values are reasonable: */
-    /* `offset' + `size' must not exceed the stream size                   */
+    /*
+     *  We now check whether the `size' and `offset' values are reasonable:
+     *  `offset' + `size' must not exceed the stream size.
+     *
+     *  Note, however, that X11's `pcfWriteFont' routine (used by the
+     *  `bdftopcf' program to create PDF font files) has two special
+     *  features.
+     *
+     *  - It always assigns the accelerator table a size of 100 bytes in the
+     *    TOC, regardless of its real size, which can vary between 34 and 72
+     *    bytes.
+     *
+     *  - Due to the way the routine is designed, it ships out the last font
+     *    table with its real size, ignoring the TOC's size value.  Since
+     *    the TOC size values are always rounded up to a multiple of 4, the
+     *    difference can be up to three bytes for all tables except the
+     *    accelerator table, for which the difference can be as large as 66
+     *    bytes.
+     *
+     */
+
     tables = face->toc.tables;
-    for ( n = 0; n < toc->count; n++ )
+    size   = stream->size;
+
+    for ( n = 0; n < toc->count - 1; n++ )
     {
       /* we need two checks to avoid overflow */
-      if ( ( tables->size   > stream->size                ) ||
-           ( tables->offset > stream->size - tables->size ) )
+      if ( ( tables->size   > size                ) ||
+           ( tables->offset > size - tables->size ) )
       {
         error = FT_THROW( Invalid_Table );
         goto Exit;
@@ -169,6 +192,16 @@ THE SOFTWARE.
       tables++;
     }
 
+    /* only check `tables->offset' for last table element ... */
+    if ( ( tables->offset > size ) )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+    /* ... and adjust `tables->size' to the real value if necessary */
+    if ( tables->size > size - tables->offset )
+      tables->size = size - tables->offset;
+
 #ifdef FT_DEBUG_LEVEL_TRACE
 
     {
@@ -733,8 +766,8 @@ THE SOFTWARE.
 
     FT_TRACE4(( "  number of bitmaps: %d\n", nbitmaps ));
 
-    /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */
-    if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics )
+    /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */
+    if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics )
       return FT_THROW( Invalid_File_Format );
 
     if ( FT_NEW_ARRAY( offsets, nbitmaps ) )
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfread.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfread.h
index c9524f13464..c9524f13464 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfread.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfread.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfutil.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfutil.c
index 0451ee8deff..0451ee8deff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfutil.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfutil.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfutil.h
index ce10fb541d5..ce10fb541d5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/pcfutil.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/pcfutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/rules.mk
index 78641528fab..78641528fab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pcf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pcf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/Jamfile
index 9e2f2b8d050..9e2f2b8d050 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/module.mk
index 8d1d28a9d23..8d1d28a9d23 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfr.c
index eb2c4edb7ec..eb2c4edb7ec 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrcmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrcmap.c
index 90ba0105ea1..90ba0105ea1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrcmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrcmap.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrcmap.h
index a6269530543..a6269530543 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrdrivr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrdrivr.c
index db66281acd5..db66281acd5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrdrivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrdrivr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrdrivr.h
index 75f86c5cddf..75f86c5cddf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrerror.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrerror.h
index 94dc8c5e1c1..94dc8c5e1c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrerror.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrerror.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrgload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrgload.c
index 2ce093779c3..2ce093779c3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrgload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrgload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrgload.h
index 7cc7a8702a4..7cc7a8702a4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrload.c
index 97c130aad1c..f68d016392c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrload.c
@@ -179,7 +179,7 @@
     if ( header->signature  != 0x50465230L ||   /* "PFR0" */
          header->version     > 4           ||
          header->header_size < 58          ||
-         header->signature2 != 0x0d0a      )    /* CR/LF  */
+         header->signature2 != 0x0D0A      )    /* CR/LF  */
     {
       result = 0;
     }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrload.h
index ed010715d1c..ed010715d1c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrobjs.c
index 0c89242c743..0c89242c743 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrobjs.h
index f6aa8b44cc6..f6aa8b44cc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrsbit.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrsbit.c
index 979bf78a267..979bf78a267 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrsbit.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrsbit.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrsbit.h
index 015e9e6dada..015e9e6dada 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrsbit.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrtypes.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrtypes.h
index 918310814c5..918310814c5 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/pfrtypes.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/pfrtypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/rules.mk
index 60b96c74154..60b96c74154 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pfr/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pfr/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/Jamfile
index faeded90445..faeded90445 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/afmparse.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/afmparse.c
index 6a40e110dc6..6a40e110dc6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/afmparse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/afmparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/afmparse.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/afmparse.h
index 35d96046c5d..35d96046c5d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/afmparse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/afmparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/module.mk
index 42bf6f51999..42bf6f51999 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psaux.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psaux.c
index a4b9c5c6e45..a4b9c5c6e45 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psaux.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psaux.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxerr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxerr.h
index d52375f8cb8..d52375f8cb8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxerr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxerr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxmod.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxmod.c
index 4b1249d49b6..4b1249d49b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxmod.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxmod.h
index 12172369248..12172369248 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psauxmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psauxmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psconv.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psconv.c
index 7792a62947b..22e8cf2d147 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psconv.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psconv.c
@@ -124,7 +124,7 @@
       if ( IS_PS_SPACE( *p ) || *p OP 0x80 )
         break;
 
-      c = ft_char_table[*p & 0x7f];
+      c = ft_char_table[*p & 0x7F];
 
       if ( c < 0 || c >= base )
         break;
@@ -245,7 +245,7 @@
         if ( IS_PS_SPACE( *p ) || *p OP 0x80 )
           break;
 
-        c = ft_char_table[*p & 0x7f];
+        c = ft_char_table[*p & 0x7F];
 
         if ( c < 0 || c >= 10 )
           break;
@@ -521,7 +521,7 @@
       if ( *p OP 0x80 )
         break;
 
-      c = ft_char_table[*p & 0x7f];
+      c = ft_char_table[*p & 0x7F];
 
       if ( (unsigned)c >= 16 )
         break;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psconv.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psconv.h
index d91c7622104..d91c7622104 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psconv.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psconv.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psobjs.c
index 7ec3b4cf5fd..7ec3b4cf5fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psobjs.h
index e380c60dabb..e380c60dabb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/psobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/psobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/rules.mk
index 7a1be37b692..7a1be37b692 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1cmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1cmap.c
index fb1353ae0fd..fb1353ae0fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1cmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1cmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1cmap.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1cmap.h
index 7ae65d2fa16..7ae65d2fa16 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1cmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1cmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1decode.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1decode.c
index d67a05ebca8..d67a05ebca8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1decode.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1decode.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1decode.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1decode.h
index 00728db501e..00728db501e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psaux/t1decode.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psaux/t1decode.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/Jamfile
index 779f1b0b828..779f1b0b828 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/module.mk
index ed24eb7fa89..ed24eb7fa89 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshalgo.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshalgo.c
index 644c76d1017..644c76d1017 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshalgo.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshalgo.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshalgo.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshalgo.h
index c70f31ea949..c70f31ea949 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshalgo.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshalgo.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshglob.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshglob.c
index 1bcc481b9b9..1bcc481b9b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshglob.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshglob.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshglob.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshglob.h
index 94d972a940a..94d972a940a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshglob.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshglob.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshinter.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshinter.c
index b35a2a91c53..b35a2a91c53 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshinter.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshinter.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshmod.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshmod.c
index cdeaca18c9b..cdeaca18c9b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshmod.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshmod.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshmod.h
index 0ae7e96f54e..0ae7e96f54e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshmod.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshnterr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshnterr.h
index 7cc180f0cac..7cc180f0cac 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshnterr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshnterr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshpic.c
index 568f4ac4b01..568f4ac4b01 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshpic.h
index b46f8531138..b46f8531138 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshrec.c b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshrec.c
index 73a18ffd640..73a18ffd640 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshrec.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshrec.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshrec.h b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshrec.h
index a88fe6e834a..a88fe6e834a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/pshrec.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/pshrec.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/rules.mk
index 888ece10589..888ece10589 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/pshinter/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/pshinter/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/Jamfile
index 06c0dda66f2..06c0dda66f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/module.mk
index a6e908257cb..a6e908257cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psmodule.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psmodule.c
index 0a5bcb7d2a1..42c9aff27b9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psmodule.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PSNames module implementation (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2003, 2005-2008, 2012, 2013 by                          */
+/*  Copyright 1996-2003, 2005-2008, 2012-2014 by                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -563,7 +563,7 @@
   psnames_get_service( FT_Module    module,
                        const char*  service_id )
   {
-    /* PSCMAPS_SERVICES_GET derefers `library' in PIC mode */
+    /* PSCMAPS_SERVICES_GET dereferences `library' in PIC mode */
 #ifdef FT_CONFIG_OPTION_PIC
     FT_Library  library;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psmodule.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psmodule.h
index 28fa14807c0..28fa14807c0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psnamerr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psnamerr.h
index acda7f967ee..acda7f967ee 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psnamerr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psnamerr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psnames.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psnames.c
index 1ede225dc9c..1ede225dc9c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/psnames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/psnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pspic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pspic.c
index 3820f65a74a..3820f65a74a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pspic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pspic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pspic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pspic.h
index 6ff002c6037..6ff002c6037 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pspic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pspic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pstables.h b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pstables.h
index 0a6637f9853..0a6637f9853 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/pstables.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/pstables.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/rules.mk
index f321de2d641..f321de2d641 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/psnames/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/psnames/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/Jamfile
index 4f60e87c788..4f60e87c788 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftmisc.h b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftmisc.h
index 703155a4291..703155a4291 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftmisc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftmisc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftraster.c b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftraster.c
index b06ac333da1..b06ac333da1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftraster.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftraster.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftraster.h b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftraster.h
index 80fe46debaf..80fe46debaf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftraster.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftraster.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftrend1.c b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftrend1.c
index aa7f6d56649..aa7f6d56649 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftrend1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftrend1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftrend1.h b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftrend1.h
index 4cf128622a9..4cf128622a9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/ftrend1.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/ftrend1.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/module.mk
index cbff5df96ea..cbff5df96ea 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/raster.c b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/raster.c
index 1202a116cdf..1202a116cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/raster.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/raster.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rasterrs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rasterrs.h
index ab85c002a30..ab85c002a30 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rasterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rasterrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rastpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rastpic.c
index 5e9f7cc9c4e..5e9f7cc9c4e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rastpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rastpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rastpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rastpic.h
index e0ddba624ee..e0ddba624ee 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rastpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rastpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rules.mk
index 0e0b5e4ebd6..0e0b5e4ebd6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/raster/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/raster/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/Jamfile
index cb20b1b04b1..cb20b1b04b1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/module.mk
index 95fd6a31437..95fd6a31437 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/pngshim.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/pngshim.c
index 9bfcc2a779b..9bfcc2a779b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/pngshim.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/pngshim.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/pngshim.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/pngshim.h
index dc9ecaf9189..dc9ecaf9189 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/pngshim.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/pngshim.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/rules.mk
index a6c956ab657..a6c956ab657 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfdriver.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfdriver.c
index bd8dd2e5718..badb159dc3e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfdriver.c
@@ -427,7 +427,7 @@
   sfnt_get_interface( FT_Module    module,
                       const char*  module_interface )
   {
-    /* SFNT_SERVICES_GET derefers `library' in PIC mode */
+    /* SFNT_SERVICES_GET dereferences `library' in PIC mode */
 #ifdef FT_CONFIG_OPTION_PIC
     FT_Library  library;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfdriver.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfdriver.h
index 5de25d51ca4..5de25d51ca4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sferrors.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sferrors.h
index e981e1d26fb..e981e1d26fb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sferrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfnt.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfnt.c
index d62ed4e0b55..d62ed4e0b55 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfntpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfntpic.c
index b3fb24b3f00..b3fb24b3f00 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfntpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfntpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfntpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfntpic.h
index b09a9141e07..b09a9141e07 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfntpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfntpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfobjs.c
index 70b988d650e..70b988d650e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfobjs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfobjs.h
index 6241c93b392..6241c93b392 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/sfobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/sfobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttbdf.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttbdf.c
index 9401dae5f86..9401dae5f86 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttbdf.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttbdf.h
index 48a10d6e9b3..48a10d6e9b3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmap.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmap.c
index ece9ef11235..f54de70691c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmap.c
@@ -3496,7 +3496,7 @@
     {
       FT_ERROR(( "tt_face_build_cmaps:"
                  " unsupported `cmap' table format = %d\n",
-                 TT_PEEK_USHORT( p - 2) ));
+                 TT_PEEK_USHORT( p - 2 ) ));
       return FT_THROW( Invalid_Table );
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmap.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmap.h
index 0fde1676bfa..0fde1676bfa 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmapc.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmapc.h
index 2ea204309cf..2ea204309cf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttcmapc.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttcmapc.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttkern.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttkern.c
index 455e7b5e3dc..455e7b5e3dc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttkern.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttkern.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttkern.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttkern.h
index df1da9b273e..df1da9b273e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttkern.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttload.c
index 8338150abd4..8338150abd4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttload.h
index 49a1aee1633..49a1aee1633 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttmtx.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttmtx.c
index bb319577e26..bb319577e26 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttmtx.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttmtx.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttmtx.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttmtx.h
index fb040394c08..fb040394c08 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttmtx.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttmtx.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttpost.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttpost.c
index 99d800549fc..99d800549fc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttpost.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttpost.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttpost.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttpost.h
index 6f06d75a719..6f06d75a719 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttpost.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttpost.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttsbit.c b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttsbit.c
index c2db96c6d8c..c2db96c6d8c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttsbit.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttsbit.h b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttsbit.h
index 695d0d8d02e..695d0d8d02e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/sfnt/ttsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/sfnt/ttsbit.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/Jamfile
index a8496aa2c2c..a8496aa2c2c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftgrays.c b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftgrays.c
index 9d37d64517b..131ad27a0ca 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftgrays.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftgrays.c
@@ -405,6 +405,8 @@ typedef ptrdiff_t  FT_PtrDist;
 
   typedef struct  gray_TWorker_
   {
+    ft_jmp_buf  jump_buffer;
+
     TCoord  ex, ey;
     TPos    min_ex, max_ex;
     TPos    min_ey, max_ey;
@@ -440,8 +442,6 @@ typedef ptrdiff_t  FT_PtrDist;
     int  band_size;
     int  band_shoot;
 
-    ft_jmp_buf  jump_buffer;
-
     void*       buffer;
     long        buffer_size;
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftgrays.h b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftgrays.h
index f20f55f14b6..f20f55f14b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftgrays.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftgrays.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmerrs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmerrs.h
index 413d2f1f701..413d2f1f701 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmerrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmerrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmooth.c b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmooth.c
index 4e2dee562b0..4e2dee562b0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmooth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmooth.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmooth.h b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmooth.h
index 3708790df17..3708790df17 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftsmooth.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftsmooth.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftspic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftspic.c
index 67a2b8310cb..67a2b8310cb 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftspic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftspic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftspic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftspic.h
index 334b51c3f15..334b51c3f15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/ftspic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/ftspic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/module.mk
index 47f6c040764..47f6c040764 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/rules.mk
index 88d0aa53ac2..88d0aa53ac2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/smooth.c b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/smooth.c
index a8ac51f9f8c..a8ac51f9f8c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/smooth/smooth.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/smooth/smooth.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/Jamfile
index 475161e07fd..475161e07fd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/afblue.pl b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/afblue.pl
index 60fe6966a84..60fe6966a84 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/afblue.pl
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/afblue.pl
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/apinames.c b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/apinames.c
index c85df721a06..c85df721a06 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/apinames.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/apinames.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/chktrcmp.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/chktrcmp.py
index ce6500c7e25..ce6500c7e25 100755
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/chktrcmp.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/chktrcmp.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/cordic.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/cordic.py
index 6742c90dfef..6742c90dfef 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/cordic.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/cordic.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/content.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/content.py
index adea6f1d70d..adea6f1d70d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/content.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/content.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/docbeauty.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/docbeauty.py
index 3ddf4a94a15..3ddf4a94a15 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/docbeauty.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/docbeauty.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/docmaker.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/docmaker.py
index 4fb1abf2356..4fb1abf2356 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/docmaker.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/docmaker.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/formatter.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/formatter.py
index b1c88be6736..7152c019d74 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/formatter.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/formatter.py
@@ -196,7 +196,7 @@ class  Formatter:
                 skip_entry = 1   # this happens e.g. for `/empty/' entries
 
             if skip_entry:
-              continue;
+              continue
 
             self.block_enter( block )
 
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/sources.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/sources.py
index 61ecc22c400..61ecc22c400 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/sources.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/sources.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/tohtml.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/tohtml.py
index 9b2f2914cce..05fc08a92de 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/tohtml.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/tohtml.py
@@ -628,7 +628,7 @@ class  HtmlFormatter( Formatter ):
             for f in self.headers.keys():
                 if block.source.filename.find( f ) >= 0:
                     header = self.headers[f] + ' (' + f + ')'
-                    break;
+                    break
 
 #           if not header:
 #               sys.stderr.write(
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/utils.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/utils.py
index b35823ab74a..b35823ab74a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/docmaker/utils.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/docmaker/utils.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/Makefile b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/Makefile
index 2e619299cdf..2e619299cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/README b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/README
index 71bf05323da..71bf05323da 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/README
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/README
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/ftrandom.c b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/ftrandom.c
index 7c97957119e..9a5b632673c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/ftrandom/ftrandom.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/ftrandom/ftrandom.c
@@ -449,9 +449,9 @@
       fseek( new, getRandom( 0, item->len - 1 ), SEEK_SET );
 
       if ( item->isbinary )
-        putc( getRandom( 0, 0xff ), new );
+        putc( getRandom( 0, 0xFF ), new );
       else if ( item->isascii )
-        putc( getRandom( 0x20, 0x7e ), new );
+        putc( getRandom( 0x20, 0x7E ), new );
       else
       {
         int  hex = getRandom( 0, 15 );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/glnames.py b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/glnames.py
index 8810bf57f1f..8810bf57f1f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/glnames.py
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/glnames.py
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_afm.c b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_afm.c
index 24cd0c4f0e1..24cd0c4f0e1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_afm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_afm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_bbox.c b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_bbox.c
index 64b82c384b6..64b82c384b6 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_bbox.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_bbox.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_trig.c b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_trig.c
index 49d927e36e9..99ac1cf174d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/tools/test_trig.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/tools/test_trig.c
@@ -20,7 +20,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
     {
       FT_Fixed  f1, f2;
       double    d2;
@@ -46,7 +46,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
     {
       FT_Fixed  f1, f2;
       double    d2;
@@ -72,7 +72,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_PI2-0x2000000; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_PI2 - 0x2000000L; i += 0x10000L )
     {
       FT_Fixed  f1, f2;
       double    d2;
@@ -98,7 +98,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
     {
       FT_Fixed  c2, s2;
       double    l, a, c1, s1;
@@ -133,7 +133,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
     {
       FT_Vector  v;
       double     a, c1, s1;
@@ -166,7 +166,7 @@
     int  i;
 
 
-    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+    for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
     {
       FT_Vector  v;
       FT_Fixed   l, l2;
@@ -193,7 +193,7 @@
     int  rotate;
 
 
-    for ( rotate = 0; rotate < FT_ANGLE_2PI; rotate += 0x10000 )
+    for ( rotate = 0; rotate < FT_ANGLE_2PI; rotate += 0x10000L )
     {
       double  ra, cra, sra;
       int     i;
@@ -203,7 +203,7 @@
       cra = cos( ra );
       sra = sin( ra );
 
-      for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 )
+      for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000L )
       {
         FT_Fixed   c2, s2, c4, s4;
         FT_Vector  v;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/Jamfile
index a8cccfe1372..a8cccfe1372 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/module.mk
index baee81a7730..baee81a7730 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/rules.mk
index d4b69f578be..d4b69f578be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/truetype.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/truetype.c
index 576912b219d..576912b219d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/truetype.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/truetype.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttdriver.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttdriver.c
index 64e433db025..ecf4cdcb41b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttdriver.c
@@ -481,7 +481,7 @@
     SFNT_Service         sfnt;
 
 
-    /* TT_SERVICES_GET derefers `library' in PIC mode */
+    /* TT_SERVICES_GET dereferences `library' in PIC mode */
 #ifdef FT_CONFIG_OPTION_PIC
     if ( !driver )
       return NULL;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttdriver.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttdriver.h
index aae00f2617f..aae00f2617f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/tterrors.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/tterrors.h
index 78d138fab2e..78d138fab2e 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/tterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/tterrors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgload.c
index c5841c301d2..c5841c301d2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgload.h
index 3f1699e6867..3f1699e6867 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgxvar.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgxvar.c
index 1b35539fe13..1b35539fe13 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgxvar.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgxvar.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgxvar.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgxvar.h
index 82dfc4431f2..82dfc4431f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttgxvar.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttgxvar.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttinterp.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttinterp.c
index 6bdffbca527..eccd4aaccb1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttinterp.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttinterp.c
@@ -3059,7 +3059,7 @@
 #define DO_MD  /* nothing */
 
 
-#define DO_MPPEM              \
+#define DO_MPPEM                   \
     args[0] = CUR_Func_cur_ppem();
 
 
@@ -3072,7 +3072,7 @@
 
 #else
 
-#define DO_MPS                \
+#define DO_MPS                     \
     args[0] = CUR_Func_cur_ppem();
 
 #endif /* 0 */
@@ -5625,7 +5625,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* INSTCTRL[]:   INSTruction ConTRoL                                     */
-  /* Opcode range: 0x8e                                                    */
+  /* Opcode range: 0x8E                                                    */
   /* Stack:        int32 int32 -->                                         */
   /*                                                                       */
   static void
@@ -7654,7 +7654,7 @@
     }
 #endif
 
-    P = (FT_ULong)CUR_Func_cur_ppem();
+    P    = (FT_ULong)CUR_Func_cur_ppem();
     nump = (FT_ULong)args[0];
 
     for ( k = 1; k <= nump; k++ )
@@ -9004,9 +9004,9 @@
     /* If any errors have occurred, function tables may be broken. */
     /* Force a re-execution of `prep' and `fpgm' tables if no      */
     /* bytecode debugger is run.                                   */
-    if ( CUR.error
-         && !CUR.instruction_trap
-         && CUR.curRange == tt_coderange_glyph )
+    if ( CUR.error                          &&
+         !CUR.instruction_trap              &&
+         CUR.curRange == tt_coderange_glyph )
     {
       FT_TRACE1(( "  The interpreter returned error 0x%x\n", CUR.error ));
       exc->size->bytecode_ready = -1;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttinterp.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttinterp.h
index 333decc6a6d..333decc6a6d 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttinterp.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttinterp.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttobjs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttobjs.c
index a73529d8487..4707dfe159b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttobjs.c
@@ -256,89 +256,89 @@
 #define TRICK_SFNT_ID_prep  2
 
       { /* MingLiU 1995 */
-        { 0x05bcf058, 0x000002e4 }, /* cvt  */
-        { 0x28233bf1, 0x000087c4 }, /* fpgm */
-        { 0xa344a1ea, 0x000001e1 }  /* prep */
+        { 0x05BCF058UL, 0x000002E4UL }, /* cvt  */
+        { 0x28233BF1UL, 0x000087C4UL }, /* fpgm */
+        { 0xA344A1EAUL, 0x000001E1UL }  /* prep */
       },
       { /* MingLiU 1996- */
-        { 0x05bcf058, 0x000002e4 }, /* cvt  */
-        { 0x28233bf1, 0x000087c4 }, /* fpgm */
-        { 0xa344a1eb, 0x000001e1 }  /* prep */
+        { 0x05BCF058UL, 0x000002E4UL }, /* cvt  */
+        { 0x28233BF1UL, 0x000087C4UL }, /* fpgm */
+        { 0xA344A1EBUL, 0x000001E1UL }  /* prep */
       },
       { /* DFKaiShu */
-        { 0x11e5ead4, 0x00000350 }, /* cvt  */
-        { 0x5a30ca3b, 0x00009063 }, /* fpgm */
-        { 0x13a42602, 0x0000007e }  /* prep */
+        { 0x11E5EAD4UL, 0x00000350UL }, /* cvt  */
+        { 0x5A30CA3BUL, 0x00009063UL }, /* fpgm */
+        { 0x13A42602UL, 0x0000007EUL }  /* prep */
       },
       { /* HuaTianKaiTi */
-        { 0xfffbfffc, 0x00000008 }, /* cvt  */
-        { 0x9c9e48b8, 0x0000bea2 }, /* fpgm */
-        { 0x70020112, 0x00000008 }  /* prep */
+        { 0xFFFBFFFCUL, 0x00000008UL }, /* cvt  */
+        { 0x9C9E48B8UL, 0x0000BEA2UL }, /* fpgm */
+        { 0x70020112UL, 0x00000008UL }  /* prep */
       },
       { /* HuaTianSongTi */
-        { 0xfffbfffc, 0x00000008 }, /* cvt  */
-        { 0x0a5a0483, 0x00017c39 }, /* fpgm */
-        { 0x70020112, 0x00000008 }  /* prep */
+        { 0xFFFBFFFCUL, 0x00000008UL }, /* cvt  */
+        { 0x0A5A0483UL, 0x00017C39UL }, /* fpgm */
+        { 0x70020112UL, 0x00000008UL }  /* prep */
       },
       { /* NEC fadpop7.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x40c92555, 0x000000e5 }, /* fpgm */
-        { 0xa39b58e3, 0x0000117c }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x40C92555UL, 0x000000E5UL }, /* fpgm */
+        { 0xA39B58E3UL, 0x0000117CUL }  /* prep */
       },
       { /* NEC fadrei5.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x33c41652, 0x000000e5 }, /* fpgm */
-        { 0x26d6c52a, 0x00000f6a }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x33C41652UL, 0x000000E5UL }, /* fpgm */
+        { 0x26D6C52AUL, 0x00000F6AUL }  /* prep */
       },
       { /* NEC fangot7.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x6db1651d, 0x0000019d }, /* fpgm */
-        { 0x6c6e4b03, 0x00002492 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x6DB1651DUL, 0x0000019DUL }, /* fpgm */
+        { 0x6C6E4B03UL, 0x00002492UL }  /* prep */
       },
       { /* NEC fangyo5.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x40c92555, 0x000000e5 }, /* fpgm */
-        { 0xde51fad0, 0x0000117c }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x40C92555UL, 0x000000E5UL }, /* fpgm */
+        { 0xDE51FAD0UL, 0x0000117CUL }  /* prep */
       },
       { /* NEC fankyo5.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x85e47664, 0x000000e5 }, /* fpgm */
-        { 0xa6c62831, 0x00001caa }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x85E47664UL, 0x000000E5UL }, /* fpgm */
+        { 0xA6C62831UL, 0x00001CAAUL }  /* prep */
       },
       { /* NEC fanrgo5.ttf */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x2d891cfd, 0x0000019d }, /* fpgm */
-        { 0xa0604633, 0x00001de8 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x2D891CFDUL, 0x0000019DUL }, /* fpgm */
+        { 0xA0604633UL, 0x00001DE8UL }  /* prep */
       },
       { /* NEC fangot5.ttc */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x40aa774c, 0x000001cb }, /* fpgm */
-        { 0x9b5caa96, 0x00001f9a }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x40AA774CUL, 0x000001CBUL }, /* fpgm */
+        { 0x9B5CAA96UL, 0x00001F9AUL }  /* prep */
       },
       { /* NEC fanmin3.ttc */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x0d3de9cb, 0x00000141 }, /* fpgm */
-        { 0xd4127766, 0x00002280 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x0D3DE9CBUL, 0x00000141UL }, /* fpgm */
+        { 0xD4127766UL, 0x00002280UL }  /* prep */
       },
       { /* NEC FA-Gothic, 1996 */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x4a692698, 0x000001f0 }, /* fpgm */
-        { 0x340d4346, 0x00001fca }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x4A692698UL, 0x000001F0UL }, /* fpgm */
+        { 0x340D4346UL, 0x00001FCAUL }  /* prep */
       },
       { /* NEC FA-Minchou, 1996 */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0xcd34c604, 0x00000166 }, /* fpgm */
-        { 0x6cf31046, 0x000022b0 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0xCD34C604UL, 0x00000166UL }, /* fpgm */
+        { 0x6CF31046UL, 0x000022B0UL }  /* prep */
       },
       { /* NEC FA-RoundGothicB, 1996 */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0x5da75315, 0x0000019d }, /* fpgm */
-        { 0x40745a5f, 0x000022e0 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0x5DA75315UL, 0x0000019DUL }, /* fpgm */
+        { 0x40745A5FUL, 0x000022E0UL }  /* prep */
       },
       { /* NEC FA-RoundGothicM, 1996 */
-        { 0x00000000, 0x00000000 }, /* cvt  */
-        { 0xf055fc48, 0x000001c2 }, /* fpgm */
-        { 0x3900ded3, 0x00001e18 }  /* prep */
+        { 0x00000000UL, 0x00000000UL }, /* cvt  */
+        { 0xF055FC48UL, 0x000001C2UL }, /* fpgm */
+        { 0x3900DED3UL, 0x00001E18UL }  /* prep */
       }
     };
 
@@ -1116,6 +1116,7 @@
     TT_Size   size  = (TT_Size)ttsize;
     FT_Error  error = FT_Err_Ok;
 
+
 #ifdef TT_USE_BYTECODE_INTERPRETER
     size->bytecode_ready = -1;
     size->cvt_ready      = -1;
@@ -1146,8 +1147,7 @@
 
 
 #ifdef TT_USE_BYTECODE_INTERPRETER
-    if ( size->bytecode_ready >= 0 )
-      tt_size_done_bytecode( ttsize );
+    tt_size_done_bytecode( ttsize );
 #endif
 
     size->ttmetrics.valid = FALSE;
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttobjs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttobjs.h
index 859164f86be..859164f86be 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpic.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpic.c
index edefae72c5c..edefae72c5c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpic.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpic.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpic.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpic.h
index cfb4ee62812..cfb4ee62812 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpic.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpic.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpload.c
index 99919254252..99919254252 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpload.h
index f61ac079ce0..f61ac079ce0 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttpload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttpload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttsubpix.c b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttsubpix.c
index ca604518cfe..ca604518cfe 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttsubpix.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttsubpix.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttsubpix.h b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttsubpix.h
index 8a54fc7cc77..8a54fc7cc77 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/truetype/ttsubpix.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/truetype/ttsubpix.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/Jamfile
index 8e366baae51..8e366baae51 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/module.mk
index ade0210d76c..ade0210d76c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/rules.mk
index 15087b03044..15087b03044 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1afm.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1afm.c
index de9c1997c46..de9c1997c46 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1afm.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1afm.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1afm.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1afm.h
index 8eb1764de70..8eb1764de70 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1afm.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1afm.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1driver.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1driver.c
index 2602bdb6ffc..2602bdb6ffc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1driver.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1driver.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1driver.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1driver.h
index 639cd4a7ad9..639cd4a7ad9 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1driver.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1driver.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1errors.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1errors.h
index 8740530eef7..8740530eef7 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1errors.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1errors.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1gload.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1gload.c
index af102fd85e3..af102fd85e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1gload.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1gload.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1gload.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1gload.h
index 0bdea3a8d5b..0bdea3a8d5b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1gload.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1gload.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1load.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1load.c
index 22b3f6b31dd..22b3f6b31dd 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1load.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1load.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1load.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1load.h
index 546fc33530b..546fc33530b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1load.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1load.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1objs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1objs.c
index e11770feefc..e11770feefc 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1objs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1objs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1objs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1objs.h
index 54ccbb996a1..54ccbb996a1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1objs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1objs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1parse.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1parse.c
index ccf9f4cc560..ccf9f4cc560 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1parse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1parse.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1parse.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1parse.h
index fb1c8a88308..fb1c8a88308 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1parse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1tokens.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1tokens.h
index e37276b9083..e37276b9083 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/t1tokens.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/t1tokens.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/type1.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/type1.c
index ccc12be1038..ccc12be1038 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type1/type1.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type1/type1.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/Jamfile
index 00371d54f32..00371d54f32 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/module.mk
index b3f10a8d3c8..b3f10a8d3c8 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/rules.mk
index eac1081eb1f..eac1081eb1f 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42drivr.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42drivr.c
index 3ad1bde79f2..3ad1bde79f2 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42drivr.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42drivr.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42drivr.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42drivr.h
index 9a1e97e30e3..9a1e97e30e3 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42drivr.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42drivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42error.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42error.h
index 217ae8bd529..217ae8bd529 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42error.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42error.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42objs.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42objs.c
index 915e81fe748..915e81fe748 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42objs.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42objs.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42objs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42objs.h
index 02d13259bed..02d13259bed 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42objs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42objs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42parse.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42parse.c
index fd3d669f63e..50708537dff 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42parse.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42parse.c
@@ -580,6 +580,12 @@
 
         /* don't include delimiters */
         string_size = (FT_Long)( ( parser->root.cursor - cur - 2 + 1 ) / 2 );
+        if ( !string_size )
+        {
+          FT_ERROR(( "t42_parse_sfnts: invalid data in sfnts array\n" ));
+          error = FT_THROW( Invalid_File_Format );
+          goto Fail;
+        }
         if ( FT_REALLOC( string_buf, old_string_size, string_size ) )
           goto Fail;
 
@@ -661,6 +667,13 @@
             status         = BEFORE_TABLE_DIR;
             face->ttf_size = 12 + 16 * num_tables;
 
+            if ( (FT_ULong)( limit - parser->root.cursor ) < face->ttf_size )
+            {
+              FT_ERROR(( "t42_parse_sfnts: invalid data in sfnts array\n" ));
+              error = FT_THROW( Invalid_File_Format );
+              goto Fail;
+            }
+
             if ( FT_REALLOC( face->ttf_data, 12, face->ttf_size ) )
               goto Fail;
           }
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42parse.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42parse.h
index f77ec4af4f4..f77ec4af4f4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42parse.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42types.h b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42types.h
index c7c2db490df..c7c2db490df 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/t42types.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/t42types.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/type42.c b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/type42.c
index d13df56b10c..d13df56b10c 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/type42/type42.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/type42/type42.c
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/Jamfile b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/Jamfile
index 71cf5678e8b..71cf5678e8b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/fnterrs.h b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/fnterrs.h
index 463ba77ee24..463ba77ee24 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/fnterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/fnterrs.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/module.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/module.mk
index b44d7f0570a..b44d7f0570a 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/rules.mk b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/rules.mk
index 71a7df2d8ab..71a7df2d8ab 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/winfnt.c b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/winfnt.c
index f90b084dbdf..4705c53963b 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/winfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/winfnt.c
@@ -72,12 +72,12 @@
 
     FT_FRAME_START( 248 ),
       FT_FRAME_ULONG_LE  ( magic ),   /* PE00 */
-      FT_FRAME_USHORT_LE ( machine ), /* 0x014c - i386 */
+      FT_FRAME_USHORT_LE ( machine ), /* 0x014C - i386 */
       FT_FRAME_USHORT_LE ( number_of_sections ),
       FT_FRAME_SKIP_BYTES( 12 ),
       FT_FRAME_USHORT_LE ( size_of_optional_header ),
       FT_FRAME_SKIP_BYTES( 2 ),
-      FT_FRAME_USHORT_LE ( magic32 ), /* 0x10b */
+      FT_FRAME_USHORT_LE ( magic32 ), /* 0x10B */
       FT_FRAME_SKIP_BYTES( 110 ),
       FT_FRAME_ULONG_LE  ( rsrc_virtual_address ),
       FT_FRAME_ULONG_LE  ( rsrc_size ),
@@ -412,9 +412,9 @@
                     pe32_header.rsrc_size ));
 
         if ( pe32_header.magic != WINFNT_PE_MAGIC /* check full signature */ ||
-             pe32_header.machine != 0x014c /* i386 */                        ||
-             pe32_header.size_of_optional_header != 0xe0 /* FIXME */         ||
-             pe32_header.magic32 != 0x10b                                    )
+             pe32_header.machine != 0x014C /* i386 */                        ||
+             pe32_header.size_of_optional_header != 0xE0 /* FIXME */         ||
+             pe32_header.magic32 != 0x10B                                    )
         {
           FT_TRACE2(( "this file has an invalid PE header\n" ));
           error = FT_THROW( Invalid_File_Format );
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/winfnt.h b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/winfnt.h
index b7a80736d83..b7a80736d83 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/src/winfonts/winfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.5.5/src/winfonts/winfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/version.sed b/Build/source/libs/freetype2/freetype-2.5.5/version.sed
index c281ff506b4..c281ff506b4 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/version.sed
+++ b/Build/source/libs/freetype2/freetype-2.5.5/version.sed
diff --git a/Build/source/libs/freetype2/freetype-2.5.4/vms_make.com b/Build/source/libs/freetype2/freetype-2.5.5/vms_make.com
index 8d8fdf771c1..8d8fdf771c1 100644
--- a/Build/source/libs/freetype2/freetype-2.5.4/vms_make.com
+++ b/Build/source/libs/freetype2/freetype-2.5.5/vms_make.com
diff --git a/Build/source/libs/freetype2/version.ac b/Build/source/libs/freetype2/version.ac
index 01d81f0894d..bb91dcdda8c 100644
--- a/Build/source/libs/freetype2/version.ac
+++ b/Build/source/libs/freetype2/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2011-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 freetype version
-m4_define([freetype_version], [2.5.4])
+m4_define([freetype_version], [2.5.5])