freetype2 2.4.9

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

704 files changed, 4107 insertions, 2318 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 66d6682f307..dd830c408b6 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -11,7 +11,7 @@ See also comments in ../texk/README.
 
 freetype 1.5 - ?
 
-freetype2 2.4.8 - checked 23feb12
+freetype2 2.4.9 - checked 9mar12
   http://savannah.nongnu.org/download/freetype/
 
 gd 2.0.35 - unchecked 25apr11, site down
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 7e1bbbf26f0..c053c083f75 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import freetype-2.4.9.
+	* version.ac: Adjust.
+
 2012-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import freetype-2.4.8.
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index ae1731800fb..809fc6afdcf 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.68 for FreeType for TeX Live 2.4.8.
+# Generated by GNU Autoconf 2.68 for FreeType for TeX Live 2.4.9.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -559,12 +559,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType for TeX Live'
 PACKAGE_TARNAME='freetype-for-tex-live'
-PACKAGE_VERSION='2.4.8'
-PACKAGE_STRING='FreeType for TeX Live 2.4.8'
+PACKAGE_VERSION='2.4.9'
+PACKAGE_STRING='FreeType for TeX Live 2.4.9'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="freetype-2.4.8/builds/unix/ftconfig.in"
+ac_unique_file="freetype-2.4.9/builds/unix/ftconfig.in"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -1210,7 +1210,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 for TeX Live 2.4.8 to adapt to many kinds of systems.
+\`configure' configures FreeType for TeX Live 2.4.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1277,7 +1277,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType for TeX Live 2.4.8:";;
+     short | recursive ) echo "Configuration of FreeType for TeX Live 2.4.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1365,7 +1365,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType for TeX Live configure 2.4.8
+FreeType for TeX Live configure 2.4.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1420,7 +1420,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 for TeX Live $as_me 2.4.8, which was
+It was created by FreeType for TeX Live $as_me 2.4.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2239,7 +2239,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='freetype-for-tex-live'
- VERSION='2.4.8'
+ VERSION='2.4.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3303,7 +3303,7 @@ else
 fi
 
 
-FREETYPE_TREE=freetype-2.4.8
+FREETYPE_TREE=freetype-2.4.9
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -3887,7 +3887,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 for TeX Live $as_me 2.4.8, which was
+This file was extended by FreeType for TeX Live $as_me 2.4.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3944,7 +3944,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 for TeX Live config.status 2.4.8
+FreeType for TeX Live config.status 2.4.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffpic.c b/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffpic.c
deleted file mode 100644
index 5d01bd45e17..00000000000
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffpic.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  cffpic.c                                                               */
-/*                                                                         */
-/*    The FreeType position independent code services for cff module.      */
-/*                                                                         */
-/*  Copyright 2009, 2010 by                                                */
-/*  Oran Agra and Mickey Gabel.                                            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
-#include "cffpic.h"
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  /* forward declaration of PIC init functions from cffdrivr.c */
-  FT_Error FT_Create_Class_cff_services( FT_Library, FT_ServiceDescRec**);
-  void FT_Destroy_Class_cff_services( FT_Library, FT_ServiceDescRec*);
-  void FT_Init_Class_cff_service_ps_info( FT_Library, FT_Service_PsInfoRec*);
-  void FT_Init_Class_cff_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*);
-  void FT_Init_Class_cff_service_ps_name( FT_Library, FT_Service_PsFontNameRec*);
-  void FT_Init_Class_cff_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*);
-  void FT_Init_Class_cff_service_cid_info( FT_Library, FT_Service_CIDRec*);
-
-  /* forward declaration of PIC init functions from cffparse.c */
-  FT_Error FT_Create_Class_cff_field_handlers( FT_Library, CFF_Field_Handler**);
-  void FT_Destroy_Class_cff_field_handlers( FT_Library, CFF_Field_Handler*);
-
-  /* forward declaration of PIC init functions from cffcmap.c */
-  void FT_Init_Class_cff_cmap_encoding_class_rec( FT_Library, FT_CMap_ClassRec*);
-  void FT_Init_Class_cff_cmap_unicode_class_rec( FT_Library, FT_CMap_ClassRec*);
-
-  void
-  cff_driver_class_pic_free(  FT_Library library )
-  {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
-    if ( pic_container->cff )
-    {
-      CffModulePIC* container = (CffModulePIC*)pic_container->cff;
-      if(container->cff_services)
-        FT_Destroy_Class_cff_services(library, container->cff_services);
-      container->cff_services = NULL;
-      if(container->cff_field_handlers)
-        FT_Destroy_Class_cff_field_handlers(library, container->cff_field_handlers);
-      container->cff_field_handlers = NULL;
-      FT_FREE( container );
-      pic_container->cff = NULL;
-    }
-  }
-
-
-  FT_Error
-  cff_driver_class_pic_init( FT_Library  library )
-  {
-    FT_PIC_Container*  pic_container = &library->pic_container;
-    FT_Error           error         = CFF_Err_Ok;
-    CffModulePIC*      container;
-    FT_Memory          memory        = library->memory;
-
-
-    /* allocate pointer, clear and set global container pointer */
-    if ( FT_ALLOC ( container, sizeof ( *container ) ) )
-      return error;
-    FT_MEM_SET( container, 0, sizeof ( *container ) );
-    pic_container->cff = container;
-
-    /* initialize pointer table - this is how the module usually expects this data */
-    error = FT_Create_Class_cff_services(library, &container->cff_services);
-    if(error) 
-      goto Exit;
-    error = FT_Create_Class_cff_field_handlers(library, &container->cff_field_handlers);
-    if(error) 
-      goto Exit;
-    FT_Init_Class_cff_service_ps_info(library, &container->cff_service_ps_info);
-    FT_Init_Class_cff_service_glyph_dict(library, &container->cff_service_glyph_dict);
-    FT_Init_Class_cff_service_ps_name(library, &container->cff_service_ps_name);
-    FT_Init_Class_cff_service_get_cmap_info(library, &container->cff_service_get_cmap_info);
-    FT_Init_Class_cff_service_cid_info(library, &container->cff_service_cid_info);
-    FT_Init_Class_cff_cmap_encoding_class_rec(library, &container->cff_cmap_encoding_class_rec);
-    FT_Init_Class_cff_cmap_unicode_class_rec(library, &container->cff_cmap_unicode_class_rec);
-Exit:
-    if(error)
-      cff_driver_class_pic_free(library);
-    return error;
-  }
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfntpic.c b/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfntpic.c
deleted file mode 100644
index 53aca17b519..00000000000
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfntpic.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  sfntpic.c                                                              */
-/*                                                                         */
-/*    The FreeType position independent code services for sfnt module.     */
-/*                                                                         */
-/*  Copyright 2009, 2010 by                                                */
-/*  Oran Agra and Mickey Gabel.                                            */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
-#include "sfntpic.h"
-
-#ifdef FT_CONFIG_OPTION_PIC
-
-  /* forward declaration of PIC init functions from sfdriver.c */
-  FT_Error FT_Create_Class_sfnt_services( FT_Library, FT_ServiceDescRec**);
-  void FT_Destroy_Class_sfnt_services( FT_Library, FT_ServiceDescRec*);
-  void FT_Init_Class_sfnt_service_bdf( FT_Service_BDFRec*);
-  void FT_Init_Class_sfnt_interface( FT_Library, SFNT_Interface*);
-  void FT_Init_Class_sfnt_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*);
-  void FT_Init_Class_sfnt_service_ps_name( FT_Library, FT_Service_PsFontNameRec*);
-  void FT_Init_Class_tt_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*);
-  void FT_Init_Class_sfnt_service_sfnt_table( FT_Service_SFNT_TableRec*);
-
-  /* forward declaration of PIC init functions from ttcmap.c */
-  FT_Error FT_Create_Class_tt_cmap_classes( FT_Library, TT_CMap_Class**);
-  void FT_Destroy_Class_tt_cmap_classes( FT_Library, TT_CMap_Class*);
-
-  void
-  sfnt_module_class_pic_free(  FT_Library library )
-  {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
-    if ( pic_container->sfnt )
-    {
-      sfntModulePIC* container = (sfntModulePIC*)pic_container->sfnt;
-      if(container->sfnt_services)
-        FT_Destroy_Class_sfnt_services(library, container->sfnt_services);
-      container->sfnt_services = NULL;
-      if(container->tt_cmap_classes)
-        FT_Destroy_Class_tt_cmap_classes(library, container->tt_cmap_classes);
-      container->tt_cmap_classes = NULL;
-      FT_FREE( container );
-      pic_container->sfnt = NULL;
-    }
-  }
-
-
-  FT_Error
-  sfnt_module_class_pic_init(  FT_Library library )
-  {
-    FT_PIC_Container*  pic_container = &library->pic_container;
-    FT_Error           error = SFNT_Err_Ok;
-    sfntModulePIC*     container;
-    FT_Memory          memory = library->memory;
-
-
-    /* allocate pointer, clear and set global container pointer */
-    if ( FT_ALLOC ( container, sizeof ( *container ) ) )
-      return error;
-    FT_MEM_SET( container, 0, sizeof ( *container ) );
-    pic_container->sfnt = container;
-
-    /* initialize pointer table - this is how the module usually expects this data */
-    error = FT_Create_Class_sfnt_services(library, &container->sfnt_services);
-    if(error) 
-      goto Exit;
-    error = FT_Create_Class_tt_cmap_classes(library, &container->tt_cmap_classes);
-    if(error) 
-      goto Exit;
-    FT_Init_Class_sfnt_service_glyph_dict(library, &container->sfnt_service_glyph_dict);
-    FT_Init_Class_sfnt_service_ps_name(library, &container->sfnt_service_ps_name);
-    FT_Init_Class_tt_service_get_cmap_info(library, &container->tt_service_get_cmap_info);
-    FT_Init_Class_sfnt_service_sfnt_table(&container->sfnt_service_sfnt_table);
-#ifdef TT_CONFIG_OPTION_BDF
-    FT_Init_Class_sfnt_service_bdf(&container->sfnt_service_bdf);
-#endif
-    FT_Init_Class_sfnt_interface(library, &container->sfnt_interface);
-
-Exit:
-    if(error)
-      sfnt_module_class_pic_free(library);
-    return error;
-  }
-
-
-
-#endif /* FT_CONFIG_OPTION_PIC */
-
-
-/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8-PATCHES/TL-Changes b/Build/source/libs/freetype2/freetype-2.4.9-PATCHES/TL-Changes
index 37745ced560..1d87efa2d54 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8-PATCHES/TL-Changes
+++ b/Build/source/libs/freetype2/freetype-2.4.9-PATCHES/TL-Changes
@@ -1,11 +1,10 @@
-Changes applied to the freetype-2.4.8/ tree as obtained from:
-	http://savannah.nongnu.org/download/freetype/freetype-2.4.8.tar.bz2
+Changes applied to the freetype-2.4.9/ tree as obtained from:
+	http://savannah.nongnu.org/download/freetype/freetype-2.4.9.tar.bz2
 
 Updated:
 	builds/unix/config.guess
 	builds/unix/config.sub
 	builds/unix/install-sh
-	builds/unix/mkinstalldirs
 
 Converted Dos/Win line ends to native:
 	builds/win32/vc2005/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog
index 2aae63dfd0b..9afc1aa12bd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog
@@ -1,3 +1,773 @@
+2012-03-08  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.4.9 released.
+	=========================
+
+
+	Tag sources with `VER-2-4-9'.
+
+	* docs/CHANGES: Updated.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.4.9.
+
+	* README, Jamfile (RefDoc),
+	builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html,
+	builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html,
+	builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html,
+	builds/win32/visualc/freetype.dsp,
+	builds/win32/visualc/freetype.vcproj,
+	builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp,
+	builds/win32/visualce/freetype.vcproj,
+	builds/win32/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.4.8/2.4.9/, s/248/249/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 9.
+
+	* builds/unix/configure.raw (version_info): Set to 14:1:8.
+
+2012-03-08  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Add missing overflow check.
+
+	* src/bdf/bdflib.c (_bdf_parse_glyphs) <BITMAP>: Add threshold for
+	`glyph->bpr'.
+
+2012-03-07  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation.
+
+	* src\autofit\aferrors.h, src\bdf\bdferror.h, src\bzip2\ftbzip2.c,
+	src\cache\ftcerror.h, src\cff\cfferrs.h, src\cid\ciderrs.h,
+	src\gxvalid\gxverror.h, src\gzip\ftgzip.c, src\lzw\ftlzw.c,
+	src\otvalid\otverror.h, src\pcf\pcferror.h, src\pfr\pfrerror.h,
+	src\psaux\psauxerr.h, src\pshinter\pshnterr.h,
+	src\psnames\psnamerr.h, src\raster\rasterrs.h, src\sfnt\sferrors.h,
+	src\smooth\ftsmerrs.h, src\truetype\tterrors.h,
+	src\type1\t1errors.h, src\type42\t42error.h, src\winfonts\fnterrs.h:
+	Add #undef FT_ERR_PREFIX before #define FT_ERR_PREFIX.
+
+2012-03-03  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #35660.
+
+	For some divisions, we use casts to 32bit entities.  Always guard
+	against division by zero with these casts also.
+
+	* src/base/ftcalc.c (ft_div64by32): Remove redundant cast.
+	(FT_MulDiv, FT_MulDiv_No_Round): Add 32bit cast.
+	(FT_DivFix): Add 32bit cast (this omission triggered the bug).
+
+2012-03-03  Werner Lemberg  <wl@gnu.org>
+
+	[psaux] Fix handling of track kerning.
+
+	* src/psaux/afmparse.c (afm_parse_track_kern): Don't inverse sign
+	for `min_kern'.  It is indeed quite common that track kerning
+	*increases* spacing for very small sizes.
+
+2012-03-02  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35689.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check first outline
+	point.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35656.
+
+	* src/bdf/bdflib.c (_bdf_parse_glyphs) <_BDF_BITMAP>: Check validity
+	of nibble characters instead of accessing `a2i' array.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[winfonts] Fix Savannah bug #35659.
+
+	* src/winfonts/winfnt.c (FNT_Face_Init): Check number of glyphs.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35658.
+
+	* src/bdf/bdflib.c (_bdf_list_split): Initialize `field' elements
+	properly.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[psaux] Fix Savannah bug #35657.
+
+	If in function `skip_spaces' the routine `skip_comment' comes to the
+	end of buffer, `cur' is still increased by one, so we need to check
+	for `p >= limit' and not `p == limit'.
+
+	* src/psaux/psconv.c (PS_Conv_Strtol, PS_Conv_ToFixed,
+	PS_Conv_ASCIIHexDecode, PS_Conv_EexecDecode): Fix boundary checking.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35646.
+
+	* src/truetype/ttinterp.c (Ins_MIRP): Typo, present since ages.  The
+	code is now in sync with the other operators (e.g. MSIRP) which
+	modify twilight points.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35643.
+
+	* src/bdf/bdflib.c (_bdf_list_ensure): Bring code in sync with
+	comment before `_bdf_list_split', this is, really allocate at least
+	five `field' elements.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35641.
+
+	* src/bdf/bdflib.c (_bdf_parse_glyphs) <DWIDTH, BBX>: Abort if
+	_BDF_ENCODING isn't set.  We need this because access to the `glyph'
+	variable might be undefined otherwise.
+
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35640.
+
+	* src/truetype/ttinterp.c (SkipCode, TT_RunIns): Fix boundary check
+	for NPUSHB and NPUSHW instructions.
+
+2012-02-29  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35601.
+
+	* src/truetype/ttinterp.c (Ins_SHZ): Use number of points instead of
+	last point for loop.
+	Also remove redundant boundary check.
+
+2012-02-29  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Remove redundant check.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Remove redundant
+	second check for ordered contour start points.
+
+2012-02-29  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Make SHC instruction behave similar to MS rasterizer.
+
+	* src/truetype/ttinterp.c (Ins_SHC): Handle virtual contour in
+	twilight zone.
+
+2012-02-29  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	Avoid modulo operators against a power-of-two denominator.
+
+	* src/afcjk.c (af_hint_normal_stem), src/base/ftoutln.c
+	(ft_contour_has), src/cff/cffgload.c (cff_decoder_parse_charstrings)
+	<cff_op_vvcurveto, cff_op_hhcurveto, cff_op_hvcurveto>,
+	src/gxvalid/gxvcommn.c (GXV_32BIT_ALIGNMENT_VALIDATE),
+	src/gxvalid/gxvfeat.c (gxv_feat_setting_validate): Replace `%' with
+	`&' operator.
+
+2012-02-29  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Don't synchronize digit widths for light rendering mode.
+
+	We don't hint horizontally in this mode.
+
+	* src/autofit/afloader.c (af_loader_load_g) <Hint_Metrics>:
+	Implement it.
+
+2012-02-26  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[type42] Minor code optimization (again).
+
+	* src/type42/t42parse.c (t42_parse_sfnts): Simplify previous change.
+
+2012-02-26  Mateusz Jurczyk  <mjurczyk@google.com>
+	    Werner Lemberg  <wl@gnu.org>
+
+	[smooth] Fix Savannah bug #35604.
+
+	* src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `FT_Pos'
+	instead of `FT_UInt' for some variables and update comparisons
+	accordingly.  A detailed analysis can be found in the bug report.
+
+2012-02-26  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[type42] Minor code optimization.
+
+	* src/type42/t42parse.c (t42_parse_sfnts): Use bitmask instead of
+	modulo operator.
+
+2012-02-26  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2012-02-26  Werner Lemberg  <wl@gnu.org>
+
+	[type1] Fix Savannah bug #35608.
+
+	* src/type1/t1parse.c (T1_Get_Private_Dict): Reject too short
+	dictionaries.
+
+2012-02-26  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Support `ENCODING -1 <n>' format.
+
+	* src/bdf/bdflib.c (_bdf_parse_glyphs) <ENCODING>: Implement it.
+
+2012-02-26  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35607.
+
+	* src/bdf/bdflib.c (_bdf_parse_glyphs) <ENCODING>: Normalize
+	negative encoding values.
+
+2012-02-26  Werner Lemberg  <wl@gnu.org>
+
+	[type1] Fix Savannah bug #35606.
+
+	* src/type1/t1load.c (parse_subrs): Add proper guards for `strncmp'.
+
+	* src/psaux/psobjs.c (ps_parser_skip_PS_token): Emit error message
+	only if cur < limit.
+
+2012-02-25  Werner Lemberg  <wl@gnu.org>
+
+	[pcf] Fix Savannah bug #35603.
+
+	* src/pcf/pcfread.c (pcf_get_properties): Assure final zero byte in
+	`strings' array.
+
+2012-02-25  Werner Lemberg  <wl@gnu.org>
+
+	[type42] Fix Savannah bug #35602.
+
+	* src/type42/t42parse.c (t42_parse_sfnts): Check `string_size' more
+	thoroughly.
+
+2012-02-25  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bugs #35599 and #35600.
+
+	* src/bdf/bdflib.c (ACMSG16): New warning message.
+	(_bdf_parse_glyphs) <_BDF_BITMAP>: Check line length.
+
+2012-02-24  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bugs #35597 and #35598.
+
+	* src/bdf/bdflib.c (_bdf_is_atom): Fix handling of property value.
+
+2012-02-24  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (6/6).
+
+	* src/cff/cffdrivr.c: s/Load_Glyph/cff_glyph_load/.
+
+	* src/cid/cidload.c: s/parse_font_matrix/cid_parse_font_matrix/.
+	s/t1_init_loader/cid_init_loader/.
+	s/t1_done_loader/cid_done_loader/.
+
+	* src/pxaux/t1cmap.c: s/t1_get_glyph_name/psaux_get_glyph_name/.
+
+	* src/truetype/ttdriver.c: s/Load_Glyph/tt_glyph_load/.
+
+	* src/type1/t1load.c: s/parse_font_matrix/t1_parse_font_matrix/.
+
+2012-02-24  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (5/6).
+
+	* include/freetype/fterrors.h: Undefine FT_KEEP_ERR_PREFIX after
+	using it.
+
+2012-02-22  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (4/6).
+
+	* src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine RAS_ARG,
+	RAS_ARGS, RAS_VAR, and RAS_VARS before defining it.
+
+	* src/smooth/ftgrays.c: s/TRaster/black_TRaster/,
+	s/PRaster/black_PRaster/.
+	* src/raster/ftraster.c: s/TRaster/gray_TRaster/,
+	s/PRaster/gray_PRaster/.
+
+2012-02-20  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (3/6).
+
+	* src/smooth/ftgrays.c: s/TWorker/black_TWorker/,
+	s/PWorker/black_PWorker/.
+	* src/raster/ftraster.c: s/TWorker/gray_TWorker/,
+	s/PWorker/gray_PWorker/.
+
+2012-02-20  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (2/6).
+
+	* src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR,
+	CEILING, TRUNC, and SCALED before defining it.
+
+2012-02-20  Vinnie Falco  <vinnie.falco@gmail.com>
+
+	Prepare source code for amalgamation (1/6).
+
+	See discussion starting at
+
+	  http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html
+
+	* src/smooth/ftgrays.c: s/TBand/gray_TBand/.
+	* src/raster/ftraster.c: s/TBand/black_TBand/.
+
+2012-02-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[autofit] Fix outline flags.
+
+	* src/autofit/afloader.c (af_loader_load_g): Don't reassign
+	`outline.flags' so that this information is preserved.  See
+	discussion starting at
+
+	  http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html
+
+2012-02-11  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35466.
+
+	Jump instructions are now bound to the current function.  The MS
+	Windows rasterizer behaves the same, as confirmed by Greg Hitchcock.
+
+	* src/truetype/ttinterp.h (TT_CallRec): Add `Cur_End' element.
+	* src/truetype/ttobjs.h (TT_DefRecord): Add `end' element.
+
+	* src/truetype/ttinterp.c (DO_JROT, DO_JMPR, DO_JROF): Check upper
+	bound of jump address.
+	(Ins_FDEF, Ins_CALL, Ins_LOOPCALL, Ins_UNKNOWN, TT_RunIns): Updated.
+
+2012-02-11  Werner Lemberg  <wl@gnu.org>
+
+	We don't use `extensions'.
+
+	* include/freetype/internal/ftobjs.h (FT_DriverRec): Remove
+	`extensions' field.
+
+2012-02-11  Werner Lemberg  <wl@gnu.org>
+
+	Clean up `generic' fields.
+
+	* include/freetype/internal/ftobjs.h (FT_ModuleRec, FT_LibraryRec):
+	Remove `generic' field since users can't access it.
+
+	* src/base/ftobjs.c (FT_Done_GlyphSlot): Call `generic.finalizer' as
+	advertised in the documentation of FT_Generic.
+	(Destroy_Module, FT_Done_Library): Updated to changes in `ftobjs.h'.
+
+2012-02-07  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Harmonize function arguments.
+
+	* src/autofit/afloader.c, src/autofit/afloader.h: Use `FT_Int32' for
+	`load_flags'.
+
+2012-02-07  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffobjs.c (cff_face_init): Remove unnecessary casts.
+
+2012-01-17  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[gxvalid] Fix Savannah bug #35286.
+
+	Patch submitted by anonymous reporter.
+
+	* src/gxvalid/gxvcommn.c (gxv_XStateTable_subtable_setup):
+	gxv_set_length_by_ulong_offset() must be called with 3, not 4,
+	the number of the subtables in the state tables; classTable,
+	stateArray, entryTable.
+
+2012-01-17  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[raccess] Modify for PIC build.
+
+	Based on the patch provided by Erik Dahlstrom <ed@opera.com>,
+	http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00010.html
+
+	Also `raccess_guess_table[]' and `raccess_rule_by_darwin_vfs()'
+	are renamed with `ft_' suffixes.
+
+	* src/base/ftbase.h: `raccess_rule_by_darwin_vfs()' is renamed
+	to `ft_raccess_rule_by_darwin_vfs()'.
+	* src/base/ftobjs.c: Ditto.
+
+	* src/base/ftrfork.c: Declarations of FT_RFork_Rule,
+	raccess_guess_rec, are moved to...
+	* include/freetype/internal/ftrfork.h: Here.
+
+	* include/freetype/internal/ftrfork.h:
+	FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END} macros are defined
+	to replace raccess_guess_table[] in both of PIC and non-PIC
+	modes.
+	* src/base/ftrfork.c: raccess_guess_table[] array is rewritten
+	by FT_RFORK_RULE_ARRAY_{BEGIN,ENTRY,END}.
+
+	* src/base/basepic.h (BasePIC): Add `ft_raccess_guess_table'
+	storage.  (FT_RACCESS_GUESS_TABLE_GET): New macro to retrieve
+	the function pointer from `ft_raccess_guess_table' storage in
+	`BasePIC' structure.
+	* src/base/ftrfork.c (FT_Raccess_Guess): Rewritten with
+	FT_RACCESS_GUESS_TABLE_GET.
+	(raccess_get_rule_type_from_rule_index): Add `library' as the
+	first argument to the function, to retrieve the storage of
+	`ft_raccess_guess_table' from it.  Also `raccess_guess_table'
+	is replaced by FT_RACCESS_GUESS_TABLE_GET.
+	(ft_raccess_rule_by_darwin_vfs): Ditto.
+
+2012-01-16  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Remove trailing spaces.
+
+2012-01-16  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Formatting PIC related sources.
+
+	* src/autofit/afpic.c: Harmonize to FT2 coding conventions.
+	* src/base/basepic.c: Ditto.
+	* src/base/ftpic.c: Ditto.
+	* src/cff/cffpic.c: Ditto.
+	* src/pshinter/pshpic.c: Ditto.
+	* src/psnames/pspic.c: Ditto.
+	* src/raster/rastpic.c: Ditto.
+	* src/sfnt/sfntpic.c: Ditto.
+	* src/smooth/ftspic.c: Ditto.
+	* src/truetype/ttpic.c: Ditto.
+
+2012-01-16  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[autofit] Fix the inclusion of `aflatin2.h' in PIC file.
+
+	* src/autofit/afpic.c: Include `aflatin2.h' when
+	FT_OPTION_AUTOFIT2 is defined, as afglobal.c does so.
+	Unconditionally inclusion causes declared but unimplemented
+	warning by GCC 4.6.
+
+2012-01-16  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[cff] Remove redundant declarations of cff_cmap_XXX_class_rec.
+
+	* src/cff/cffpic.c: The declarations of
+	FT_Init_Class_cff_cmap_encoding_class_rec() and
+	FT_Init_Class_cff_cmap_unicode_class_rec() are removed.
+	They can be obtained by the inclusion of cffcmap.h.
+	cffcmap.h invokes FT_DECLARE_CMAP_CLASS() and it declares
+	FT_Init_Class_cff_cmap_encoding_class_rec() etc in PIC mode.
+
+2012-01-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix redundant declaration warning in PIC mode.
+
+	Originally FT_DEFINE_{DRIVER,MODULE,RENDERER}() macros were
+	designed to declare xxx_pic_{free,init} by themselves.
+	Because these macros are used at the end of the module
+	interface (e.g. ttdriver.c) and the wrapper source to build
+	a module as a single object (e.g. truetype.c) includes
+	the PIC file (e.g. ttpic.c) before the module interface,
+	these macros are expanded AFTER xxx_pic_{free,init} body
+	when the modules are built as single object.
+	The declaration after the implementation causes the redundant
+	declaration warnings, so the declarations are moved to module
+	PIC headers (e.g. ttpic.h).  Separating to other header files
+	are needed for multi build.
+
+	* include/freetype/internal/ftdriver.h (FT_DEFINE_DRIVER):
+	Remove class_##_pic_free and class_##_pic_init declarations.
+	* include/freetype/internal/ftobjs.h (FT_DEFINE_RENDERER,
+	FT_DEFINE_MODULE): Ditto.
+
+	* src/base/basepic.h: Insert a comment and fix coding style.
+	* src/autofit/afpic.h: Declare autofit_module_class_pic_{free,
+	init}.
+	* src/cff/cffpic.h: Declare cff_driver_class_pic_{free,init}.
+	* src/pshinter/pshpic.h: Declare pshinter_module_class_pic_{free,
+	init}.
+	* src/psnames/pspic.h: Declare psnames_module_class_pic_{free,
+	init}.
+	* src/raster/rastpic.h: Declare
+	ft_raster{1,5}_renderer_class_pic_{free,init}
+	* src/sfnt/sfntpic.h: Declare sfnt_module_class_pic_{free,init}.
+	* src/smooth/ftspic.h: Declare
+	ft_smooth_{,lcd_,lcdv_}renderer_class_pic_{free,init}.
+	* src/truetype/ttpic.h: Declare tt_driver_class_pic_{free,init}.
+
+2012-01-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Make pspic.c to include module error header to fix multi build.
+
+	* src/psnames/pspic.c: Include `psnamerr.h'.
+
+2012-01-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[base] Fix a dereference of uninitialized variable in PIC mode.
+
+	* src/base/ftglyph.c (FT_Glyph_To_Bitmap): `glyph' must be
+	set before derefering to obtain `library'.  The initialization
+	of `clazz', `glyph', `library' and NULL pointer check are
+	reordered to minimize PIC conditonals.
+
+2012-01-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[base] Insert explicit cast for GCC 4.6 in PIC mode.
+
+	* src/base/ftinit.c (FT_Add_Default_Modules): Under PIC
+	configuration, FT_DEFAULT_MODULES_GET returns
+	FT_Module_Class** pointer, GCC 4.6 warns that
+	const FT_Module_Class* const* variable is warned as
+	inappropriate to store it.  To calm it, explicit cast is
+	inserted.  Also `library' is checked to prevent the NULL
+	pointer dereference in FT_DEFAULT_MODULES_GET.
+
+2012-01-13  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix PIC build broken by d9145241fe378104ba4c12a42534549faacc92e6.
+
+	Under PIC configuration, FT_{CFF,PSCMAPS,SFNT,TT}_SERVICES_GET
+	take no arguments but derefer the variable named `library'
+	internally.
+
+	* src/cff/cffdrivr.c (cff_get_interface): Declare `library' and
+	set it if non-NULL driver is passed.
+	* src/truetype/ttdriver.c (tt_get_interface): Ditto.
+
+	* src/sfnt/sfdriver.c (sfnt_get_interface): Declare `library'
+	under PIC configuration, and set it if non-NULL module is given.
+	* src/psnames/psmodule.c (psnames_get_interface): Ditto.
+
+2012-01-13  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Make PIC files include module error headers, to use the error codes
+	with per-module prefix.
+
+	* src/autofit/afpic.c: Include `aferrors.h'.
+	* src/cff/cffpic.c: Include `cfferrs.h'.
+	* src/pshinter/pshpic.c: Include `pshnterr.h'.
+	* src/raster/rastpic.c: Include `rasterrs.h'.
+	* src/sfnt/sfntpic.c: Include `sferrors.h'.
+	* src/smooth/ftspic.c: Include `ftsmerrs.h'.
+	* src/truetype/ttpic.c: Include `tterrors.h'.
+
+2012-01-04  Tobias Ringström  <tobias@ringis.se>
+
+	[truetype] Fix IP instruction if x_ppem != y_ppem.
+
+	* src/truetype/ttinterp.c (Ins_IP): Scale `orus' coordinates
+	properly.
+
+2012-01-02  Werner Lemberg  <wl@gnu.org>
+
+	Fix tracing message for `loca' table.
+
+	* src/truetype/ttpload.c (tt_face_get_location): Don't emit a
+	warning message if the last `loca' entry references an empty glyph.
+
+2011-12-10  Werner Lemberg  <wl@gnu.org>
+
+	Add some variable initializations.
+	Reported by Richard COOK <rscook@unicode.org>.
+
+	* src/type1/t1driver.c (t1_ps_get_font_value): Initialize `val'.
+	* src/smooth/ftgrays.c (gray_render_conic): Initialize `levels'
+	earlier.
+
+2011-12-08  Werner Lemberg  <wl@gnu.org>
+
+	Fix serious scaling bug in `FT_Get_Advances'.
+
+	* src/base/ftadvanc.c (FT_Get_Advances): Advance values returned by
+	`FT_Load_Glyph' must be simply multiplied by 1024.
+
+2011-12-08  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdflib.c (_bdf_parse_start): Drop redundant error tracing.
+
+2011-12-02  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[mac] Unify DARWIN_NO_CARBON with FT_MACINTOSH.
+
+	Originally FT_MACINTOSH was a pure auto macro and DARWIN_NO_CARBON
+	was a configurable macro to disable Carbon-dependent code.  Because
+	now configure script sets DARWIN_NO_CARBON by default and disables
+	Darwin & Carbon-dependent codes, these macros can be unified.
+	FT_MACINTOSH (undefined by default) is kept and DARWIN_NO_CARBON
+	(defined by default) is removed, because DARWIN_NO_CARBON violates
+	FT_XXX naming convention of public macros, and a macro configured by
+	default is not portable for the building without configure (e.g.
+	make devel).
+
+	* builds/unix/configure.raw: Define FT_MACINTOSH if Carbon-based
+	old Mac font support is requested and Carbon is available.
+	* builds/unix/ftconfig.in: Undefine FT_MACINTOSH when the support
+	for Mac OS X without Carbon (e.g.  Mac OS X 10.4 for ppc64) is
+	requested.
+	* include/freetype/config/ftconfig.in: Ditto.
+	* builds/vms/ftconfig.h: Ditto.
+
+	* src/base/ftbase.h: Remove DARWIN_NO_CARBON.
+	* src/base/ftbase.c: Ditto.
+	* src/base/ftobjs.c: Ditto.
+	* src/base/ftrfork.c: Ditto.
+
+	* src/base/ftmac.c: Compile the body if FT_MACINTOSH is defined
+	(same with TT_USE_BYTECODE_INTERPRETER in ttinterp.c).
+	* builds/mac/ftmac.c: Ditto.
+
+	* builds/mac/FreeType.m68k_cfm.make.txt: Define FT_MACINTOSH.
+	* builds/mac/FreeType.m68k_far.make.txt: Ditto.
+	* builds/mac/FreeType.ppc_classic.make.txt: Ditto.
+	* builds/mac/FreeType.ppc_carbon.make.txt: Ditto.
+
+2011-11-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix Savannah bug #34728 (`make devel' on Mac OS X).
+
+	* builds/toplevel.mk: Check `/dev/null' to identify the Unix-
+	like systems without `init' nor `hurd' (e.g. Mac OS X >= 10.4).
+	* builds/unix/detect.mk: Ditto.
+
+2011-11-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	[apinames] Fix the overflow of signed integer hash.
+
+	* src/tools/apinames.c (names_add): Change the type of `h' from
+	int to unsigned int, to prevent undefined behaviour in the
+	overflow of signed integers (overflow of unsigned int is defined
+	to be wrap around).  Found by clang test suggested by Sean
+	McBride.
+
+2011-11-30  Werner Lemberg  <wl@gnu.org>
+
+	[winfonts] Remove casts.
+
+	* src/winfonts/winfnt.c (winfnt_driver_class): Remove all casts and
+	update affected functions.
+	(FNT_Size_Select): Fix number of arguments.
+
+2011-11-30  Werner Lemberg  <wl@gnu.org>
+
+	[type42] Remove casts.
+
+	* src/type42/t42driver.c (t42_driver_class): Remove all casts and
+	update affected functions.
+
+	* src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42driver
+	changes.
+
+2011-11-30  Werner Lemberg  <wl@gnu.org>
+
+	[type1] Remove casts.
+
+	* src/type1/t1driver.c (t1_driver_class): Remove all casts and
+	update affected functions.
+
+	* src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1objs.c:
+	Updated for t1driver changes.
+	src/type1/t1objs.h (T1_Driver): Remove unused typedef.
+	Updated for t1driver changes.
+
+2011-11-27  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #34896.
+
+	ENCODING now covers the whole Unicode range.
+
+	Note, however, that this change is quite expensive since it
+	increases the size of three arrays by almost 400kByte in total.  The
+	right fix is to replace the logic with something smarter.
+	Additionally, there exist very old BDFs for three-byte CCCII
+	encoding which exceeds the range of Unicode (another reason to have
+	a smarter logic).
+
+	* src/bdf/bdf.h (bdf_font_t): Increase size of `nmod' and `umod'
+	arrays.
+	* src/bdf/bdflib.c (bdf_parse_t): Increase size of `have' array.
+
+2011-11-27  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Improve tracing.
+
+	* src/bdf/bdflib.c (DBGMSG1, DBGMSG2): New macros.
+	(_bdf_parse_glyphs): Use them.
+
+2011-11-26  Werner Lemberg  <wl@gnu.org>
+
+	Improve tracing.
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Done), src/pcf/pcfdrivr.c
+	(PCF_Face_Done): Remove tracing message.
+
+	* src/bdf/bdfdrivr.c (BDF_Face_Init), src/cff/cffobjs.c
+	(cff_face_init), src/cid/cidobjs.c (cid_face_init),
+	src/pfr/pfrobjs.c (pfr_face_init), src/sfnt/sfobjs.c
+	(sfnt_init_face), src/truetype/ttobjs.c (tt_face_init),
+	src/type1/t1objs.c (T1_Face_Init), src/type42/t42objs.c
+	(T42_Face_Init), src/winfonts/winfnt.c (FNT_Face_Init): Add
+	`greeting' message.
+
+	* src/sfnt/sfobjs.c (sfnt_open_font), src/type42/t42objs.c
+	(T42_Open_Face): Improve tracing.
+
+2011-11-26  Werner Lemberg  <wl@gnu.org>
+
+	[cid] Fix error code.
+
+	* src/cid/cidparse.c (cid_parser_new): Do it.
+
+2011-11-26  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Fix error code.
+
+	* src/cff/cffload.c (cff_font_load): Do it.
+
+2011-11-26  Werner Lemberg  <wl@gnu.org>
+
+	Add new error code FT_Err_Missing_Module.
+
+	Previously, FreeType misleadingly returned
+	FT_Err_Unknown_File_Format if a module was missing (or a test was
+	missing completely).
+
+	* include/freetype/fterrdef.h (FT_Err_Missing_Module): Define.
+
+	* src/cff/cffobjs.c (cff_face_init), src/cff/cffdrivr.c
+	(cff_get_glyph_name), src/cid/cidobjs.c (cid_face_init),
+	src/sfnt/sfobjs.c (sfnt_init_face), src/truetype/ttobjs.c
+	(tt_face_init), src/type1/t1objs.c (T1_Face_Init),
+	src/type42/t42objs.c (T42_Face_Init, T42_Driver_Init): Updated.
+
+	* src/type1/t1afm.c (T1_Read_Metrics), src/type/t1objs.c
+	(T1_Face_Init), src/type42/t42objs.c (T42_Face_Init): Remove now
+	redundant test for `psaux'.
+
+2011-11-25  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Add more error messages.
+
+	* src/bdf/bdflib.c (_bdf_set_default_spacing, _bdf_add_property):
+	Add line number argument.
+	Update all callers.
+	(ERRMSG5, ERRMSG6, ERRMSG7, ERRMSG8, ERRMSG9): New macros.
+	(_bdf_readstream, _bdf_set_default_spacing, _bdf_add_property,
+	_bdf_parse_glyphs, _bdf_parse_start): Add error messages.
+
+2011-11-24  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/fterrors.h: Remove dead code.
+
+2011-11-15  Werner Lemberg  <wl@gnu.org>
+
+	* docs/releases: Updated.
+
 2011-11-15  Werner Lemberg  <wl@gnu.org>
 
 	* Version 2.4.8 released.
@@ -227,7 +997,7 @@
 	Add explicit LZW decompression stack size limit.
 
 	Stack larger than 1<<LZW_MAX_BITS is never needed if prefix table is
-	constructed correctly.  It's even less than that, see e.g. 
+	constructed correctly.  It's even less than that, see e.g.
 	libarchive code comment for a better size upper bound:
 
 	  http://code.google.com/p/libarchive/source/browse/trunk/libarchive/archive_read_support_filter_compress.c?r=3635#121
@@ -3290,7 +4060,7 @@
 
 ----------------------------------------------------------------------------
 
-Copyright 2010-2011 by
+Copyright 2010-2012 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.20 b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.20
index 8fcc5e70ab4..8fcc5e70ab4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.20
+++ b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.20
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.21 b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.21
index d6371d17583..d6371d17583 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.21
+++ b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.21
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.22 b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.22
index 4144288a5bf..4144288a5bf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.22
+++ b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.22
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.23 b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.23
index bc46c84a044..bc46c84a044 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/ChangeLog.23
+++ b/Build/source/libs/freetype2/freetype-2.4.9/ChangeLog.23
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/Jamfile
index eb000d65939..313bda65e6c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/Jamfile
@@ -195,7 +195,7 @@ rule RefDoc
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.8 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
 }
 
 RefDoc  refdoc ;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/Jamrules b/Build/source/libs/freetype2/freetype-2.4.9/Jamrules
index d8d1c7e617b..d8d1c7e617b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/Jamrules
+++ b/Build/source/libs/freetype2/freetype-2.4.9/Jamrules
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/Makefile b/Build/source/libs/freetype2/freetype-2.4.9/Makefile
index c1fa16cee54..c1fa16cee54 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/README b/Build/source/libs/freetype2/freetype-2.4.9/README
index fdc5e902d33..84b1c44cc1e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/README
@@ -1,4 +1,4 @@
-  FreeType 2.4.8
+  FreeType 2.4.9
   ==============
 
   Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -19,9 +19,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.4.8.tar.bz2
-    freetype-doc-2.4.8.tar.gz
-    ftdoc248.zip
+    freetype-doc-2.4.9.tar.bz2
+    freetype-doc-2.4.9.tar.gz
+    ftdoc249.zip
 
 
   Bugs
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/README.git b/Build/source/libs/freetype2/freetype-2.4.9/README.git
index 47cb2423f16..47cb2423f16 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/README.git
+++ b/Build/source/libs/freetype2/freetype-2.4.9/README.git
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/autogen.sh b/Build/source/libs/freetype2/freetype-2.4.9/autogen.sh
index 9f2fb6a3e81..9f2fb6a3e81 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/autogen.sh
+++ b/Build/source/libs/freetype2/freetype-2.4.9/autogen.sh
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/README b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/README
index 2b8f8e87dbb..2b8f8e87dbb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/include/freetype/config/ftconfig.h
index c2c2ac8dbb6..c2c2ac8dbb6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/include/freetype/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/include/freetype/config/ftconfig.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/include/freetype/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/include/freetype/config/ftmodule.h
index 5873bab74fa..5873bab74fa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/include/freetype/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/include/freetype/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/makefile b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/makefile
index 379883deec0..379883deec0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/makefile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/makefile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/makefile.os4 b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/makefile.os4
index 13758bcebf1..13758bcebf1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/makefile.os4
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/makefile.os4
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/smakefile b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/smakefile
index 097aec9b064..097aec9b064 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/smakefile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/smakefile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/src/base/ftdebug.c
index 5284e697aec..5284e697aec 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/src/base/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/src/base/ftsystem.c
index 6f9eac17fc8..6f9eac17fc8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/amiga/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/amiga/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/ansi/ansi-def.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/ansi/ansi-def.mk
index 2c585729515..2c585729515 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/ansi/ansi-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/ansi/ansi-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/ansi/ansi.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/ansi/ansi.mk
index 32b3bac3e3a..32b3bac3e3a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/ansi/ansi.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/ansi/ansi.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/ATARI.H b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/ATARI.H
index 9f78c924b83..9f78c924b83 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/ATARI.H
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/ATARI.H
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/FNames.SIC b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/FNames.SIC
index f3657179d91..f3657179d91 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/FNames.SIC
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/FNames.SIC
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/FREETYPE.PRJ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/FREETYPE.PRJ
index 4776a5bc690..4776a5bc690 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/FREETYPE.PRJ
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/FREETYPE.PRJ
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/README.TXT b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/README.TXT
index 04eec63519b..04eec63519b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/README.TXT
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/README.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/deflinejoiner.awk b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/deflinejoiner.awk
index c872a70d86a..c872a70d86a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/deflinejoiner.awk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/deflinejoiner.awk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/gen-purec-patch.sh b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/gen-purec-patch.sh
index 1ec050c11fa..1ec050c11fa 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/atari/gen-purec-patch.sh
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/atari/gen-purec-patch.sh
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/beos-def.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/beos-def.mk
index 4371a30aa3c..4371a30aa3c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/beos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/beos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/beos.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/beos.mk
index b5c8bdabe32..b5c8bdabe32 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/beos.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/beos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/detect.mk
index 24a0878862a..24a0878862a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/beos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/beos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/ansi-cc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/ansi-cc.mk
index 3b668e20102..3b668e20102 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/ansi-cc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/ansi-cc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/bcc-dev.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/bcc-dev.mk
index 63a46ad1680..63a46ad1680 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/bcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/bcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/bcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/bcc.mk
index 855edadf0a3..855edadf0a3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/bcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/emx.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/emx.mk
index c237005cb1e..c237005cb1e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/gcc-dev.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/gcc-dev.mk
index c63e1262ebe..c63e1262ebe 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/gcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/gcc-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/gcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/gcc.mk
index f6b7101b38a..f6b7101b38a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/intelc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/intelc.mk
index 413ce5bacc7..413ce5bacc7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/intelc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/intelc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/unix-lcc.mk
index d79f50846cb..d79f50846cb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/visualage.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/visualage.mk
index c109659bf73..c109659bf73 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/visualage.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/visualage.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/visualc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/visualc.mk
index 2e19ef86a31..2e19ef86a31 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/visualc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/visualc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/watcom.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/watcom.mk
index 4db1e7fecea..4db1e7fecea 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/watcom.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/watcom.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/win-lcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/win-lcc.mk
index 5d02d82462e..5d02d82462e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/compiler/win-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/compiler/win-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/detect.mk
index 987ae51c41f..987ae51c41f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/detect.mk
index 700a1226885..700a1226885 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-def.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-def.mk
index 950f581a00b..950f581a00b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-emx.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-emx.mk
index 6ea8f6d872f..6ea8f6d872f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-emx.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-emx.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-gcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-gcc.mk
index e14255c1f27..e14255c1f27 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-wat.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-wat.mk
index c763b163cd9..c763b163cd9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/dos/dos-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/dos/dos-wat.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/exports.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/exports.mk
index 52f2912d395..52f2912d395 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/exports.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/exports.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/freetype.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/freetype.mk
index 7a89c8e3d01..7a89c8e3d01 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/freetype.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/freetype.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/link_dos.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/link_dos.mk
index c37ac7e52c1..c37ac7e52c1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/link_dos.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/link_dos.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/link_std.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/link_std.mk
index 0bd2163bb19..0bd2163bb19 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/link_std.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/link_std.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.m68k_cfm.make.txt b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.m68k_cfm.make.txt
index 0bd145257ab..425f9f9ce28 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.m68k_cfm.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-68K         = -sym off
 
 COptions        = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
 			-d HAVE_FSREF=0 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.m68k_far.make.txt b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.m68k_far.make.txt
index e8e2f6eb19f..ebf5a1b56ab 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.m68k_far.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.m68k_far.make.txt
@@ -16,6 +16,7 @@ Includes        =  \xB6
 Sym-68K         = -sym off
 
 COptions        = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
 			-d HAVE_FSREF=0 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.ppc_carbon.make.txt b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.ppc_carbon.make.txt
index c37e0f36f97..2926413f395 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.ppc_carbon.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-PPC         = -sym off
 
 PPCCOptions     = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
                         -d HAVE_FSREF=1 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.ppc_classic.make.txt b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.ppc_classic.make.txt
index 0c0991eb079..377de9ab98f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/FreeType.ppc_classic.make.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/FreeType.ppc_classic.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-PPC         = -sym off
 
 PPCCOptions     = \xB6
+                        -d FT_MACINTOSH=1 \xB6
                         -d HAVE_FSSPEC=1 \xB6
                         -d HAVE_FSREF=0 \xB6
                         -d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/README b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/README
index bd3df8ada4b..bd3df8ada4b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ascii2mpw.py b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ascii2mpw.py
index ad32b219772..ad32b219772 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ascii2mpw.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ascii2mpw.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ftlib.prj.xml b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ftlib.prj.xml
index cbbc45ee55c..cbbc45ee55c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ftlib.prj.xml
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ftlib.prj.xml
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ftmac.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ftmac.c
index c974f670f2d..719dd0ce976 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/mac/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/mac/ftmac.c
@@ -171,6 +171,7 @@ typedef short ResourceIndex;
 #define PREFER_LWFN  1
 #endif
 
+#ifdef FT_MACINTOSH
 
 #if !HAVE_QUICKDRAW_CARBON  /* QuickDraw is deprecated since Mac OS X 10.4 */
 
@@ -1527,5 +1528,7 @@ typedef short ResourceIndex;
 
   }
 
+#endif /* FT_MACINTOSH */
+
 
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/modules.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/modules.mk
index c4a882cbdb5..c4a882cbdb5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/modules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/modules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/newline b/Build/source/libs/freetype2/freetype-2.4.9/builds/newline
index 8b137891791..8b137891791 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/newline
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/newline
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/detect.mk
index 47a40a2f857..47a40a2f857 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-def.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-def.mk
index 01cda9285af..01cda9285af 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-dev.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-dev.mk
index 83da8dea33e..83da8dea33e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-gcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-gcc.mk
index 446073e4f56..446073e4f56 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/os2/os2-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/os2/os2-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/symbian/bld.inf b/Build/source/libs/freetype2/freetype-2.4.9/builds/symbian/bld.inf
index dd5f559d4b1..dd5f559d4b1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/symbian/bld.inf
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/symbian/bld.inf
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/symbian/freetype.mmp b/Build/source/libs/freetype2/freetype-2.4.9/builds/symbian/freetype.mmp
index cb0008c4463..cb0008c4463 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/symbian/freetype.mmp
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/symbian/freetype.mmp
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/toplevel.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/toplevel.mk
index d552a4a179b..18bcef2c484 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/toplevel.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/toplevel.mk
@@ -122,6 +122,7 @@ ifdef check_platform
   #
   is_unix := $(strip $(wildcard /sbin/init) \
                      $(wildcard /usr/sbin/init) \
+                     $(wildcard /dev/null) \
                      $(wildcard /hurd/auth))
   ifneq ($(is_unix),)
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/aclocal.m4 b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/aclocal.m4
index b1ed6c78456..f90ad9fe324 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/aclocal.m4
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/aclocal.m4
@@ -14,8 +14,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -24,8 +24,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -159,6 +159,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -644,7 +646,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -808,6 +810,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -829,6 +832,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -859,6 +885,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -961,7 +991,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -969,6 +1005,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -980,6 +1017,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -997,7 +1035,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,8 +1082,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1054,6 +1094,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1337,14 +1379,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1421,13 +1476,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1607,6 +1662,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1646,7 +1706,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2192,7 +2252,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2201,7 +2261,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2266,7 +2326,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2405,7 +2465,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2413,10 +2473,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2424,7 +2480,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2442,7 +2498,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2462,17 +2518,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2533,7 +2590,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2549,7 +2606,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2586,9 +2643,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2651,7 +2708,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2720,7 +2777,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2745,7 +2802,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2769,7 +2826,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2800,7 +2857,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2810,7 +2867,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3232,7 +3289,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3652,6 +3709,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4236,7 +4294,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4328,18 +4388,33 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4499,7 +4574,9 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4524,7 +4601,6 @@ m4_if([$1], [CXX], [
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4775,8 +4851,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5071,6 +5146,7 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5117,10 +5193,6 @@ _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5133,7 +5205,7 @@ _LT_EOF
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5172,7 +5244,6 @@ _LT_EOF
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5614,9 +5685,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5770,7 +5838,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6140,7 +6207,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6901,12 +6968,18 @@ public class foo {
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7103,7 +7176,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7236,7 +7308,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7419,6 +7490,73 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7488,6 +7626,13 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -8152,9 +8297,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -8326,15 +8486,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/config.guess
index d622a44e551..d622a44e551 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/config.guess
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/config.sub
index c894da45500..c894da45500 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/config.sub
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/config.sub
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure
index 0e2a7bcf881..7d2eb89ded4 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for FreeType 2.4.8.
+# Generated by GNU Autoconf 2.68 for FreeType 2.4.9.
 #
 # Report bugs to <freetype@nongnu.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.4.8'
-PACKAGE_STRING='FreeType 2.4.8'
+PACKAGE_VERSION='2.4.9'
+PACKAGE_STRING='FreeType 2.4.9'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''
 
@@ -1285,7 +1285,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.4.8 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.4.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1350,7 +1350,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.4.8:";;
+     short | recursive ) echo "Configuration of FreeType 2.4.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1383,7 +1383,7 @@ Optional Packages:
   --with-quickdraw-carbon use MacOS QuickDraw in Carbon, if available
                           (default=yes)
   --with-ats              use AppleTypeService, if available (default=yes)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1465,7 +1465,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType configure 2.4.8
+FreeType configure 2.4.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2058,7 +2058,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.4.8, which was
+It was created by FreeType $as_me 2.4.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2414,7 +2414,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='14:0:8'
+version_info='14:1:8'
 
 ft_version=`echo $version_info | tr : .`
 
@@ -4251,8 +4251,8 @@ _ACEOF
 
 # check whether cpp computation of size of int and long in ftconfig.in works
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking cpp computation of bit length in ftconfig.in works" >&5
-$as_echo_n "checking cpp computation of bit length in ftconfig.in works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cpp computation of bit length in ftconfig.in works" >&5
+$as_echo_n "checking whether cpp computation of bit length in ftconfig.in works... " >&6; }
 orig_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
 ac_clean_files="ft2build.h ftoption.h ftstdlib.h"
@@ -4827,9 +4827,9 @@ if ac_fn_c_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
      ftmac_c='ftmac.c'
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking OS_INLINE macro is ANSI compatible" >&5
-$as_echo_n "checking OS_INLINE macro is ANSI compatible... " >&6; }
-     orig_CFLAGS="$CFLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS_INLINE macro is ANSI compatible" >&5
+$as_echo_n "checking whether OS_INLINE macro is ANSI compatible... " >&6; }
+     orig_CFLAGS="$CFLAGS -DFT_MACINTOSH"
      CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5324,8 +5324,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5969,6 +5969,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6008,7 +6013,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6434,7 +6439,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7071,13 +7076,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7266,6 +7271,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7654,7 +7660,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7665,7 +7671,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8305,7 +8324,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8316,6 +8341,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8348,6 +8374,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8369,7 +8396,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8805,7 +8834,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8883,6 +8927,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9338,7 +9386,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9429,18 +9479,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9802,7 +9867,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10052,8 +10116,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10432,6 +10495,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10477,6 +10541,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10505,10 +10570,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10521,7 +10582,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10560,7 +10621,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11184,11 +11244,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11278,7 +11333,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11287,7 +11342,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11352,7 +11407,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11491,7 +11546,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11499,10 +11554,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11510,7 +11561,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11528,7 +11579,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11548,17 +11599,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11619,7 +11671,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11635,7 +11687,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11672,9 +11724,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11756,7 +11808,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11825,7 +11877,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11850,7 +11902,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11874,7 +11926,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11905,7 +11957,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11915,7 +11967,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12697,6 +12749,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13247,7 +13301,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.4.8, which was
+This file was extended by FreeType $as_me 2.4.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13313,7 +13367,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.4.8
+FreeType config.status 2.4.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -13451,6 +13505,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -13531,7 +13586,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -13590,6 +13644,7 @@ DLLTOOL \
 OBJDUMP \
 SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -13638,7 +13693,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -14301,8 +14355,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -14365,6 +14419,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -14660,10 +14717,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure.ac
index e6cdb8e4380..a0662166be2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure.ac
@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2011 by
+# Copyright 2001-2012 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-AC_INIT([FreeType], [2.4.8], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.4.9], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='14:0:8'
+version_info='14:1:8'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -124,7 +124,7 @@ AC_CHECK_SIZEOF([long])
 
 # check whether cpp computation of size of int and long in ftconfig.in works
 
-AC_MSG_CHECKING([cpp computation of bit length in ftconfig.in works])
+AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works])
 orig_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
 ac_clean_files="ft2build.h ftoption.h ftstdlib.h"
@@ -330,8 +330,8 @@ if test x$with_old_mac_fonts = xyes; then
       ])],
     [AC_MSG_RESULT([ok])
      ftmac_c='ftmac.c'
-     AC_MSG_CHECKING([OS_INLINE macro is ANSI compatible])
-     orig_CFLAGS="$CFLAGS"
+     AC_MSG_CHECKING([whether OS_INLINE macro is ANSI compatible])
+     orig_CFLAGS="$CFLAGS -DFT_MACINTOSH"
      CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
      AC_COMPILE_IFELSE([
        AC_LANG_PROGRAM([
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure.raw
index c557480955d..111dbabc975 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/configure.raw
@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2011 by
+# Copyright 2001-2012 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='14:0:8'
+version_info='14:1:8'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -124,7 +124,7 @@ AC_CHECK_SIZEOF([long])
 
 # check whether cpp computation of size of int and long in ftconfig.in works
 
-AC_MSG_CHECKING([cpp computation of bit length in ftconfig.in works])
+AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works])
 orig_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
 ac_clean_files="ft2build.h ftoption.h ftstdlib.h"
@@ -330,8 +330,8 @@ if test x$with_old_mac_fonts = xyes; then
       ])],
     [AC_MSG_RESULT([ok])
      ftmac_c='ftmac.c'
-     AC_MSG_CHECKING([OS_INLINE macro is ANSI compatible])
-     orig_CFLAGS="$CFLAGS"
+     AC_MSG_CHECKING([whether OS_INLINE macro is ANSI compatible])
+     orig_CFLAGS="$CFLAGS -DFT_MACINTOSH"
      CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
      AC_COMPILE_IFELSE([
        AC_LANG_PROGRAM([
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/detect.mk
index e74af57308c..b2ae4f42bce 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/detect.mk
@@ -20,6 +20,7 @@ ifeq ($(PLATFORM),ansi)
   #
   is_unix := $(strip $(wildcard /sbin/init) \
                      $(wildcard /usr/sbin/init) \
+                     $(wildcard /dev/null) \
                      $(wildcard /hurd/auth))
   ifneq ($(is_unix),)
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype-config.in
index 815367ba8e1..815367ba8e1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype-config.in
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype2.in b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype2.in
index b73180049a6..b73180049a6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype2.in
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype2.in
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype2.m4
index 3d0ecb35540..3d0ecb35540 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/freetype2.m4
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/freetype2.m4
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ft-munmap.m4
index 68b3361e2b1..68b3361e2b1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ft-munmap.m4
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ft-munmap.m4
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ft2unix.h b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ft2unix.h
index 6a3b8d90e9c..6a3b8d90e9c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ft2unix.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ft2unix.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ftconfig.in b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ftconfig.in
index fd4a5cd4fab..9531afda187 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ftconfig.in
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ftconfig.in
@@ -142,8 +142,7 @@ FT_BEGIN_HEADER
   /*   This is the only necessary change, so it is defined here instead    */
   /*   providing a new configuration file.                                 */
   /*                                                                       */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
-    ( defined( __MWERKS__ ) && defined( macintosh )        )
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
   /* no Carbon frameworks for 64bit 10.4.x */
   /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
   /* so guess the system version by maximum errno before inclusion */
@@ -153,9 +152,7 @@ FT_BEGIN_HEADER
 #endif
 #if defined( __LP64__ ) && \
     ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#define DARWIN_NO_CARBON 1
-#else
-#define FT_MACINTOSH 1
+/undef FT_MACINTOSH
 #endif
 
 #elif defined( __SC__ ) || defined( __MRC__ )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ftsystem.c
index 95f8271ec35..95f8271ec35 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/install-sh b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/install-sh
index 377bb8687ff..377bb8687ff 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/install-sh
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/install-sh
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/install.mk
index 2e5ef080e33..2e5ef080e33 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/install.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/install.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ltmain.sh b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ltmain.sh
index 3061e3c5a2f..63ae69dc6fe 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/ltmain.sh
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/mkinstalldirs b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/mkinstalldirs
index 4191a45dbd7..ef7e16fdafe 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/mkinstalldirs
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-11.19
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -157,6 +157,5 @@ exit $errstatus
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
 # End:
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-cc.in
index b84bc5d27b1..b84bc5d27b1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-cc.in
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-cc.in
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-def.in
index e0a7a3a61ff..e0a7a3a61ff 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-def.in
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-dev.mk
index 76bae3862ae..76bae3862ae 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-lcc.mk
index 6038e523921..6038e523921 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix.mk
index 7f9d9a34fb9..7f9d9a34fb9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unix.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unix.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unixddef.mk
index 130d6b0f623..130d6b0f623 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/unix/unixddef.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/unix/unixddef.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/vms/ftconfig.h b/Build/source/libs/freetype2/freetype-2.4.9/builds/vms/ftconfig.h
index 99c37db3910..62fadac0fa2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/vms/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/vms/ftconfig.h
@@ -95,8 +95,7 @@ FT_BEGIN_HEADER
   /*   This is the only necessary change, so it is defined here instead    */
   /*   providing a new configuration file.                                 */
   /*                                                                       */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
-    ( defined( __MWERKS__ ) && defined( macintosh )        )
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
   /* no Carbon frameworks for 64bit 10.4.x */
   /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
   /* so guess the system version by maximum errno before inclusion */
@@ -106,9 +105,7 @@ FT_BEGIN_HEADER
 #endif
 #if defined( __LP64__ ) && \
     ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#define DARWIN_NO_CARBON 1
-#else
-#define FT_MACINTOSH 1
+#undef FT_MACINTOSH
 #endif
 
 #elif defined( __SC__ ) || defined( __MRC__ )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/vms/ftsystem.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/vms/ftsystem.c
index fb35967ccf0..fb35967ccf0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/vms/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/vms/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/detect.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/detect.mk
index 19065396090..19065396090 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/detect.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/detect.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/ftdebug.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/ftdebug.c
index d1ca15ac95b..d1ca15ac95b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2005/freetype.sln
index b90da27bb36..b90da27bb36 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2005/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2005/freetype.vcproj
index f88e7cfd019..296d3987a71 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249MT.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249ST.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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249ST_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype249MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2005/index.html
index d21bebd7bbb..bc4291ce59f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2005/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/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.4.8 sources:</p>
+compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/win32/vc2008/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2008/freetype.sln
index 0995f806174..0995f806174 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2008/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2008/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2008/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2008/freetype.vcproj
index e88d5131c32..1f95ad6696e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2008/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248MT.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -220,7 +220,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248ST.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -365,7 +365,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -439,7 +439,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2008/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2008/index.html
index b7032bf5a8f..9ad33eabd4d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2008/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/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.4.8 sources:</p>
+compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/win32/vc2010/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.sln
index 48fb9ae5733..48fb9ae5733 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.vcxproj
index 2e3a32f313d..3e5620bfe78 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/freetype.vcxproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.vcxproj
@@ -95,12 +95,12 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype248_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype248MT_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype248ST_D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype248</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype248MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype248ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype249_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype249MT_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype249ST_D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype249</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype249MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype249ST</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/freetype.vcxproj.filters b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.vcxproj.filters
index 1fe9d2519be..1fe9d2519be 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/freetype.vcxproj.filters
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/freetype.vcxproj.filters
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/index.html
index b8e332116a0..1d492fbe00a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/vc2010/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/vc2010/index.html
@@ -11,14 +11,14 @@
 
 <p>This directory contains a project file for Visual C++, named
 <tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.4.8 sources:</p>
+compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/win32/visualc/freetype.dsp b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.dsp
index 7e4af4041a3..188d22b1381 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.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\freetype248_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249_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\freetype248_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_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\freetype248.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.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\freetype248.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype248ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib"
 
 !ENDIF 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.dsw b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.sln
index 470d4fa3034..470d4fa3034 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.vcproj
index cb64f38cc67..0008a17a3ce 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualc/index.html
index 677155d763b..a32c95fc017 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualc/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/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.4.8 sources:</p>
+compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/win32/visualce/freetype.dsp b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.dsp
index 7e4af4041a3..188d22b1381 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/freetype.dsp
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.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\freetype248_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249_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\freetype248_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_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\freetype248.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.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\freetype248.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype248ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib"
 # SUBTRACT LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib"
 
 !ENDIF 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/freetype.dsw b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.dsw
index b1b375dbbc9..b1b375dbbc9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/freetype.dsw
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.dsw
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.vcproj
index 796900def04..8bdcd800cbc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248.lib"
+				OutputFile="..\..\..\objs\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT.lib"
+				OutputFile="..\..\..\objs\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST.lib"
+				OutputFile="..\..\..\objs\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248_D.lib"
+				OutputFile="..\..\..\objs\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/visualce/index.html
index 6a2fcf94791..eec6d613dbf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/visualce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/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.4.8 sources:</p>
+It compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/win32/w32-bcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-bcc.mk
index a9f48fc60b0..a9f48fc60b0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-bcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-bcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-bccd.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-bccd.mk
index 51b15d90324..51b15d90324 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-bccd.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-bccd.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-dev.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-dev.mk
index 00cacb0f675..00cacb0f675 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-dev.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-dev.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-gcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-gcc.mk
index 580afc5c94c..580afc5c94c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-gcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-icc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-icc.mk
index 8819a1f49fb..8819a1f49fb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-icc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-icc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-intl.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-intl.mk
index ae62e1bcdae..ae62e1bcdae 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-intl.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-intl.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-lcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-lcc.mk
index a147c4cb617..a147c4cb617 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-lcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-mingw32.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-mingw32.mk
index 04e9e211c0c..04e9e211c0c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-mingw32.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-mingw32.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-vcc.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-vcc.mk
index 7fb87948652..7fb87948652 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-vcc.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-vcc.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-wat.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-wat.mk
index 820b817358f..820b817358f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/w32-wat.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/w32-wat.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/win32-def.mk b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/win32-def.mk
index e6ae31c3b2a..e6ae31c3b2a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/win32/win32-def.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/win32/win32-def.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/ftdebug.c b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/ftdebug.c
index 272415d3d00..272415d3d00 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2005-ce/freetype.sln
index 67b2216dcd5..67b2216dcd5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2005-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2005-ce/freetype.vcproj
index 22f941c2fd8..476466b08e1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST.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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249ST_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_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\freetype248MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT.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\freetype248MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype249MT_D.lib" SuppressStartupBanner="true" />
       <Tool Name="VCALinkTool" />
       <Tool Name="VCXDCMakeTool" />
       <Tool Name="VCBscMakeTool" />
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2005-ce/index.html
index 2731c1c99eb..cffa8cbdd46 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2005-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 sources:</p>
+It compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/builds/wince/vc2008-ce/freetype.sln b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2008-ce/freetype.sln
index 0468e903b71..0468e903b71 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2008-ce/freetype.sln
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2008-ce/freetype.sln
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2008-ce/freetype.vcproj b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2008-ce/freetype.vcproj
index aa9c3575a8b..5bc45c59714 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2008-ce/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -266,7 +266,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -533,7 +533,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -709,7 +709,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -797,7 +797,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -885,7 +885,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -973,7 +973,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1061,7 +1061,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1149,7 +1149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1236,7 +1236,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1323,7 +1323,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1410,7 +1410,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1497,7 +1497,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1584,7 +1584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1668,7 +1668,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1753,7 +1753,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1838,7 +1838,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1923,7 +1923,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2008,7 +2008,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2093,7 +2093,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2178,7 +2178,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2263,7 +2263,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2348,7 +2348,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2433,7 +2433,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2518,7 +2518,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2603,7 +2603,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2689,7 +2689,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2775,7 +2775,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2861,7 +2861,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -2947,7 +2947,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3033,7 +3033,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3119,7 +3119,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3205,7 +3205,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -3279,7 +3279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype248MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype249MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2008-ce/index.html b/Build/source/libs/freetype2/freetype-2.4.9/builds/wince/vc2008-ce/index.html
index 5c21035ee63..0c636b6e309 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/builds/wince/vc2008-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 sources:</p>
+It compiles the following libraries from the FreeType 2.4.9 sources:</p>
 
 <ul>
   <pre>
-    freetype248.lib     - release build; single threaded
-    freetype248_D.lib   - debug build;   single threaded
-    freetype248MT.lib   - release build; multi-threaded
-    freetype248MT_D.lib - debug build;   multi-threaded</pre>
+    freetype249.lib     - release build; single threaded
+    freetype249_D.lib   - debug build;   single threaded
+    freetype249MT.lib   - release build; multi-threaded
+    freetype249MT_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.4.8/configure b/Build/source/libs/freetype2/freetype-2.4.9/configure
index b3975562410..55a24fdc597 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/configure
+++ b/Build/source/libs/freetype2/freetype-2.4.9/configure
@@ -92,19 +92,19 @@ if test $inode_src -ne $inode_dst; then
     cp $abs_ft2_dir/modules.cfg $abs_curr_dir
   fi
   echo "Generating \`Makefile'"
-  echo "TOP_DIR   := $abs_ft2_dir"               > Makefile
-  echo "OBJ_DIR   := $abs_curr_dir"             >> Makefile
-  echo "OBJ_BUILD := \$(OBJ_DIR)"               >> Makefile
-  echo "DOC_DIR   := \$(OBJ_DIR)/reference"     >> Makefile
-  echo "FT_LIBTOOL_DIR   := \$(OBJ_DIR)"        >> Makefile
-  echo "ifndef FT2DEMOS"                        >> Makefile
-  echo "  include \$(TOP_DIR)/Makefile"         >> Makefile
-  echo "else"                                   >> Makefile
-  echo "  TOP_DIR_2 := \$(TOP_DIR)/../ft2demos" >> Makefile
-  echo "  PROJECT   := freetype"                >> Makefile
-  echo "  CONFIG_MK := \$(OBJ_DIR)/config.mk"   >> Makefile
-  echo "  include \$(TOP_DIR_2)/Makefile"       >> Makefile
-  echo "endif"                                  >> Makefile
+  echo "TOP_DIR        := $abs_ft2_dir"           > Makefile
+  echo "OBJ_DIR        := $abs_curr_dir"         >> Makefile
+  echo "OBJ_BUILD      := \$(OBJ_DIR)"           >> Makefile
+  echo "DOC_DIR        := \$(OBJ_DIR)/reference" >> Makefile
+  echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)"           >> Makefile
+  echo "ifndef FT2DEMOS"                         >> Makefile
+  echo "  include \$(TOP_DIR)/Makefile"          >> Makefile
+  echo "else"                                    >> Makefile
+  echo "  TOP_DIR_2 := \$(TOP_DIR)/../ft2demos"  >> Makefile
+  echo "  PROJECT   := freetype"                 >> Makefile
+  echo "  CONFIG_MK := \$(OBJ_DIR)/config.mk"    >> Makefile
+  echo "  include \$(TOP_DIR_2)/Makefile"        >> Makefile
+  echo "endif"                                   >> Makefile
 fi
 
 # call make
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/devel/ft2build.h b/Build/source/libs/freetype2/freetype-2.4.9/devel/ft2build.h
index c1d38c35ae8..c1d38c35ae8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/devel/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/devel/ft2build.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/devel/ftoption.h b/Build/source/libs/freetype2/freetype-2.4.9/devel/ftoption.h
index 4da0221db37..4da0221db37 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/devel/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/devel/ftoption.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/CHANGES b/Build/source/libs/freetype2/freetype-2.4.9/docs/CHANGES
index a63061e1123..ae5793282a0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/CHANGES
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/CHANGES
@@ -1,4 +1,32 @@
 
+CHANGES BETWEEN 2.4.8 and 2.4.9
+
+  I. IMPORTANT BUG FIXES
+
+    - Another round of fixes to better handle invalid fonts.   Many of
+      them are vulnerabilities  (see CVE-2012-1126 up to CVE-2012-1144
+      and SA48320) so all users should upgrade.
+
+
+  II. MISCELLANEOUS
+
+    - The `ENCODING -1 <n>' format of BDF fonts is now supported.
+
+    - For BDF fonts,  support for the whole Unicode encoding range has
+      been added.
+
+    - Better TTF support for x_ppem != y_ppem.
+
+    - `FT_Get_Advances' sometimes returned bogus values.
+
+    - The  demo  programs  no  longer  recognize  and  handle  default
+      suffixes; you now have to always specify the complete font name.
+
+    - Better rendering and LCD mode cycling added to ftview.
+
+
+======================================================================
+
 CHANGES BETWEEN 2.4.7 and 2.4.8
 
   I. IMPORTANT BUG FIXES
@@ -3601,7 +3629,7 @@ Extensions support:
 
 ------------------------------------------------------------------------
 
-Copyright 2000-2011 by
+Copyright 2000-2012 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.4.8/docs/CUSTOMIZE b/Build/source/libs/freetype2/freetype-2.4.9/docs/CUSTOMIZE
index 7d7d474ec0d..7d7d474ec0d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/CUSTOMIZE
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/CUSTOMIZE
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/DEBUG b/Build/source/libs/freetype2/freetype-2.4.9/docs/DEBUG
index 3d6acd3bb0e..3d6acd3bb0e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/DEBUG
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/DEBUG
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/FTL.TXT b/Build/source/libs/freetype2/freetype-2.4.9/docs/FTL.TXT
index bbaba33f47d..bbaba33f47d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/FTL.TXT
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/FTL.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/GPLv2.TXT b/Build/source/libs/freetype2/freetype-2.4.9/docs/GPLv2.TXT
index b2fe7b6af35..b2fe7b6af35 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/GPLv2.TXT
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/GPLv2.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL
index fc699a8d53c..fc699a8d53c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.ANY b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.ANY
index 80f161c64d3..80f161c64d3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.ANY
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.ANY
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.CROSS b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.CROSS
index 3def12c8c59..3def12c8c59 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.CROSS
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.CROSS
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.GNU b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.GNU
index 72df50a4eac..72df50a4eac 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.GNU
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.GNU
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.MAC b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.MAC
index 42bb0d8637c..42bb0d8637c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.MAC
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.MAC
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.UNIX b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.UNIX
index 5dc0764ef69..5dc0764ef69 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.UNIX
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.UNIX
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.VMS b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.VMS
index 994e566883f..994e566883f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/INSTALL.VMS
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/INSTALL.VMS
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/LICENSE.TXT b/Build/source/libs/freetype2/freetype-2.4.9/docs/LICENSE.TXT
index 62945c85fe9..62945c85fe9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/LICENSE.TXT
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/LICENSE.TXT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/MAKEPP b/Build/source/libs/freetype2/freetype-2.4.9/docs/MAKEPP
index 58eaf551df8..58eaf551df8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/MAKEPP
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/MAKEPP
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/PROBLEMS b/Build/source/libs/freetype2/freetype-2.4.9/docs/PROBLEMS
index 40bdc35a676..40bdc35a676 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/PROBLEMS
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/PROBLEMS
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/TODO b/Build/source/libs/freetype2/freetype-2.4.9/docs/TODO
index be60d6f040a..be60d6f040a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/TODO
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/TODO
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/VERSION.DLL b/Build/source/libs/freetype2/freetype-2.4.9/docs/VERSION.DLL
index 044f6b87dc3..1dfc8c18733 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/VERSION.DLL
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/VERSION.DLL
@@ -53,6 +53,7 @@ systems, but not all of them:
 
     release    libtool      so
   -------------------------------
+     2.4.9      14.1.8    6.8.1
      2.4.8      14.0.8    6.8.0
      2.4.7      13.2.7    6.7.2
      2.4.6      13.1.7    6.7.1
@@ -134,7 +135,7 @@ other release numbers.
 
 ------------------------------------------------------------------------
 
-Copyright 2002-2011 by
+Copyright 2002-2012 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.4.8/docs/formats.txt b/Build/source/libs/freetype2/freetype-2.4.9/docs/formats.txt
index 827c8947f8f..827c8947f8f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/formats.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/formats.txt
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/raster.txt b/Build/source/libs/freetype2/freetype-2.4.9/docs/raster.txt
index 95d9e24010b..95d9e24010b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/raster.txt
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/raster.txt
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/README b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/README
index 51b04d6f151..51b04d6f151 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-base_interface.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-base_interface.html
index ab5540c9d6c..8c918eaacd9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-base_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Base Interface
@@ -693,8 +693,8 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 
     <a href="ft2-list_processing.html#FT_ListRec">FT_ListRec</a>        sizes_list;
 
-    <a href="ft2-basic_types.html#FT_Generic">FT_Generic</a>        autohint;
-    <span class="keyword">void</span>*             extensions;
+    <a href="ft2-basic_types.html#FT_Generic">FT_Generic</a>        autohint;   /* face-specific auto-hinter data */
+    <span class="keyword">void</span>*             extensions; /* unused                         */
 
     <a href="ft2-base_interface.html#FT_Face_Internal">FT_Face_Internal</a>  internal;
 
@@ -1507,6 +1507,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
 <p>In case you want to provide your own memory allocating routines, use <a href="ft2-module_management.html#FT_New_Library">FT_New_Library</a> instead, followed by a call to <a href="ft2-module_management.html#FT_Add_Default_Modules">FT_Add_Default_Modules</a> (or a series of calls to <a href="ft2-module_management.html#FT_Add_Module">FT_Add_Module</a>).</p>
+<p>For multi-threading applications each thread should have its own FT_Library object.</p>
 </td></tr></table>
 </td></tr></table>
 <hr width="75%">
@@ -1882,6 +1883,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>Unlike FreeType 1.x, this function automatically creates a glyph slot for the face object which can be accessed directly through &lsquo;face-&gt;glyph&rsquo;.</p>
 <p>FT_Open_Face can be used to quickly check whether the font format of a given font resource is supported by FreeType. If the &lsquo;face_index&rsquo; field is negative, the function's return value is&nbsp;0 if the font format is recognized, or non-zero otherwise; the function returns a more or less empty face handle in &lsquo;*aface&rsquo; (if &lsquo;aface&rsquo; isn't NULL). The only useful field in this special case is &lsquo;face-&gt;num_faces&rsquo; which gives the number of faces within the font file. After examination, the returned <a href="ft2-base_interface.html#FT_Face">FT_Face</a> structure should be deallocated with a call to <a href="ft2-base_interface.html#FT_Done_Face">FT_Done_Face</a>.</p>
 <p>Each new face object created with this function also owns a default <a href="ft2-base_interface.html#FT_Size">FT_Size</a> object, accessible as &lsquo;face-&gt;size&rsquo;.</p>
+<p>One <a href="ft2-base_interface.html#FT_Library">FT_Library</a> instance can have multiple face objects, this is, <a href="ft2-base_interface.html#FT_Open_Face">FT_Open_Face</a> and its siblings can be called multiple times using the same &lsquo;library&rsquo; argument.</p>
 <p>See the discussion of reference counters in the description of <a href="ft2-base_interface.html#FT_Reference_Face">FT_Reference_Face</a>.</p>
 </td></tr></table>
 </td></tr></table>
@@ -2458,20 +2460,20 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre>
 
 #define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_DEFAULT</a>                      0x0
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>                     0x1
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a>                   0x2
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a>                       0x4
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_BITMAP</a>                    0x8
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a>              0x10
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_FORCE_AUTOHINT</a>               0x20
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_CROP_BITMAP</a>                  0x40
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_PEDANTIC</a>                     0x80
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH</a>  0x200
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_RECURSE</a>                   0x400
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a>             0x800
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a>                   0x1000
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_LINEAR_DESIGN</a>                0x2000
-#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_AUTOHINT</a>                  0x8000U
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_SCALE</a>                     ( 1L &lt;&lt; 0 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_HINTING</a>                   ( 1L &lt;&lt; 1 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_RENDER</a>                       ( 1L &lt;&lt; 2 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_BITMAP</a>                    ( 1L &lt;&lt; 3 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_VERTICAL_LAYOUT</a>              ( 1L &lt;&lt; 4 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_FORCE_AUTOHINT</a>               ( 1L &lt;&lt; 5 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_CROP_BITMAP</a>                  ( 1L &lt;&lt; 6 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_PEDANTIC</a>                     ( 1L &lt;&lt; 7 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH</a>  ( 1L &lt;&lt; 9 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_RECURSE</a>                   ( 1L &lt;&lt; 10 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_IGNORE_TRANSFORM</a>             ( 1L &lt;&lt; 11 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_MONOCHROME</a>                   ( 1L &lt;&lt; 12 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_LINEAR_DESIGN</a>                ( 1L &lt;&lt; 13 )
+#define <a href="ft2-base_interface.html#FT_LOAD_XXX">FT_LOAD_NO_AUTOHINT</a>                  ( 1L &lt;&lt; 15 )
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
@@ -2514,6 +2516,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 </td></tr>
 <tr valign=top><td><b>FT_LOAD_PEDANTIC</b></td><td>
 <p>Indicates that the font driver should perform pedantic verifications during glyph loading. This is mostly used to detect broken glyphs in fonts. By default, FreeType tries to handle broken fonts also.</p>
+<p>In particular, errors from the TrueType bytecode engine are not passed to the application if this flag is not set; this might result in partially hinted or distorted glyphs in case a glyph's bytecode is buggy.</p>
 </td></tr>
 <tr valign=top><td colspan=0><b>FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH</b></td></tr>
 <tr valign=top><td></td><td>
@@ -2978,7 +2981,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p>The point size in 16.16 fractional points.</p>
 </td></tr>
 <tr valign=top><td><b>degree</b></td><td>
-<p>The degree of tightness.</p>
+<p>The degree of tightness. Increasingly negative values represent tighter track kerning, while increasingly positive values represent looser track kerning. Value zero means no track kerning.</p>
 </td></tr>
 </table>
 </td></tr></table>
@@ -2986,13 +2989,17 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 <p></p>
 <table cellpadding=3 border=0>
 <tr valign=top><td><b>akerning</b></td><td>
-<p>The kerning in 16.16 fractional points.</p>
+<p>The kerning in 16.16 fractional points, to be uniformly applied between all glyphs.</p>
 </td></tr>
 </table>
 </td></tr></table>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>return</b></em></td></tr><tr><td>
 <p>FreeType error code. 0&nbsp;means success.</p>
 </td></tr></table>
+<table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>note</b></em></td></tr><tr><td>
+<p>Currently, only the Type&nbsp;1 font driver supports track kerning, using data from AFM files (if attached with <a href="ft2-base_interface.html#FT_Attach_File">FT_Attach_File</a> or <a href="ft2-base_interface.html#FT_Attach_Stream">FT_Attach_Stream</a>).</p>
+<p>Only very few AFM files come with track kerning data; please refer to the Adobe's AFM specification for more details.</p>
+</td></tr></table>
 </td></tr></table>
 <hr width="75%">
 <table align=center width="75%"><tr><td><font size=-2>[<a href="ft2-index.html">Index</a>]</font></td>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-basic_types.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-basic_types.html
index 6ddfbfb4b2d..510d04b4960 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-basic_types.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Basic Data Types
@@ -1122,7 +1122,7 @@ Defined in FT_TYPES_H (freetype/fttypes.h).
 </pre></table><br>
 <table align=center width="87%"><tr><td>
 <p>Client applications often need to associate their own data to a variety of FreeType core objects. For example, a text layout API might want to associate a glyph cache to a given size object.</p>
-<p>Most FreeType object contains a &lsquo;generic&rsquo; field, of type FT_Generic, which usage is left to client applications and font servers.</p>
+<p>Some FreeType object contains a &lsquo;generic&rsquo; field, of type FT_Generic, which usage is left to client applications and font servers.</p>
 <p>It can be used to store a pointer to client-specific data, as well as the address of a &lsquo;finalizer&rsquo; function, which will be called by FreeType when the object is destroyed (for example, the previous client example would put the address of the glyph cache destructor in the &lsquo;finalizer&rsquo; field).</p>
 </td></tr></table><br>
 <table align=center width="87%" cellpadding=5><tr bgcolor="#EEEEFF"><td><em><b>fields</b></em></td></tr><tr><td>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bdf_fonts.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-bdf_fonts.html
index bab95325a24..0f41254a0dc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bdf_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 BDF and PCF Files
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bitmap_handling.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-bitmap_handling.html
index 31d0e267cb8..db5c763be8b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bitmap_handling.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Bitmap Handling
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bzip2.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-bzip2.html
index cc5d08a9d2f..7f87a23942b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-bzip2.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 BZIP2 Streams
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-cache_subsystem.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-cache_subsystem.html
index 816400545e3..cb7ad05d747 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-cache_subsystem.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Cache Sub-System
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-cid_fonts.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-cid_fonts.html
index 0f2a2c7b987..cc533b5ffea 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-cid_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 CID Fonts
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-computations.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-computations.html
index 761016ed8b4..82a2a27d00b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-computations.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Computations
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-font_formats.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-font_formats.html
index d2d5febf91c..661480efd20 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-font_formats.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Font Formats
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gasp_table.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-gasp_table.html
index 8bfe9cde1e0..819977867bb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gasp_table.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Gasp Table
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_management.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-glyph_management.html
index dad47adc9a9..f9ba910c70f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_management.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Glyph Management
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_stroker.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-glyph_stroker.html
index 85be03871f7..441ea6d813f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_stroker.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Glyph Stroker
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_variants.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-glyph_variants.html
index 72fb3fd1f7a..04b5f978b2f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-glyph_variants.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Glyph Variants
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gx_validation.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-gx_validation.html
index 38fe64f0a31..f9a239a7235 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gx_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 TrueTypeGX/AAT Validation
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gzip.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-gzip.html
index 5964ab864a8..698dc74df6a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-gzip.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 GZIP Streams
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-header_file_macros.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-header_file_macros.html
index 85875ea28a7..b94ef5e2456 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-header_file_macros.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Header File Macros
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-incremental.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-incremental.html
index 1c2a011fef2..cb14e16f537 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-incremental.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Incremental Loading
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-index.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-index.html
index 28ed2f35a3c..fb674a27586 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-index.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -34,7 +34,7 @@
 
 <table align=center><tr><td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <table align=center border=0 cellpadding=0 cellspacing=0>
 <tr><td><a href="ft2-bdf_fonts.html#FT_PropertyType">BDF_PROPERTY_TYPE_ATOM</a></td><td><a href="ft2-lcd_filtering.html#FT_LcdFilter">FT_LcdFilter</a></td><td><a href="ft2-glyph_stroker.html#FT_Stroker_ParseOutline">FT_Stroker_ParseOutline</a></td></tr>
@@ -290,5 +290,5 @@
 <table><tr><td width="100%"></td>
 <td><font size=-2>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
 
-<center><font size=-2>generated on Tue Nov 15 07:53:40 2011</font></center></body>
+<center><font size=-2>generated on Thu Mar  8 21:09:06 2012</font></center></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-lcd_filtering.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-lcd_filtering.html
index 237c7aba244..3e88cebdb7d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-lcd_filtering.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 LCD Filtering
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-list_processing.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-list_processing.html
index 7ecb4bb6bef..6b4dc314e4f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-list_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 List Processing
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-lzw.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-lzw.html
index 661f8cd68ed..430036409d3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-lzw.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 LZW Streams
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-mac_specific.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-mac_specific.html
index 07eb928ded5..2b862ad5252 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-mac_specific.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Mac Specific Interface
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-module_management.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-module_management.html
index 55078998823..da119b62f26 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-module_management.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Module Management
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-multiple_masters.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-multiple_masters.html
index ab44553b178..3f3ad2eb894 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-multiple_masters.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Multiple Masters
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-ot_validation.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-ot_validation.html
index 394896bcbc3..edc8f763d7c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-ot_validation.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 OpenType Validation
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-outline_processing.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-outline_processing.html
index 99f854db570..a36f1368933 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-outline_processing.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Outline Processing
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-pfr_fonts.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-pfr_fonts.html
index d6ab64d1ead..6a968f3d75d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-pfr_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 PFR Fonts
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-quick_advance.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-quick_advance.html
index f6a693ee777..80efee1dcaa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-quick_advance.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Quick retrieval of advance values
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-raster.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-raster.html
index 6fee7b073bb..34f2078465b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-raster.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Scanline Converter
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-sfnt_names.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-sfnt_names.html
index 4c9841b65fd..ab1312a60ac 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-sfnt_names.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 SFNT Names
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-sizes_management.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-sizes_management.html
index 536f4a9f862..104957b1c05 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-sizes_management.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Size Management
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-system_interface.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-system_interface.html
index 6d2192543d7..63b55b31b0f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-system_interface.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 System Interface
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-toc.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-toc.html
index ca6f8edf31d..9410b9e574a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-toc.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -34,7 +34,7 @@
 
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>Table of Contents</h1></center>
 <br><table align=center width="75%"><tr><td><h2>General Remarks</h2><ul class="empty"><li>
@@ -215,5 +215,5 @@
 <td width="100%"></td>
 </tr></table>
 
-<center><font size=-2>generated on Tue Nov 15 07:53:40 2011</font></center></body>
+<center><font size=-2>generated on Thu Mar  8 21:09:06 2012</font></center></body>
 </html>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-truetype_engine.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-truetype_engine.html
index 64f6e5b8795..02c67e9c39f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-truetype_engine.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 The TrueType Engine
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-truetype_tables.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-truetype_tables.html
index c7e48d589c1..a57ba4f0c08 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-truetype_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 TrueType Tables
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-type1_tables.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-type1_tables.html
index 7182a6f0ea6..a7d11970551 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-type1_tables.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Type 1 Tables
@@ -600,7 +600,7 @@ Defined in FT_TYPE1_TABLES_H (freetype/t1tables.h).
     PS_DICT_NOTICE,                 /* <a href="ft2-basic_types.html#FT_String">FT_String</a>* */
     PS_DICT_FULL_NAME,              /* <a href="ft2-basic_types.html#FT_String">FT_String</a>* */
     PS_DICT_FAMILY_NAME,            /* <a href="ft2-basic_types.html#FT_String">FT_String</a>* */
-    PS_DICT_WEIGHT,                 /* <a href="ft2-basic_types.html#FT_String">FT_String</a>  */
+    PS_DICT_WEIGHT,                 /* <a href="ft2-basic_types.html#FT_String">FT_String</a>* */
     PS_DICT_IS_FIXED_PITCH,         /* <a href="ft2-basic_types.html#FT_Bool">FT_Bool</a>    */
     PS_DICT_UNDERLINE_POSITION,     /* <a href="ft2-basic_types.html#FT_Short">FT_Short</a>   */
     PS_DICT_UNDERLINE_THICKNESS,    /* <a href="ft2-basic_types.html#FT_UShort">FT_UShort</a>  */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-user_allocation.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-user_allocation.html
index d58df11b15a..3868a39443f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-user_allocation.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 User allocation
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-version.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-version.html
index a8f2c4ce157..9136441b0cb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-version.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 FreeType Version
@@ -58,7 +58,7 @@ Defined in FT_FREETYPE_H (freetype/freetype.h).
 
 #define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MAJOR</a>  2
 #define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a>  4
-#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a>  8
+#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a>  9
 
 </pre></table><br>
 <table align=center width="87%"><tr><td>
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-winfnt_fonts.html b/Build/source/libs/freetype2/freetype-2.4.9/docs/reference/ft2-winfnt_fonts.html
index 983b7b111ec..3c72039f26d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/reference/ft2-winfnt_fonts.html
+++ b/Build/source/libs/freetype2/freetype-2.4.9/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.4.8 API Reference</title>
+<title>FreeType-2.4.9 API Reference</title>
 <style type="text/css">
   body { font-family: Verdana, Geneva, Arial, Helvetica, serif;
          color: #000000;
@@ -35,7 +35,7 @@
 <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td>
 <td width="100%"></td>
 <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table>
-<center><h1>FreeType-2.4.8 API Reference</h1></center>
+<center><h1>FreeType-2.4.9 API Reference</h1></center>
 
 <center><h1>
 Window FNT Files
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/docs/release b/Build/source/libs/freetype2/freetype-2.4.9/docs/release
index 5e2d51f880f..28a8235984f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/docs/release
+++ b/Build/source/libs/freetype2/freetype-2.4.9/docs/release
@@ -70,7 +70,7 @@ How to prepare a new release
 
     #!/bin/sh
 
-    VERSION=2.3.11
+    VERSION=2.4.8
     SAVANNAH_USER=wl
     SOURCEFORGE_USER=wlemb
 
@@ -149,10 +149,24 @@ How to prepare a new release
 
     # EOF
 
-. While files on savannah.gnu.org are automatically moved to the right
-  directory, it must be done manually on SourceForge.  Do that now.
+. Prepare a  README for SourceForge  and upload it  with the following
+  script (with updated `$VERSION' and $SOURCEFORGE_USER variables).
 
-. Update the FreeType release notes on SourceForge.
+    #!/bin/sh
+
+    VERSION=2.4.8
+    SOURCEFORGE_USER=wlemb
+
+    #####################################################################
+
+    rsync -avP -e ssh README \
+      $SOURCEFORGE_USER,freetype@frs.sf.net:/home/frs/project/f/fr/freetype/freetype2/$VERSION/
+
+    # EOF
+
+. On   SourceForge,   tag   the   just   uploaded   `ftXXXX.zip'   and
+  `freetype-XXX.tar.bz2'  files as the  default files to  download for
+  `Windows' and `Others', respectively.
 
 . Copy the reference files (generated by `make dist') to
 
@@ -182,7 +196,7 @@ How to prepare a new release
 
 ----------------------------------------------------------------------
 
-Copyright 2003, 2005, 2006, 2007, 2009 by
+Copyright 2003, 2005-2007, 2009, 2011 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.4.8/include/freetype/config/ftconfig.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftconfig.h
index a9e767cdbd9..56285694749 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftconfig.h
@@ -120,8 +120,7 @@ FT_BEGIN_HEADER
   /*   This is the only necessary change, so it is defined here instead    */
   /*   providing a new configuration file.                                 */
   /*                                                                       */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
-    ( defined( __MWERKS__ ) && defined( macintosh )        )
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
   /* no Carbon frameworks for 64bit 10.4.x */
   /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
   /* so guess the system version by maximum errno before inclusion */
@@ -131,9 +130,7 @@ FT_BEGIN_HEADER
 #endif
 #if defined( __LP64__ ) && \
     ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#define DARWIN_NO_CARBON 1
-#else
-#define FT_MACINTOSH 1
+#undef FT_MACINTOSH
 #endif
 
 #elif defined( __SC__ ) || defined( __MRC__ )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftheader.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftheader.h
index 2a7b8c4e0dd..2a7b8c4e0dd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftheader.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftheader.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftmodule.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftmodule.h
index 76d271a74b9..76d271a74b9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftoption.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftoption.h
index 041e24a31b5..041e24a31b5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftoption.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftstdlib.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftstdlib.h
index 11d5d0e65bc..11d5d0e65bc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/config/ftstdlib.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/config/ftstdlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/freetype.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/freetype.h
index f1f55f09b49..63c291af127 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/freetype.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/freetype.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType high-level API and common types (specification only).       */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -958,8 +958,8 @@ FT_BEGIN_HEADER
 
     FT_ListRec        sizes_list;
 
-    FT_Generic        autohint;
-    void*             extensions;
+    FT_Generic        autohint;   /* face-specific auto-hinter data */
+    void*             extensions; /* unused                         */
 
     FT_Face_Internal  internal;
 
@@ -1668,6 +1668,9 @@ FT_BEGIN_HEADER
   /*    use @FT_New_Library instead, followed by a call to                 */
   /*    @FT_Add_Default_Modules (or a series of calls to @FT_Add_Module).  */
   /*                                                                       */
+  /*    For multi-threading applications each thread should have its own   */
+  /*    FT_Library object.                                                 */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Init_FreeType( FT_Library  *alibrary );
 
@@ -1953,6 +1956,10 @@ FT_BEGIN_HEADER
   /*    Each new face object created with this function also owns a        */
   /*    default @FT_Size object, accessible as `face->size'.               */
   /*                                                                       */
+  /*    One @FT_Library instance can have multiple face objects, this is,  */
+  /*    @FT_Open_Face and its siblings can be called multiple times using  */
+  /*    the same `library' argument.                                       */
+  /*                                                                       */
   /*    See the discussion of reference counters in the description of     */
   /*    @FT_Reference_Face.                                                */
   /*                                                                       */
@@ -2445,6 +2452,11 @@ FT_BEGIN_HEADER
    *     during glyph loading.  This is mostly used to detect broken glyphs
    *     in fonts.  By default, FreeType tries to handle broken fonts also.
    *
+   *     In particular, errors from the TrueType bytecode engine are not
+   *     passed to the application if this flag is not set; this might
+   *     result in partially hinted or distorted glyphs in case a glyph's
+   *     bytecode is buggy.
+   *
    *   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
    *     Ignored.  Deprecated.
    *
@@ -2497,26 +2509,26 @@ FT_BEGIN_HEADER
    *
    */
 #define FT_LOAD_DEFAULT                      0x0
-#define FT_LOAD_NO_SCALE                     0x1
-#define FT_LOAD_NO_HINTING                   0x2
-#define FT_LOAD_RENDER                       0x4
-#define FT_LOAD_NO_BITMAP                    0x8
-#define FT_LOAD_VERTICAL_LAYOUT              0x10
-#define FT_LOAD_FORCE_AUTOHINT               0x20
-#define FT_LOAD_CROP_BITMAP                  0x40
-#define FT_LOAD_PEDANTIC                     0x80
-#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  0x200
-#define FT_LOAD_NO_RECURSE                   0x400
-#define FT_LOAD_IGNORE_TRANSFORM             0x800
-#define FT_LOAD_MONOCHROME                   0x1000
-#define FT_LOAD_LINEAR_DESIGN                0x2000
-#define FT_LOAD_NO_AUTOHINT                  0x8000U
+#define FT_LOAD_NO_SCALE                     ( 1L << 0 )
+#define FT_LOAD_NO_HINTING                   ( 1L << 1 )
+#define FT_LOAD_RENDER                       ( 1L << 2 )
+#define FT_LOAD_NO_BITMAP                    ( 1L << 3 )
+#define FT_LOAD_VERTICAL_LAYOUT              ( 1L << 4 )
+#define FT_LOAD_FORCE_AUTOHINT               ( 1L << 5 )
+#define FT_LOAD_CROP_BITMAP                  ( 1L << 6 )
+#define FT_LOAD_PEDANTIC                     ( 1L << 7 )
+#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  ( 1L << 9 )
+#define FT_LOAD_NO_RECURSE                   ( 1L << 10 )
+#define FT_LOAD_IGNORE_TRANSFORM             ( 1L << 11 )
+#define FT_LOAD_MONOCHROME                   ( 1L << 12 )
+#define FT_LOAD_LINEAR_DESIGN                ( 1L << 13 )
+#define FT_LOAD_NO_AUTOHINT                  ( 1L << 15 )
 
   /* */
 
   /* used internally only by certain font drivers! */
-#define FT_LOAD_ADVANCE_ONLY                 0x100
-#define FT_LOAD_SBITS_ONLY                   0x4000
+#define FT_LOAD_ADVANCE_ONLY                 ( 1L << 8 )
+#define FT_LOAD_SBITS_ONLY                   ( 1L << 14 )
 
 
   /**************************************************************************
@@ -2869,14 +2881,26 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    point_size :: The point size in 16.16 fractional points.           */
   /*                                                                       */
-  /*    degree     :: The degree of tightness.                             */
+  /*    degree     :: The degree of tightness.  Increasingly negative      */
+  /*                  values represent tighter track kerning, while        */
+  /*                  increasingly positive values represent looser track  */
+  /*                  kerning.  Value zero means no track kerning.         */
   /*                                                                       */
   /* <Output>                                                              */
-  /*    akerning   :: The kerning in 16.16 fractional points.              */
+  /*    akerning   :: The kerning in 16.16 fractional points, to be        */
+  /*                  uniformly applied between all glyphs.                */
   /*                                                                       */
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
   /*                                                                       */
+  /* <Note>                                                                */
+  /*    Currently, only the Type~1 font driver supports track kerning,     */
+  /*    using data from AFM files (if attached with @FT_Attach_File or     */
+  /*    @FT_Attach_Stream).                                                */
+  /*                                                                       */
+  /*    Only very few AFM files come with track kerning data; please refer */
+  /*    to the Adobe's AFM specification for more details.                 */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Get_Track_Kerning( FT_Face    face,
                         FT_Fixed   point_size,
@@ -3810,7 +3834,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  4
-#define FREETYPE_PATCH  8
+#define FREETYPE_PATCH  9
 
 
   /*************************************************************************/
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftadvanc.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftadvanc.h
index b2451bec426..b2451bec426 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftadvanc.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftadvanc.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbbox.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbbox.h
index 976691956f2..976691956f2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbbox.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbbox.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbdf.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbdf.h
index 4f8baf84017..4f8baf84017 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbitmap.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbitmap.h
index 92742369baa..92742369baa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbitmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbitmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbzip2.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbzip2.h
index 1bf81b15e89..1bf81b15e89 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftbzip2.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftbzip2.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftcache.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftcache.h
index 6af53062283..6af53062283 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftcache.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftcache.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftchapters.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftchapters.h
index 6cdf54e495b..6cdf54e495b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftchapters.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftchapters.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftcid.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftcid.h
index 203a30caf85..203a30caf85 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftcid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftcid.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fterrdef.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fterrdef.h
index d4e7287f2e1..fb4b53bca07 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fterrdef.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fterrdef.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType error codes (specification).                                */
 /*                                                                         */
-/*  Copyright 2002, 2004, 2006, 2007, 2010 by                              */
+/*  Copyright 2002, 2004, 2006, 2007, 2010-2011 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -54,6 +54,8 @@
                 "broken offset within table" )
   FT_ERRORDEF_( Array_Too_Large,                             0x0A, \
                 "array allocation size too large" )
+  FT_ERRORDEF_( Missing_Module,                              0x0B, \
+                "missing module" )
 
   /* glyph/character errors */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fterrors.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fterrors.h
index 6600dadd0df..a54699f87f2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fterrors.h
@@ -192,12 +192,13 @@
 #undef FT_NOERRORDEF_
 
 #undef FT_NEED_EXTERN_C
-#undef FT_ERR_CONCAT
 #undef FT_ERR_BASE
 
   /* FT_KEEP_ERR_PREFIX is needed for ftvalid.h */
 #ifndef FT_KEEP_ERR_PREFIX
 #undef FT_ERR_PREFIX
+#else
+#undef FT_KEEP_ERR_PREFIX
 #endif
 
 #endif /* __FTERRORS_H__ */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgasp.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgasp.h
index 5e978e5c14c..453d4fa42c9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgasp.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgasp.h
@@ -62,12 +62,12 @@
    *     It is up to the client to decide what to do.
    *
    *   FT_GASP_DO_GRIDFIT ::
-   *     Grid-fitting and hinting should be performed at the specified ppem. 
+   *     Grid-fitting and hinting should be performed at the specified ppem.
    *     This *really* means TrueType bytecode interpretation.  If this bit
    *     is not set, no hinting gets applied.
    *
    *   FT_GASP_DO_GRAY ::
-   *     Anti-aliased rendering should be performed at the specified ppem. 
+   *     Anti-aliased rendering should be performed at the specified ppem.
    *     If not set, do monochrome rendering.
    *
    *   FT_GASP_SYMMETRIC_SMOOTHING ::
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftglyph.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftglyph.h
index 3de69f7aedd..3de69f7aedd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftglyph.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgxval.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgxval.h
index 497015c1011..497015c1011 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgxval.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgzip.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgzip.h
index acbc4f0327b..acbc4f0327b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftgzip.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftgzip.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftimage.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftimage.h
index 04b5e04f7bb..04b5e04f7bb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftimage.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftimage.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftincrem.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftincrem.h
index aaf689ff16c..aaf689ff16c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftincrem.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftincrem.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlcdfil.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlcdfil.h
index 0b55ebee65c..0b55ebee65c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlcdfil.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlcdfil.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlist.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlist.h
index bb6f7f119d3..bb6f7f119d3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlist.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlist.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlzw.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlzw.h
index 00d40169a75..00d40169a75 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftlzw.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftlzw.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmac.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmac.h
index ab5bab5170c..ab5bab5170c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmac.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmac.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmm.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmm.h
index 3aefb9e4f25..3aefb9e4f25 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmm.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmm.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmodapi.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmodapi.h
index 8f2e0179475..8f2e0179475 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmodapi.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmodapi.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmoderr.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmoderr.h
index 1bf3b384abe..1bf3b384abe 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftmoderr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftmoderr.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftotval.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftotval.h
index 027f2e88657..027f2e88657 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftotval.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftotval.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftoutln.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftoutln.h
index 1cf3c3f8009..1cf3c3f8009 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftoutln.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftoutln.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftpfr.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftpfr.h
index 0b7b7d427c9..0b7b7d427c9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftrender.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftrender.h
index dd0229b815e..dd0229b815e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftrender.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftrender.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsizes.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsizes.h
index 3e548cc39f3..3e548cc39f3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsizes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsizes.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsnames.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsnames.h
index 485e4e162e7..485e4e162e7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsnames.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsnames.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftstroke.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftstroke.h
index dbda6d23dea..49ae2bc0614 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftstroke.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftstroke.h
@@ -85,25 +85,25 @@ FT_BEGIN_HEADER
    *     miter limit is exceeded.  The outer edges of the strokes
    *     for the two segments are extended until they meet at an
    *     angle.  If the segments meet at too sharp an angle (such
-   *     that the miter would extend from the intersection of the 
-   *     segments a distance greater than the product of the miter 
-   *     limit value and the border radius), then a bevel join (see 
-   *     above) is used instead.  This prevents long spikes being 
-   *     created.  FT_STROKER_LINEJOIN_MITER_FIXED generates a miter 
+   *     that the miter would extend from the intersection of the
+   *     segments a distance greater than the product of the miter
+   *     limit value and the border radius), then a bevel join (see
+   *     above) is used instead.  This prevents long spikes being
+   *     created.  FT_STROKER_LINEJOIN_MITER_FIXED generates a miter
    *     line join as used in PostScript and PDF.
    *
    *   FT_STROKER_LINEJOIN_MITER_VARIABLE ::
    *   FT_STROKER_LINEJOIN_MITER ::
    *     Used to render mitered line joins, with variable bevels if
-   *     the miter limit is exceeded.  The intersection of the 
-   *     strokes is clipped at a line perpendicular to the bisector 
-   *     of the angle between the strokes, at the distance from the 
-   *     intersection of the segments equal to the product of the 
-   *     miter limit value and the border radius.  This prevents 
-   *     long spikes being created.  
-   *     FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line 
-   *     join as used in XPS.  FT_STROKER_LINEJOIN_MITER is an alias 
-   *     for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for 
+   *     the miter limit is exceeded.  The intersection of the
+   *     strokes is clipped at a line perpendicular to the bisector
+   *     of the angle between the strokes, at the distance from the
+   *     intersection of the segments equal to the product of the
+   *     miter limit value and the border radius.  This prevents
+   *     long spikes being created.
+   *     FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line
+   *     join as used in XPS.  FT_STROKER_LINEJOIN_MITER is an alias
+   *     for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for
    *     backwards compatibility.
    */
   typedef enum  FT_Stroker_LineJoin_
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsynth.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsynth.h
index a068b7928d6..a068b7928d6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsynth.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsynth.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsystem.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsystem.h
index e07460c55d4..e07460c55d4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftsystem.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftsystem.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fttrigon.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fttrigon.h
index 6b77d2ee54c..6b77d2ee54c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fttrigon.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fttrigon.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fttypes.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fttypes.h
index a57ffa69bd8..32555274497 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/fttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/fttypes.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType simple types definitions (specification only).              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2006, 2007, 2008 by                   */
+/*  Copyright 1996-2002, 2004, 2006-2009, 2012 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -434,7 +434,7 @@ FT_BEGIN_HEADER
   /*    variety of FreeType core objects.  For example, a text layout API  */
   /*    might want to associate a glyph cache to a given size object.      */
   /*                                                                       */
-  /*    Most FreeType object contains a `generic' field, of type           */
+  /*    Some FreeType object contains a `generic' field, of type           */
   /*    FT_Generic, which usage is left to client applications and font    */
   /*    servers.                                                           */
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftwinfnt.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftwinfnt.h
index ea33353536e..ea33353536e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftwinfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftxf86.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftxf86.h
index 8c68afdcc58..8c68afdcc58 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ftxf86.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ftxf86.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/autohint.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/autohint.h
index 7e3a08a0511..231bdd4a5bf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/autohint.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/autohint.h
@@ -206,7 +206,7 @@ FT_BEGIN_HEADER
     reset_face_, get_global_hints_, done_global_hints_, load_glyph_          \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \
                                      done_global_hints_, load_glyph_)        \
@@ -219,9 +219,9 @@ FT_BEGIN_HEADER
     clazz->get_global_hints = get_global_hints_;                             \
     clazz->done_global_hints = done_global_hints_;                           \
     clazz->load_glyph = load_glyph_;                                         \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
 FT_END_HEADER
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftcalc.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftcalc.h
index f8b4324777e..f8b4324777e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftcalc.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftcalc.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftdebug.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftdebug.h
index 7baae3531d5..7baae3531d5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftdebug.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftdebug.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftdriver.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftdriver.h
index 1d06997bd18..6f6b2062279 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftdriver.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType font driver interface (specification).                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2006, 2008 by                         */
+/*  Copyright 1996-2003, 2006, 2008, 2011 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -162,10 +162,9 @@ FT_BEGIN_HEADER
   /*                        starting at `first'.  The `vertical' flag must */
   /*                        be set to get vertical advance heights.  The   */
   /*                        `advances' buffer is caller-allocated.         */
-  /*                        Currently not implemented.  The idea of this   */
-  /*                        function is to be able to perform              */
-  /*                        device-independent text layout without loading */
-  /*                        a single glyph image.                          */
+  /*                        The idea of this function is to be able to     */
+  /*                        perform device-independent text layout without */
+  /*                        loading a single glyph image.                  */
   /*                                                                       */
   /*    request_size     :: A handle to a function used to request the new */
   /*                        character size.  Can be set to 0 if the        */
@@ -268,7 +267,9 @@ FT_BEGIN_HEADER
   /*    and initialize any additional global data, like module specific    */
   /*    interface, and put them in the global pic container defined in     */
   /*    ftpic.h. if you don't need them just implement the functions as    */
-  /*    empty to resolve the link error.                                   */
+  /*    empty to resolve the link error.  Also the pic_init and pic_free   */
+  /*    functions should be declared in pic.h, to be referred by driver    */
+  /*    definition calling FT_DEFINE_DRIVER() in following.                */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
   /*    allocated in the global scope (or the scope where the macro        */
@@ -285,7 +286,7 @@ FT_BEGIN_HEADER
 
 #define FT_DECLARE_DRIVER(class_)    \
   FT_CALLBACK_TABLE                  \
-  const FT_Driver_ClassRec  class_;  
+  const FT_Driver_ClassRec  class_;
 
 #define FT_DEFINE_DRIVER(class_,                                             \
                          flags_, size_, name_, version_, requires_,          \
@@ -327,7 +328,7 @@ FT_BEGIN_HEADER
     select_size_                                                             \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \
@@ -348,8 +349,6 @@ FT_BEGIN_HEADER
                          old_set_char_sizes_, old_set_pixel_sizes_,          \
                          load_glyph_, get_kerning_, attach_file_,            \
                          get_advances_, request_size_, select_size_ )        \
-  void class_##_pic_free( FT_Library library );                              \
-  FT_Error class_##_pic_init( FT_Library library );                          \
                                                                              \
   void                                                                       \
   FT_Destroy_Class_##class_( FT_Library        library,                      \
@@ -409,7 +408,7 @@ FT_BEGIN_HEADER
                                                                              \
     *output_class = (FT_Module_Class*)clazz;                                 \
     return FT_Err_Ok;                                                        \
-  }                
+  }
 
 
 #endif /* FT_CONFIG_OPTION_PIC */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftgloadr.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftgloadr.h
index ce4dc6c9cc6..ce4dc6c9cc6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftgloadr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftgloadr.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftmemory.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftmemory.h
index 026aa63eaa9..026aa63eaa9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftmemory.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftmemory.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftobjs.h
index 670eb78a845..fc1827541df 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by       */
+/*  Copyright 1996-2006, 2008, 2010, 2012 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -243,7 +243,7 @@ FT_BEGIN_HEADER
     clazz->variant_list = variant_list_;                                     \
     clazz->charvariant_list = charvariant_list_;                             \
     clazz->variantchar_list = variantchar_list_;                             \
-  } 
+  }
 #endif /* FT_CONFIG_OPTION_PIC */
 
   /* create a new charmap and add it to charmap->face */
@@ -436,19 +436,16 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    memory  :: A handle to the memory manager.                         */
   /*                                                                       */
-  /*    generic :: A generic structure for user-level extensibility (?).   */
-  /*                                                                       */
   typedef struct  FT_ModuleRec_
   {
     FT_Module_Class*  clazz;
     FT_Library        library;
     FT_Memory         memory;
-    FT_Generic        generic;
 
   } FT_ModuleRec;
 
 
-  /* typecast an object to a FT_Module */
+  /* typecast an object to an FT_Module */
 #define FT_MODULE( x )          ((FT_Module)( x ))
 #define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
 #define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
@@ -711,10 +708,6 @@ FT_BEGIN_HEADER
   /*     faces_list   :: The list of faces currently opened by this        */
   /*                     driver.                                           */
   /*                                                                       */
-  /*     extensions   :: A typeless pointer to the driver's extensions     */
-  /*                     registry, if they are supported through the       */
-  /*                     configuration macro FT_CONFIG_OPTION_EXTENSIONS.  */
-  /*                                                                       */
   /*     glyph_loader :: The glyph loader for all faces managed by this    */
   /*                     driver.  This object isn't defined for unscalable */
   /*                     formats.                                          */
@@ -723,10 +716,7 @@ FT_BEGIN_HEADER
   {
     FT_ModuleRec     root;
     FT_Driver_Class  clazz;
-
     FT_ListRec       faces_list;
-    void*            extensions;
-
     FT_GlyphLoader   glyph_loader;
 
   } FT_DriverRec;
@@ -776,9 +766,6 @@ FT_BEGIN_HEADER
   /*    memory           :: The library's memory object.  Manages memory   */
   /*                        allocation.                                    */
   /*                                                                       */
-  /*    generic          :: Client data variable.  Used to extend the      */
-  /*                        Library class by higher levels and clients.    */
-  /*                                                                       */
   /*    version_major    :: The major version number of the library.       */
   /*                                                                       */
   /*    version_minor    :: The minor version number of the library.       */
@@ -838,8 +825,6 @@ FT_BEGIN_HEADER
   {
     FT_Memory          memory;           /* library's memory manager */
 
-    FT_Generic         generic;
-
     FT_Int             version_major;
     FT_Int             version_minor;
     FT_Int             version_patch;
@@ -976,7 +961,7 @@ FT_BEGIN_HEADER
     move_to_, line_to_, conic_to_, cubic_to_, shift_, delta_                 \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_,       \
                                 cubic_to_, shift_, delta_)                   \
@@ -990,9 +975,9 @@ FT_BEGIN_HEADER
     clazz->shift = shift_;                                                   \
     clazz->delta = delta_;                                                   \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*                                                                       */
@@ -1018,7 +1003,7 @@ FT_BEGIN_HEADER
     raster_set_mode_, raster_render_, raster_done_                           \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_,           \
     raster_reset_, raster_set_mode_, raster_render_, raster_done_)           \
@@ -1031,9 +1016,9 @@ FT_BEGIN_HEADER
     clazz->raster_set_mode = raster_set_mode_;                               \
     clazz->raster_render = raster_render_;                                   \
     clazz->raster_done = raster_done_;                                       \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*************************************************************************/
@@ -1072,7 +1057,7 @@ FT_BEGIN_HEADER
     size_, format_, init_, done_, copy_, transform_, bbox_, prepare_         \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_,         \
                         transform_, bbox_, prepare_)                         \
@@ -1087,9 +1072,9 @@ FT_BEGIN_HEADER
     clazz->glyph_transform = transform_;                                     \
     clazz->glyph_bbox = bbox_;                                               \
     clazz->glyph_prepare = prepare_;                                         \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*                                                                       */
@@ -1119,7 +1104,9 @@ FT_BEGIN_HEADER
   /*    and initialize any additional global data, like module specific    */
   /*    interface, and put them in the global pic container defined in     */
   /*    ftpic.h. if you don't need them just implement the functions as    */
-  /*    empty to resolve the link error.                                   */
+  /*    empty to resolve the link error.  Also the pic_init and pic_free   */
+  /*    functions should be declared in pic.h, to be referred by renderer  */
+  /*    definition calling FT_DEFINE_RENDERER() in following.              */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
   /*    allocated in the global scope (or the scope where the macro        */
@@ -1150,7 +1137,7 @@ FT_BEGIN_HEADER
     raster_class_                                                            \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DECLARE_RENDERER(class_)  FT_DECLARE_MODULE(class_)
 
@@ -1159,8 +1146,6 @@ FT_BEGIN_HEADER
                            interface_, init_, done_, get_interface_,         \
                            glyph_format_, render_glyph_, transform_glyph_,   \
                            get_glyph_cbox_, set_mode_, raster_class_ )       \
-  void class_##_pic_free( FT_Library library );                              \
-  FT_Error class_##_pic_init( FT_Library library );                          \
                                                                              \
   void                                                                       \
   FT_Destroy_Class_##class_( FT_Library        library,                      \
@@ -1205,11 +1190,11 @@ FT_BEGIN_HEADER
                                                                              \
     *output_class = (FT_Module_Class*)clazz;                                 \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
 
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*************************************************************************/
@@ -1290,7 +1275,9 @@ FT_BEGIN_HEADER
   /*    and initialize any additional global data, like module specific    */
   /*    interface, and put them in the global pic container defined in     */
   /*    ftpic.h. if you don't need them just implement the functions as    */
-  /*    empty to resolve the link error.                                   */
+  /*    empty to resolve the link error.  Also the pic_init and pic_free   */
+  /*    functions should be declared in pic.h, to be referred by module    */
+  /*    definition calling FT_DEFINE_MODULE() in following.                */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
   /*    allocated in the global scope (or the scope where the macro        */
@@ -1367,12 +1354,10 @@ FT_BEGIN_HEADER
                                                                              \
     clazz->root.module_init        = init_;                                  \
     clazz->root.module_done        = done_;                                  \
-    clazz->root.get_interface      = get_interface_;               
+    clazz->root.get_interface      = get_interface_;
 
 #define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_,  \
                          interface_, init_, done_, get_interface_)           \
-  void class_##_pic_free( FT_Library library );                              \
-  FT_Error class_##_pic_init( FT_Library library );                          \
                                                                              \
   void                                                                       \
   FT_Destroy_Class_##class_( FT_Library library,                             \
@@ -1415,7 +1400,7 @@ FT_BEGIN_HEADER
                                                                              \
     *output_class = clazz;                                                   \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftpic.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftpic.h
index 1b31957d702..5b674e6a531 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftpic.h
@@ -26,7 +26,7 @@
 #ifndef __FTPIC_H__
 #define __FTPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
@@ -36,14 +36,14 @@ FT_BEGIN_HEADER
     /* pic containers for base */
     void* base;
     /* pic containers for modules */
-    void* autofit;   
-    void* cff;    
-    void* pshinter;    
-    void* psnames;    
-    void* raster;     
-    void* sfnt;     
-    void* smooth;     
-    void* truetype;     
+    void* autofit;
+    void* cff;
+    void* pshinter;
+    void* psnames;
+    void* raster;
+    void* sfnt;
+    void* smooth;
+    void* truetype;
   } FT_PIC_Container;
 
   /* Initialize the various function tables, structs, etc. stored in the container. */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftrfork.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftrfork.h
index aa573c87054..77e10206a35 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftrfork.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftrfork.h
@@ -48,6 +48,57 @@ FT_BEGIN_HEADER
 
   } FT_RFork_Ref;
 
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+  typedef FT_Error
+  (*ft_raccess_guess_func)( FT_Library  library,
+                            FT_Stream   stream,
+                            char       *base_file_name,
+                            char      **result_file_name,
+                            FT_Long    *result_offset );
+
+  typedef enum  FT_RFork_Rule_ {
+    FT_RFork_Rule_invalid = -2,
+    FT_RFork_Rule_uknown, /* -1 */
+    FT_RFork_Rule_apple_double,
+    FT_RFork_Rule_apple_single,
+    FT_RFork_Rule_darwin_ufs_export,
+    FT_RFork_Rule_darwin_newvfs,
+    FT_RFork_Rule_darwin_hfsplus,
+    FT_RFork_Rule_vfat,
+    FT_RFork_Rule_linux_cap,
+    FT_RFork_Rule_linux_double,
+    FT_RFork_Rule_linux_netatalk
+  } FT_RFork_Rule;
+
+  /* For fast translation between rule index and rule type,
+   * the macros FT_RFORK_xxx should be kept consistent with
+   * the raccess_guess_funcs table
+   */
+  typedef struct ft_raccess_guess_rec_ {
+    ft_raccess_guess_func  func;
+    FT_RFork_Rule          type;
+  } ft_raccess_guess_rec;
+
+#ifndef FT_CONFIG_OPTION_PIC
+  /* this array is a storage in non-PIC mode, so ; is needed in END */
+#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
+        const type name[] = {
+#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
+        { raccess_guess_##func_suffix, FT_RFork_Rule_##type_suffix },
+#define CONST_FT_RFORK_RULE_ARRAY_END };
+#else /* FT_CONFIG_OPTION_PIC */
+  /* this array is a function in PIC mode, so no ; is needed in END */
+#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
+        void FT_Init_##name ( type* storage ) {       \
+          type *local = storage;                      \
+          int i = 0;
+#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
+        local[i].func = raccess_guess_##func_suffix;                \
+        local[i].type = FT_RFork_Rule_##type_suffix;                \
+        i++;
+#define CONST_FT_RFORK_RULE_ARRAY_END }
+#endif /* FT_CONFIG_OPTION_PIC */
+#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
 
   /*************************************************************************/
   /*                                                                       */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftserv.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftserv.h
index 569b9f7e0e8..4f481db02de 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftserv.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftserv.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType services (specification only).                          */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
+/*  Copyright 2003-2007, 2009, 2012 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -163,298 +163,366 @@ FT_BEGIN_HEADER
 
   typedef const FT_ServiceDescRec*  FT_ServiceDesc;
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Macro>                                                               */
   /*    FT_DEFINE_SERVICEDESCREC1 .. FT_DEFINE_SERVICEDESCREC6             */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Used to initialize an array of FT_ServiceDescRec structs.          */
+  /*    Used to initialize an array of FT_ServiceDescRec structures.       */
   /*                                                                       */
-  /*    When FT_CONFIG_OPTION_PIC is defined a Create funtion will need    */
-  /*    to called with a pointer where the allocated array is returned.    */
-  /*    And when it is no longer needed a Destroy function needs           */
-  /*    to be called to release that allocation.                           */
+  /*    When FT_CONFIG_OPTION_PIC is defined a `create' function needs to  */
+  /*    be called with a pointer to return an allocated array.  As soon as */
+  /*    it is no longer needed, a `destroy' function needs to be called to */
+  /*    release that allocation.                                           */
   /*                                                                       */
-  /*    These functions should be manyally called from the pic_init and    */
-  /*    pic_free functions of your module (see FT_DEFINE_MODULE)           */
+  /*    These functions should be manually called from the `pic_init' and  */
+  /*    `pic_free' functions of your module (see FT_DEFINE_MODULE).        */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is not defined the array will be         */
-  /*    allocated in the global scope (or the scope where the macro        */
-  /*    is used).                                                          */
+  /*    allocated in the global scope (or the scope where the macro is     */
+  /*    used).                                                             */
   /*                                                                       */
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1)            \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {NULL, NULL}                                                               \
+#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
+                                   serv_id_1, serv_data_1 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { NULL, NULL }                                                          \
   };
-#define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2)                                              \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {serv_id_2, serv_data_2},                                                  \
-  {NULL, NULL}                                                               \
+
+#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { NULL, NULL }                                                          \
   };
-#define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3)                      \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {serv_id_2, serv_data_2},                                                  \
-  {serv_id_3, serv_data_3},                                                  \
-  {NULL, NULL}                                                               \
+
+#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { NULL, NULL }                                                          \
   };
-#define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3,                      \
-        serv_id_4, serv_data_4)                                              \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {serv_id_2, serv_data_2},                                                  \
-  {serv_id_3, serv_data_3},                                                  \
-  {serv_id_4, serv_data_4},                                                  \
-  {NULL, NULL}                                                               \
+
+#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { NULL, NULL }                                                          \
   };
-#define FT_DEFINE_SERVICEDESCREC5(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3,                      \
-        serv_id_4, serv_data_4, serv_id_5, serv_data_5)                      \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {serv_id_2, serv_data_2},                                                  \
-  {serv_id_3, serv_data_3},                                                  \
-  {serv_id_4, serv_data_4},                                                  \
-  {serv_id_5, serv_data_5},                                                  \
-  {NULL, NULL}                                                               \
+
+#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { NULL, NULL }                                                          \
   };
-#define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3,                      \
-        serv_id_4, serv_data_4, serv_id_5, serv_data_5,                      \
-        serv_id_6, serv_data_6)                                              \
-  static const FT_ServiceDescRec class_[] =                                  \
-  {                                                                          \
-  {serv_id_1, serv_data_1},                                                  \
-  {serv_id_2, serv_data_2},                                                  \
-  {serv_id_3, serv_data_3},                                                  \
-  {serv_id_4, serv_data_4},                                                  \
-  {serv_id_5, serv_data_5},                                                  \
-  {serv_id_6, serv_data_6},                                                  \
-  {NULL, NULL}                                                               \
+
+#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6 )                 \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { serv_id_6, serv_data_6 },                                             \
+    { NULL, NULL }                                                          \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
-
-#define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1)            \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*2 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = NULL;                                                 \
-    clazz[1].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-
-#define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2)                                              \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*3 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = serv_id_2;                                            \
-    clazz[1].serv_data = serv_data_2;                                        \
-    clazz[2].serv_id = NULL;                                                 \
-    clazz[2].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-
-#define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3)                      \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*4 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = serv_id_2;                                            \
-    clazz[1].serv_data = serv_data_2;                                        \
-    clazz[2].serv_id = serv_id_3;                                            \
-    clazz[2].serv_data = serv_data_3;                                        \
-    clazz[3].serv_id = NULL;                                                 \
-    clazz[3].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-
-#define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3,                      \
-        serv_id_4, serv_data_4)                                              \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*5 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = serv_id_2;                                            \
-    clazz[1].serv_data = serv_data_2;                                        \
-    clazz[2].serv_id = serv_id_3;                                            \
-    clazz[2].serv_data = serv_data_3;                                        \
-    clazz[3].serv_id = serv_id_4;                                            \
-    clazz[3].serv_data = serv_data_4;                                        \
-    clazz[4].serv_id = NULL;                                                 \
-    clazz[4].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-
-#define FT_DEFINE_SERVICEDESCREC5(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3, serv_id_4,           \
-        serv_data_4, serv_id_5, serv_data_5)                                 \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*6 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = serv_id_2;                                            \
-    clazz[1].serv_data = serv_data_2;                                        \
-    clazz[2].serv_id = serv_id_3;                                            \
-    clazz[2].serv_data = serv_data_3;                                        \
-    clazz[3].serv_id = serv_id_4;                                            \
-    clazz[3].serv_data = serv_data_4;                                        \
-    clazz[4].serv_id = serv_id_5;                                            \
-    clazz[4].serv_data = serv_data_5;                                        \
-    clazz[5].serv_id = NULL;                                                 \
-    clazz[5].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-
-#define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1,            \
-        serv_id_2, serv_data_2, serv_id_3, serv_data_3,                      \
-        serv_id_4, serv_data_4, serv_id_5, serv_data_5,                      \
-        serv_id_6, serv_data_6)                                              \
-  void                                                                       \
-  FT_Destroy_Class_##class_( FT_Library library,                             \
-                             FT_ServiceDescRec* clazz )                      \
-  {                                                                          \
-    FT_Memory memory = library->memory;                                      \
-    if ( clazz )                                                             \
-      FT_FREE( clazz );                                                      \
-  }                                                                          \
-                                                                             \
-  FT_Error                                                                   \
-  FT_Create_Class_##class_( FT_Library library,                              \
-                            FT_ServiceDescRec** output_class)                \
-  {                                                                          \
-    FT_ServiceDescRec*  clazz;                                               \
-    FT_Error          error;                                                 \
-    FT_Memory memory = library->memory;                                      \
-                                                                             \
-    if ( FT_ALLOC( clazz, sizeof(*clazz)*7 ) )                               \
-      return error;                                                          \
-    clazz[0].serv_id = serv_id_1;                                            \
-    clazz[0].serv_data = serv_data_1;                                        \
-    clazz[1].serv_id = serv_id_2;                                            \
-    clazz[1].serv_data = serv_data_2;                                        \
-    clazz[2].serv_id = serv_id_3;                                            \
-    clazz[2].serv_data = serv_data_3;                                        \
-    clazz[3].serv_id = serv_id_4;                                            \
-    clazz[3].serv_data = serv_data_4;                                        \
-    clazz[4].serv_id = serv_id_5;                                            \
-    clazz[4].serv_data = serv_data_5;                                        \
-    clazz[5].serv_id = serv_id_6;                                            \
-    clazz[5].serv_data = serv_data_6;                                        \
-    clazz[6].serv_id = NULL;                                                 \
-    clazz[6].serv_data = NULL;                                               \
-    *output_class = clazz;                                                   \
-    return FT_Err_Ok;                                                        \
-  } 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICEDESCREC1( class_,                                  \
+                                   serv_id_1, serv_data_1 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 2 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = NULL;                                              \
+    clazz[1].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC2( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 3 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = NULL;                                              \
+    clazz[2].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC3( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 4 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = NULL;                                              \
+    clazz[3].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC4( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 5 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = NULL;                                              \
+    clazz[4].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC5( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class )           \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 6 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = serv_id_5;                                         \
+    clazz[4].serv_data = serv_data_5;                                       \
+    clazz[5].serv_id   = NULL;                                              \
+    clazz[5].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#define FT_DEFINE_SERVICEDESCREC6( class_,                                  \
+                                   serv_id_1, serv_data_1,                  \
+                                   serv_id_2, serv_data_2,                  \
+                                   serv_id_3, serv_data_3,                  \
+                                   serv_id_4, serv_data_4,                  \
+                                   serv_id_5, serv_data_5,                  \
+                                   serv_id_6, serv_data_6 )                 \
+  void                                                                      \
+  FT_Destroy_Class_ ## class_( FT_Library          library,                 \
+                               FT_ServiceDescRec*  clazz )                  \
+  {                                                                         \
+    FT_Memory  memory = library->memory;                                    \
+                                                                            \
+                                                                            \
+    if ( clazz )                                                            \
+      FT_FREE( clazz );                                                     \
+  }                                                                         \
+                                                                            \
+  FT_Error                                                                  \
+  FT_Create_Class_ ## class_( FT_Library           library,                 \
+                              FT_ServiceDescRec**  output_class)            \
+  {                                                                         \
+    FT_ServiceDescRec*  clazz;                                              \
+    FT_Error            error;                                              \
+    FT_Memory           memory = library->memory;                           \
+                                                                            \
+                                                                            \
+    if ( FT_ALLOC( clazz, sizeof ( *clazz ) * 7 ) )                         \
+      return error;                                                         \
+                                                                            \
+    clazz[0].serv_id   = serv_id_1;                                         \
+    clazz[0].serv_data = serv_data_1;                                       \
+    clazz[1].serv_id   = serv_id_2;                                         \
+    clazz[1].serv_data = serv_data_2;                                       \
+    clazz[2].serv_id   = serv_id_3;                                         \
+    clazz[2].serv_data = serv_data_3;                                       \
+    clazz[3].serv_id   = serv_id_4;                                         \
+    clazz[3].serv_data = serv_data_4;                                       \
+    clazz[4].serv_id   = serv_id_5;                                         \
+    clazz[4].serv_data = serv_data_5;                                       \
+    clazz[5].serv_id   = serv_id_6;                                         \
+    clazz[5].serv_data = serv_data_6;                                       \
+    clazz[6].serv_id   = NULL;                                              \
+    clazz[6].serv_data = NULL;                                              \
+                                                                            \
+    *output_class = clazz;                                                  \
+                                                                            \
+    return FT_Err_Ok;                                                       \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
 
   /*
    *  Parse a list of FT_ServiceDescRec descriptors and look for
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftstream.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftstream.h
index 8b185005f53..8b185005f53 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftstream.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftstream.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/fttrace.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/fttrace.h
index fbefdbdf491..fbefdbdf491 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/fttrace.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/fttrace.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftvalid.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftvalid.h
index 00cd85e7bb6..00cd85e7bb6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/ftvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/ftvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/internal.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/internal.h
index f500a651c27..f500a651c27 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/internal.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/internal.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/psaux.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/psaux.h
index a96e0dfa865..a96e0dfa865 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/psaux.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/psaux.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/pshints.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/pshints.h
index 0c357651be4..5b7b6984c43 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/pshints.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/pshints.h
@@ -688,7 +688,7 @@ FT_BEGIN_HEADER
     get_globals_funcs_, get_t1_funcs_, get_t2_funcs_                         \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_,             \
                                      get_t1_funcs_, get_t2_funcs_)           \
@@ -700,9 +700,9 @@ FT_BEGIN_HEADER
     clazz->get_globals_funcs = get_globals_funcs_;                           \
     clazz->get_t1_funcs = get_t1_funcs_;                                     \
     clazz->get_t2_funcs = get_t2_funcs_;                                     \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
 FT_END_HEADER
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svbdf.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svbdf.h
index 9264239146b..0974752a797 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svbdf.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType BDF services (specification).                           */
 /*                                                                         */
-/*  Copyright 2003 by                                                      */
+/*  Copyright 2003, 2009, 2012 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -45,25 +45,30 @@ FT_BEGIN_HEADER
     FT_BDF_GetPropertyFunc   get_property;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \
-  static const FT_Service_BDFRec class_ =                                \
+#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
+                                  get_charset_id_,                       \
+                                  get_property_ )                        \
+  static const FT_Service_BDFRec  class_ =                               \
   {                                                                      \
     get_charset_id_, get_property_                                       \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \
+#define FT_DEFINE_SERVICE_BDFRec( class_,                                \
+                                  get_charset_id_,                       \
+                                  get_property_ )                        \
   void                                                                   \
-  FT_Init_Class_##class_( FT_Service_BDFRec*  clazz )                    \
+  FT_Init_Class_ ## class_( FT_Service_BDFRec*  clazz )                  \
   {                                                                      \
     clazz->get_charset_id = get_charset_id_;                             \
-    clazz->get_property = get_property_;                                 \
-  } 
+    clazz->get_property   = get_property_;                               \
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svcid.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svcid.h
index 9b874b5e725..6be3f9374da 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svcid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svcid.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType CID font services (specification).                      */
 /*                                                                         */
-/*  Copyright 2007, 2009 by Derek Clegg, Michael Toftdal.                  */
+/*  Copyright 2007, 2009, 2012 by Derek Clegg, Michael Toftdal.            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -46,30 +46,36 @@ FT_BEGIN_HEADER
     FT_CID_GetCIDFromGlyphIndexFunc           get_cid_from_glyph_index;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_,                           \
-        get_is_cid_, get_cid_from_glyph_index_ )                             \
-  static const FT_Service_CIDRec class_ =                                    \
-  {                                                                          \
-    get_ros_, get_is_cid_, get_cid_from_glyph_index_                         \
+#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
+                                  get_ros_,                                 \
+                                  get_is_cid_,                              \
+                                  get_cid_from_glyph_index_ )               \
+  static const FT_Service_CIDRec class_ =                                   \
+  {                                                                         \
+    get_ros_, get_is_cid_, get_cid_from_glyph_index_                        \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
-
-#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_,                           \
-        get_is_cid_, get_cid_from_glyph_index_ )                             \
-  void                                                                       \
-  FT_Init_Class_##class_( FT_Library library,                                \
-                          FT_Service_CIDRec* clazz)                          \
-  {                                                                          \
-    FT_UNUSED(library);                                                      \
-    clazz->get_ros = get_ros_;                                               \
-    clazz->get_is_cid = get_is_cid_;                                         \
-    clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_;             \
-  } 
-
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_CIDREC( class_,                                   \
+                                  get_ros_,                                 \
+                                  get_is_cid_,                              \
+                                  get_cid_from_glyph_index_ )               \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Library          library,                    \
+                            FT_Service_CIDRec*  clazz )                     \
+  {                                                                         \
+    FT_UNUSED( library );                                                   \
+                                                                            \
+    clazz->get_ros                  = get_ros_;                             \
+    clazz->get_is_cid               = get_is_cid_;                          \
+    clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_;            \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svgldict.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svgldict.h
index d66a41d5ae3..1d125347253 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svgldict.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svgldict.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph dictionary services (specification).              */
 /*                                                                         */
-/*  Copyright 2003 by                                                      */
+/*  Copyright 2003, 2009, 2012 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -51,27 +51,33 @@ FT_BEGIN_HEADER
     FT_GlyphDict_NameIndexFunc  name_index;  /* optional */
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \
-  static const FT_Service_GlyphDictRec class_ =                        \
+#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
+                                        get_name_,                     \
+                                        name_index_)                   \
+  static const FT_Service_GlyphDictRec  class_ =                       \
   {                                                                    \
     get_name_, name_index_                                             \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \
+#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_,                        \
+                                        get_name_,                     \
+                                        name_index_)                   \
   void                                                                 \
-  FT_Init_Class_##class_( FT_Library library,                          \
-                          FT_Service_GlyphDictRec* clazz)              \
+  FT_Init_Class_ ## class_( FT_Library                library,         \
+                            FT_Service_GlyphDictRec*  clazz )          \
   {                                                                    \
-    FT_UNUSED(library);                                                \
-    clazz->get_name = get_name_;                                       \
+    FT_UNUSED( library );                                              \
+                                                                       \
+    clazz->get_name   = get_name_;                                     \
     clazz->name_index = name_index_;                                   \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svgxval.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svgxval.h
index 2cdab506551..2cdab506551 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svgxval.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svgxval.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svkern.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svkern.h
index 1488adf493b..1488adf493b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svkern.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svmm.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svmm.h
index 66e1da22f1a..b08a663d667 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svmm.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svmm.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType Multiple Masters and GX var services (specification).   */
 /*                                                                         */
-/*  Copyright 2003, 2004 by                                                */
+/*  Copyright 2003, 2004, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -68,30 +68,39 @@ FT_BEGIN_HEADER
     FT_Set_Var_Design_Func  set_var_design;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_,   \
-        set_mm_blend_, get_mm_var_, set_var_design_)                         \
-  static const FT_Service_MultiMastersRec class_ =                           \
-  {                                                                          \
-    get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_     \
+#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
+                                           get_mm_,                         \
+                                           set_mm_design_,                  \
+                                           set_mm_blend_,                   \
+                                           get_mm_var_,                     \
+                                           set_var_design_ )                \
+  static const FT_Service_MultiMastersRec  class_ =                         \
+  {                                                                         \
+    get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_    \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
-
-#define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_,   \
-        set_mm_blend_, get_mm_var_, set_var_design_)                         \
-  void                                                                       \
-  FT_Init_Class_##class_( FT_Service_MultiMastersRec*  clazz )               \
-  {                                                                          \
-    clazz->get_mm = get_mm_;                                                 \
-    clazz->set_mm_design = set_mm_design_;                                   \
-    clazz->set_mm_blend = set_mm_blend_;                                     \
-    clazz->get_mm_var = get_mm_var_;                                         \
-    clazz->set_var_design = set_var_design_;                                 \
-  } 
-
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_MULTIMASTERSREC( class_,                          \
+                                           get_mm_,                         \
+                                           set_mm_design_,                  \
+                                           set_mm_blend_,                   \
+                                           get_mm_var_,                     \
+                                           set_var_design_ )                \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Service_MultiMastersRec*  clazz )            \
+  {                                                                         \
+    clazz->get_mm         = get_mm_;                                        \
+    clazz->set_mm_design  = set_mm_design_;                                 \
+    clazz->set_mm_blend   = set_mm_blend_;                                  \
+    clazz->get_mm_var     = get_mm_var_;                                    \
+    clazz->set_var_design = set_var_design_;                                \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svotval.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svotval.h
index 970bbd57593..970bbd57593 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svotval.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svotval.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpfr.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpfr.h
index 462786f9ce9..462786f9ce9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpfr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpfr.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpostnm.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpostnm.h
index 106c54f8530..a76b4fe057a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpostnm.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpostnm.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType PostScript name services (specification).               */
 /*                                                                         */
-/*  Copyright 2003, 2007 by                                                */
+/*  Copyright 2003, 2007, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -46,26 +46,28 @@ FT_BEGIN_HEADER
     FT_PsName_GetFunc  get_ps_font_name;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \
-  static const FT_Service_PsFontNameRec class_ =                   \
-  {                                                                \
-    get_ps_font_name_                                              \
+#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
+  static const FT_Service_PsFontNameRec  class_ =                    \
+  {                                                                  \
+    get_ps_font_name_                                                \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \
-  void                                                             \
-  FT_Init_Class_##class_( FT_Library library,                      \
-                          FT_Service_PsFontNameRec* clazz)         \
-  {                                                                \
-    FT_UNUSED(library);                                            \
-    clazz->get_ps_font_name = get_ps_font_name_;                   \
-  } 
+#define FT_DEFINE_SERVICE_PSFONTNAMEREC( class_, get_ps_font_name_ ) \
+  void                                                               \
+  FT_Init_Class_ ## class_( FT_Library                 library,      \
+                            FT_Service_PsFontNameRec*  clazz )       \
+  {                                                                  \
+    FT_UNUSED( library );                                            \
+                                                                     \
+    clazz->get_ps_font_name = get_ps_font_name_;                     \
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpscmap.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpscmap.h
index 961030cc391..030948ea64f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpscmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpscmap.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType PostScript charmap service (specification).             */
 /*                                                                         */
-/*  Copyright 2003, 2006 by                                                */
+/*  Copyright 2003, 2006, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -120,37 +120,50 @@ FT_BEGIN_HEADER
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \
-        unicodes_char_index_, unicodes_char_next_, macintosh_name_,          \
-        adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_)     \
-  static const FT_Service_PsCMapsRec class_ =                                \
-  {                                                                          \
-    unicode_value_, unicodes_init_,                                          \
-    unicodes_char_index_, unicodes_char_next_, macintosh_name_,              \
-    adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_          \
+#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
+                                      unicode_value_,                       \
+                                      unicodes_init_,                       \
+                                      unicodes_char_index_,                 \
+                                      unicodes_char_next_,                  \
+                                      macintosh_name_,                      \
+                                      adobe_std_strings_,                   \
+                                      adobe_std_encoding_,                  \
+                                      adobe_expert_encoding_ )              \
+  static const FT_Service_PsCMapsRec  class_ =                              \
+  {                                                                         \
+    unicode_value_, unicodes_init_,                                         \
+    unicodes_char_index_, unicodes_char_next_, macintosh_name_,             \
+    adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_         \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
-
-#define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \
-        unicodes_char_index_, unicodes_char_next_, macintosh_name_,          \
-        adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_)     \
-  void                                                                       \
-  FT_Init_Class_##class_( FT_Library library,                                \
-                          FT_Service_PsCMapsRec* clazz)                      \
-  {                                                                          \
-    FT_UNUSED(library);                                                      \
-    clazz->unicode_value = unicode_value_;                                   \
-    clazz->unicodes_init = unicodes_init_;                                   \
-    clazz->unicodes_char_index = unicodes_char_index_;                       \
-    clazz->unicodes_char_next = unicodes_char_next_;                         \
-    clazz->macintosh_name = macintosh_name_;                                 \
-    clazz->adobe_std_strings = adobe_std_strings_;                           \
-    clazz->adobe_std_encoding = adobe_std_encoding_;                         \
-    clazz->adobe_expert_encoding = adobe_expert_encoding_;                   \
-  } 
-
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
+
+#define FT_DEFINE_SERVICE_PSCMAPSREC( class_,                               \
+                                      unicode_value_,                       \
+                                      unicodes_init_,                       \
+                                      unicodes_char_index_,                 \
+                                      unicodes_char_next_,                  \
+                                      macintosh_name_,                      \
+                                      adobe_std_strings_,                   \
+                                      adobe_std_encoding_,                  \
+                                      adobe_expert_encoding_ )              \
+  void                                                                      \
+  FT_Init_Class_ ## class_( FT_Library              library,                \
+                            FT_Service_PsCMapsRec*  clazz )                 \
+  {                                                                         \
+    FT_UNUSED( library );                                                   \
+                                                                            \
+    clazz->unicode_value         = unicode_value_;                          \
+    clazz->unicodes_init         = unicodes_init_;                          \
+    clazz->unicodes_char_index   = unicodes_char_index_;                    \
+    clazz->unicodes_char_next    = unicodes_char_next_;                     \
+    clazz->macintosh_name        = macintosh_name_;                         \
+    clazz->adobe_std_strings     = adobe_std_strings_;                      \
+    clazz->adobe_std_encoding    = adobe_std_encoding_;                     \
+    clazz->adobe_expert_encoding = adobe_expert_encoding_;                  \
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpsinfo.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpsinfo.h
index 84d6a78a1ed..4bfb506711b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svpsinfo.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svpsinfo.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType PostScript info service (specification).                */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2009, 2011 by                                    */
+/*  Copyright 2003, 2004, 2009, 2011, 2012 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
                           PS_FontExtraRec*  afont_extra );
 
   typedef FT_Int
-  (*PS_HasGlyphNamesFunc)( FT_Face   face );
+  (*PS_HasGlyphNamesFunc)( FT_Face  face );
 
   typedef FT_Error
   (*PS_GetFontPrivateFunc)( FT_Face         face,
@@ -61,35 +61,43 @@ FT_BEGIN_HEADER
     PS_GetFontValueFunc    ps_get_font_value;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_,      \
-        ps_get_font_extra_, has_glyph_names_, get_font_private_, \
-        get_font_value_)                                         \
-  static const FT_Service_PsInfoRec class_ =                     \
+#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
+                                     get_font_info_,             \
+                                     ps_get_font_extra_,         \
+                                     has_glyph_names_,           \
+                                     get_font_private_,          \
+                                     get_font_value_ )           \
+  static const FT_Service_PsInfoRec  class_ =                    \
   {                                                              \
     get_font_info_, ps_get_font_extra_, has_glyph_names_,        \
     get_font_private_, get_font_value_                           \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_,      \
-        ps_get_font_extra_, has_glyph_names_, get_font_private_, \
-        get_font_value_)                                         \
+#define FT_DEFINE_SERVICE_PSINFOREC( class_,                     \
+                                     get_font_info_,             \
+                                     ps_get_font_extra_,         \
+                                     has_glyph_names_,           \
+                                     get_font_private_,          \
+                                     get_font_value_ )           \
   void                                                           \
-  FT_Init_Class_##class_( FT_Library library,                    \
-                          FT_Service_PsInfoRec*  clazz)          \
+  FT_Init_Class_ ## class_( FT_Library             library,      \
+                            FT_Service_PsInfoRec*  clazz )       \
   {                                                              \
-    FT_UNUSED(library);                                          \
-    clazz->ps_get_font_info = get_font_info_;                    \
-    clazz->ps_get_font_extra = ps_get_font_extra_;               \
-    clazz->ps_has_glyph_names = has_glyph_names_;                \
+    FT_UNUSED( library );                                        \
+                                                                 \
+    clazz->ps_get_font_info    = get_font_info_;                 \
+    clazz->ps_get_font_extra   = ps_get_font_extra_;             \
+    clazz->ps_has_glyph_names  = has_glyph_names_;               \
     clazz->ps_get_font_private = get_font_private_;              \
-    clazz->ps_get_font_value = get_font_value_;                  \
-  } 
+    clazz->ps_get_font_value   = get_font_value_;                \
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svsfnt.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svsfnt.h
index 30bb1620fe1..d3835aa1c2a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svsfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svsfnt.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType SFNT table loading service (specification).             */
 /*                                                                         */
-/*  Copyright 2003, 2004 by                                                */
+/*  Copyright 2003, 2004, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -69,26 +69,27 @@ FT_BEGIN_HEADER
     FT_SFNT_TableInfoFunc  table_info;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_)  \
-  static const FT_Service_SFNT_TableRec class_ =                     \
-  {                                                                  \
-    load_, get_, info_                                               \
+#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ )  \
+  static const FT_Service_SFNT_TableRec  class_ =                      \
+  {                                                                    \
+    load_, get_, info_                                                 \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_) \
-  void                                                              \
-  FT_Init_Class_##class_( FT_Service_SFNT_TableRec*  clazz )        \
-  {                                                                 \
-    clazz->load_table = load_;                                      \
-    clazz->get_table = get_;                                        \
-    clazz->table_info = info_;                                      \
-  } 
+#define FT_DEFINE_SERVICE_SFNT_TABLEREC( class_, load_, get_, info_ ) \
+  void                                                                \
+  FT_Init_Class_ ## class_( FT_Service_SFNT_TableRec*  clazz )        \
+  {                                                                   \
+    clazz->load_table = load_;                                        \
+    clazz->get_table  = get_;                                         \
+    clazz->table_info = info_;                                        \
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svttcmap.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svttcmap.h
index 8af00351d9d..83994aaf8ae 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svttcmap.h
@@ -7,7 +7,7 @@
 /*  Copyright 2003 by                                                      */
 /*  Masatake YAMATO, Redhat K.K.                                           */
 /*                                                                         */
-/*  Copyright 2003, 2008 by                                                */
+/*  Copyright 2003, 2008, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -31,7 +31,7 @@
 FT_BEGIN_HEADER
 
 
-#define FT_SERVICE_ID_TT_CMAP "tt-cmaps"
+#define FT_SERVICE_ID_TT_CMAP  "tt-cmaps"
 
 
   /*************************************************************************/
@@ -58,8 +58,8 @@ FT_BEGIN_HEADER
   /*                                                                       */
   typedef struct  TT_CMapInfo_
   {
-    FT_ULong language;
-    FT_Long  format;
+    FT_ULong  language;
+    FT_Long   format;
 
   } TT_CMapInfo;
 
@@ -76,24 +76,25 @@ FT_BEGIN_HEADER
 
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_)  \
-  static const FT_Service_TTCMapsRec class_ =                 \
-  {                                                           \
-    get_cmap_info_                                            \
+#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
+  static const FT_Service_TTCMapsRec  class_ =                  \
+  {                                                             \
+    get_cmap_info_                                              \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_) \
-  void                                                       \
-  FT_Init_Class_##class_( FT_Library library,                \
-                          FT_Service_TTCMapsRec*  clazz)     \
-  {                                                          \
-    FT_UNUSED(library);                                      \
-    clazz->get_cmap_info = get_cmap_info_;                   \
-  } 
+#define FT_DEFINE_SERVICE_TTCMAPSREC( class_, get_cmap_info_ )  \
+  void                                                          \
+  FT_Init_Class_ ## class_( FT_Library              library,    \
+                            FT_Service_TTCMapsRec*  clazz )     \
+  {                                                             \
+    FT_UNUSED( library );                                       \
+                                                                \
+    clazz->get_cmap_info = get_cmap_info_;                      \
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svtteng.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svtteng.h
index 58e02a6f9dd..58e02a6f9dd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svtteng.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svtteng.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svttglyf.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svttglyf.h
index ab2dc9a9fe9..369eb8421b7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svttglyf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svttglyf.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType TrueType glyph service.                                 */
 /*                                                                         */
-/*  Copyright 2007 by David Turner.                                        */
+/*  Copyright 2007, 2009, 2012 by David Turner.                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -24,7 +24,7 @@
 FT_BEGIN_HEADER
 
 
-#define FT_SERVICE_ID_TT_GLYF "tt-glyf"
+#define FT_SERVICE_ID_TT_GLYF  "tt-glyf"
 
 
   typedef FT_ULong
@@ -37,24 +37,25 @@ FT_BEGIN_HEADER
     TT_Glyf_GetLocationFunc  get_location;
   };
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
-#define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ )   \
-  static const FT_Service_TTGlyfRec class_ =                  \
+#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
+  static const FT_Service_TTGlyfRec  class_ =                 \
   {                                                           \
     get_location_                                             \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
-#define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ )   \
+#define FT_DEFINE_SERVICE_TTGLYFREC( class_, get_location_ )  \
   void                                                        \
-  FT_Init_Class_##class_( FT_Service_TTGlyfRec*  clazz )      \
+  FT_Init_Class_ ## class_( FT_Service_TTGlyfRec*  clazz )    \
   {                                                           \
     clazz->get_location = get_location_;                      \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svwinfnt.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svwinfnt.h
index 57f7765d92f..57f7765d92f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svwinfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svwinfnt.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svxf86nm.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svxf86nm.h
index ca5d884a83c..ca5d884a83c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/services/svxf86nm.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/services/svxf86nm.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/sfnt.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/sfnt.h
index 6326debd00c..905ca8ccdc6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/sfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/sfnt.h
@@ -757,12 +757,12 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) \
-  a, 
+  a,
 #else
   #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a)
 #endif
 #define FT_INTERNAL(a) \
-  a, 
+  a,
 
 #define FT_DEFINE_SFNT_INTERFACE(class_,                                     \
     goto_table_, init_face_, load_face_, done_face_, get_interface_,         \
@@ -819,7 +819,7 @@ FT_BEGIN_HEADER
     FT_INTERNAL(get_metrics_) \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a, a_) \
@@ -885,9 +885,9 @@ FT_BEGIN_HEADER
     FT_INTERNAL(set_sbit_strike,set_sbit_strike_) \
     FT_INTERNAL(load_strike_metrics,load_strike_metrics_) \
     FT_INTERNAL(get_metrics,get_metrics_) \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
 FT_END_HEADER
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/t1types.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/t1types.h
index f859de27322..f859de27322 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/t1types.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/t1types.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/tttypes.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/tttypes.h
index acbb863b0f1..57b1731ca32 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/internal/tttypes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/internal/tttypes.h
@@ -1401,7 +1401,7 @@ FT_BEGIN_HEADER
     FT_Byte*              vert_metrics;
     FT_ULong              vert_metrics_size;
 
-    FT_ULong              num_locations; /* in broken TTF, gid > 0xFFFF */ 
+    FT_ULong              num_locations; /* in broken TTF, gid > 0xFFFF */
     FT_Byte*              glyph_locations;
 
     FT_Byte*              hdmx_table;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/t1tables.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/t1tables.h
index db1a91e69bb..a14255e5f58 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/t1tables.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/t1tables.h
@@ -570,7 +570,7 @@ FT_BEGIN_HEADER
     PS_DICT_NOTICE,                 /* FT_String* */
     PS_DICT_FULL_NAME,              /* FT_String* */
     PS_DICT_FAMILY_NAME,            /* FT_String* */
-    PS_DICT_WEIGHT,                 /* FT_String  */
+    PS_DICT_WEIGHT,                 /* FT_String* */
     PS_DICT_IS_FIXED_PITCH,         /* FT_Bool    */
     PS_DICT_UNDERLINE_POSITION,     /* FT_Short   */
     PS_DICT_UNDERLINE_THICKNESS,    /* FT_UShort  */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ttnameid.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ttnameid.h
index 66aef0432e0..66aef0432e0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ttnameid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ttnameid.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/tttables.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/tttables.h
index 02236c2005d..02236c2005d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/tttables.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/tttables.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/tttags.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/tttags.h
index 307ce4b6374..307ce4b6374 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/tttags.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/tttags.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ttunpat.h b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ttunpat.h
index a0162759b78..a0162759b78 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/freetype/ttunpat.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/freetype/ttunpat.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/include/ft2build.h b/Build/source/libs/freetype2/freetype-2.4.9/include/ft2build.h
index 923d887df6f..923d887df6f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/include/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/include/ft2build.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/modules.cfg b/Build/source/libs/freetype2/freetype-2.4.9/modules.cfg
index 8d5b6b598f3..a85378ee7ce 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/modules.cfg
+++ b/Build/source/libs/freetype2/freetype-2.4.9/modules.cfg
@@ -1,6 +1,6 @@
 # modules.cfg
 #
-# Copyright 2005, 2006, 2007, 2009, 2010 by
+# Copyright 2005-2007, 2009-2011 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -54,7 +54,7 @@ FONT_MODULES += pfr
 
 # PostScript Type 42 font driver.
 #
-# This driver needs the `truetype' module.
+# This driver needs the `truetype' and `psaux' modules.
 FONT_MODULES += type42
 
 # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/objs/README b/Build/source/libs/freetype2/freetype-2.4.9/objs/README
index befb63e0492..befb63e0492 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/objs/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/objs/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/Jamfile
index 76ee0f46e6d..76ee0f46e6d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/Jamfile
index 2714765b5b5..2714765b5b5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afangles.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afangles.c
index 790af1779c5..790af1779c5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afangles.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afangles.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afangles.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afangles.h
index f33f9e108e3..f33f9e108e3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afangles.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afangles.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afcjk.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afcjk.c
index 0acef9c85e5..8e407c86cee 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afcjk.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afcjk.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for CJK script (body).                  */
 /*                                                                         */
-/*  Copyright 2006-2011 by                                                 */
+/*  Copyright 2006-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1610,7 +1610,7 @@
         goto Exit;
     }
 
-    offset = cur_len % 64;
+    offset = cur_len & 63;
 
     if ( offset < 32 )
     {
@@ -2225,11 +2225,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_cjk_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
     AF_SCRIPT_CJK,
     af_cjk_uniranges,
 
-    sizeof( AF_CJKMetricsRec ),
+    sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_cjk_metrics_init,
     (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale,
@@ -2247,11 +2247,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_cjk_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class,
     AF_SCRIPT_CJK,
     af_cjk_uniranges,
 
-    sizeof( AF_CJKMetricsRec ),
+    sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) NULL,
     (AF_Script_ScaleMetricsFunc)NULL,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afcjk.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afcjk.h
index 8416c0d0214..8416c0d0214 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afcjk.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afcjk.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afdummy.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afdummy.c
index c71265131e6..4bf278ce2d5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afdummy.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afdummy.c
@@ -47,7 +47,7 @@
     AF_SCRIPT_NONE,
     NULL,
 
-    sizeof( AF_ScriptMetricsRec ),
+    sizeof ( AF_ScriptMetricsRec ),
 
     (AF_Script_InitMetricsFunc) NULL,
     (AF_Script_ScaleMetricsFunc)NULL,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afdummy.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afdummy.h
index 95d8f8cf190..95d8f8cf190 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afdummy.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afdummy.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aferrors.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aferrors.h
index c2ed5fe2abe..50e1a22dd57 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aferrors.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Autofitter error codes (specification only).                         */
 /*                                                                         */
-/*  Copyright 2005 by                                                      */
+/*  Copyright 2005, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  AF_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Autofit
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afglobal.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afglobal.c
index 3c5f02ec6e0..3e0c02d3f14 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afglobal.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afglobal.c
@@ -43,7 +43,7 @@
 #endif
     &af_latin_script_class,
     &af_cjk_script_class,
-    &af_indic_script_class, 
+    &af_indic_script_class,
     NULL  /* do not remove */
   };
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afglobal.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afglobal.h
index cc6860b260d..cc6860b260d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afglobal.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afglobal.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afhints.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afhints.c
index f51066f02f5..f51066f02f5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afhints.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afhints.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afhints.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afhints.h
index 1c52e0de7e4..1c52e0de7e4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afhints.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afhints.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afindic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afindic.c
index c232cff7830..9c74838fe0d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afindic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afindic.c
@@ -113,11 +113,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_indic_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
     AF_SCRIPT_INDIC,
     af_indic_uniranges,
 
-    sizeof( AF_CJKMetricsRec ),
+    sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_indic_metrics_init,
     (AF_Script_ScaleMetricsFunc)af_indic_metrics_scale,
@@ -135,11 +135,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_indic_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_indic_script_class,
     AF_SCRIPT_INDIC,
     af_indic_uniranges,
 
-    sizeof( AF_CJKMetricsRec ),
+    sizeof ( AF_CJKMetricsRec ),
 
     (AF_Script_InitMetricsFunc) NULL,
     (AF_Script_ScaleMetricsFunc)NULL,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afindic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afindic.h
index 662a982200e..662a982200e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afindic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afindic.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin.c
index 54fcf7f0aa8..30145a2b7b2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin.c
@@ -2341,11 +2341,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_latin_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_latin_script_class,
     AF_SCRIPT_LATIN,
     af_latin_uniranges,
 
-    sizeof( AF_LatinMetricsRec ),
+    sizeof ( AF_LatinMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_latin_metrics_init,
     (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin.h
index c5c2d13f8d0..c5c2d13f8d0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin2.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin2.c
index 23558b87908..ea6af8dd932 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin2.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin2.c
@@ -133,7 +133,7 @@
               dist = -dist;
 
             if ( num_widths < AF_LATIN_MAX_WIDTHS )
-              axis->widths[ num_widths++ ].org = dist;
+              axis->widths[num_widths++].org = dist;
           }
         }
 
@@ -1359,10 +1359,10 @@
   af_latin2_hints_compute_blue_edges( AF_GlyphHints    hints,
                                       AF_LatinMetrics  metrics )
   {
-    AF_AxisHints  axis       = &hints->axis[ AF_DIMENSION_VERT ];
+    AF_AxisHints  axis       = &hints->axis[AF_DIMENSION_VERT];
     AF_Edge       edge       = axis->edges;
     AF_Edge       edge_limit = edge + axis->num_edges;
-    AF_LatinAxis  latin      = &metrics->axis[ AF_DIMENSION_VERT ];
+    AF_LatinAxis  latin      = &metrics->axis[AF_DIMENSION_VERT];
     FT_Fixed      scale      = latin->scale;
     FT_Pos        best_dist0;  /* initial threshold */
 
@@ -2356,11 +2356,11 @@
   };
 
 
-  AF_DEFINE_SCRIPT_CLASS(af_latin2_script_class,
+  AF_DEFINE_SCRIPT_CLASS( af_latin2_script_class,
     AF_SCRIPT_LATIN2,
     af_latin2_uniranges,
 
-    sizeof( AF_LatinMetricsRec ),
+    sizeof ( AF_LatinMetricsRec ),
 
     (AF_Script_InitMetricsFunc) af_latin2_metrics_init,
     (AF_Script_ScaleMetricsFunc)af_latin2_metrics_scale,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin2.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin2.h
index 925c6214db3..925c6214db3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aflatin2.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aflatin2.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afloader.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afloader.c
index 966a0df73db..34ef9d80985 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afloader.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afloader.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter glyph loading routines (body).                           */
 /*                                                                         */
-/*  Copyright 2003-2009, 2011 by                                           */
+/*  Copyright 2003-2009, 2011-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -433,9 +433,10 @@
         slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
                                                x_scale );
 #else
-      if ( FT_IS_FIXED_WIDTH( slot->face )                              ||
-           ( af_face_globals_is_digit( loader->globals, glyph_index ) &&
-             metrics->digits_have_same_width                          ) )
+      if ( scaler->render_mode != FT_RENDER_MODE_LIGHT                      &&
+           ( FT_IS_FIXED_WIDTH( slot->face )                              ||
+             ( af_face_globals_is_digit( loader->globals, glyph_index ) &&
+               metrics->digits_have_same_width                          ) ) )
       {
         slot->metrics.horiAdvance = FT_MulFix( slot->metrics.horiAdvance,
                                                metrics->scaler.x_scale );
@@ -465,7 +466,13 @@
       if ( error )
         goto Exit;
 
-      slot->outline = internal->loader->base.outline;
+      /* reassign all outline fields except flags to protect them */
+      slot->outline.n_contours = internal->loader->base.outline.n_contours;
+      slot->outline.n_points   = internal->loader->base.outline.n_points;
+      slot->outline.points     = internal->loader->base.outline.points;
+      slot->outline.tags       = internal->loader->base.outline.tags;
+      slot->outline.contours   = internal->loader->base.outline.contours;
+
       slot->format  = FT_GLYPH_FORMAT_OUTLINE;
     }
 
@@ -480,7 +487,7 @@
   af_loader_load_glyph( AF_Loader  loader,
                         FT_Face    face,
                         FT_UInt    gindex,
-                        FT_UInt32  load_flags )
+                        FT_Int32   load_flags )
   {
     FT_Error      error;
     FT_Size       size = face->size;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afloader.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afloader.h
index 3f91e1a2255..eec0e9271f0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afloader.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afloader.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter glyph loading routines (specification).                  */
 /*                                                                         */
-/*  Copyright 2003-2005, 2011 by                                           */
+/*  Copyright 2003-2005, 2011-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -60,7 +60,7 @@ FT_BEGIN_HEADER
   af_loader_load_glyph( AF_Loader  loader,
                         FT_Face    face,
                         FT_UInt    gindex,
-                        FT_UInt32  load_flags );
+                        FT_Int32   load_flags );
 
 /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afmodule.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afmodule.c
index 20b62183822..20b62183822 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afmodule.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afmodule.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afmodule.h
index d9792399b63..d9792399b63 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afpic.c
index 3aefbc51ce0..87074afcfe2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afpic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afpic.c
@@ -20,16 +20,20 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "afpic.h"
+#include "aferrors.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from afmodule.c */
-  void FT_Init_Class_af_autofitter_service( FT_Library,
-                                            FT_AutoHinter_ServiceRec* );
+  void FT_Init_Class_af_autofitter_service(
+    FT_Library                 library,
+    FT_AutoHinter_ServiceRec*  clazz );
 
   /* forward declaration of PIC init functions from script classes */
 #include "aflatin.h"
+#ifdef FT_OPTION_AUTOFIT2
 #include "aflatin2.h"
+#endif
 #include "afcjk.h"
 #include "afdummy.h"
 #include "afindic.h"
@@ -73,7 +77,7 @@
         &container->af_script_classes_rec[ss];
     }
     container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL;
-    
+
     /* add call to initialization function when you add new scripts */
     ss = 0;
     FT_Init_Class_af_dummy_script_class(
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afpic.h
index c1632e76e9a..21b0ff988c2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afpic.h
@@ -19,7 +19,7 @@
 #ifndef __AFPIC_H__
 #define __AFPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
 #ifdef FT_OPTION_AUTOFIT2
 #define AF_SCRIPT_CLASSES_COUNT     6
 #else
-#define AF_SCRIPT_CLASSES_COUNT     5  
+#define AF_SCRIPT_CLASSES_COUNT     5
 #endif
-#define AF_SCRIPT_CLASSES_REC_COUNT  ( AF_SCRIPT_CLASSES_COUNT - 1 )    
+#define AF_SCRIPT_CLASSES_REC_COUNT  ( AF_SCRIPT_CLASSES_COUNT - 1 )
 
   typedef struct AFModulePIC_
   {
@@ -57,6 +57,13 @@ FT_BEGIN_HEADER
 #define AF_AF_AUTOFITTER_SERVICE_GET                                       \
           ( GET_PIC( library )->af_autofitter_service )
 
+  /* see afpic.c for the implementation */
+  void
+  autofit_module_class_pic_free( FT_Library  library );
+
+  FT_Error
+  autofit_module_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aftypes.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aftypes.h
index 44997d1e228..21e442c237b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/aftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/aftypes.h
@@ -231,7 +231,7 @@ extern void*  _af_debug_hints;
     AF_SCRIPT_NONE  = 0,
     AF_SCRIPT_LATIN = 1,
     AF_SCRIPT_CJK   = 2,
-    AF_SCRIPT_INDIC = 3, 
+    AF_SCRIPT_INDIC = 3,
 #ifdef FT_OPTION_AUTOFIT2
     AF_SCRIPT_LATIN2,
 #endif
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afwarp.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afwarp.c
index d0d4850bdcb..34a97ffc57c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afwarp.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afwarp.c
@@ -352,7 +352,7 @@
     {
       FT_Fixed  best_scale = warper->best_scale;
       FT_Pos    best_delta = warper->best_delta;
-     
+
 
       hints->xmin_delta = FT_MulFix( X1, best_scale - org_scale )
                           + best_delta;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afwarp.h b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afwarp.h
index 7343fdd5ef5..7343fdd5ef5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/afwarp.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/afwarp.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/autofit.c b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/autofit.c
index 3883a0a7060..3883a0a7060 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/autofit.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/autofit.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/module.mk
index 6ec60912ab7..6ec60912ab7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/rules.mk
index b76bb79ab43..b76bb79ab43 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/autofit/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/autofit/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/base/Jamfile
index 832e8b84249..832e8b84249 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/basepic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/basepic.c
index c0bccb6959b..d754eb1b036 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/basepic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/basepic.c
@@ -24,18 +24,24 @@
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from ftglyph.c */
-  void FT_Init_Class_ft_outline_glyph_class(FT_Glyph_Class*);
-  void FT_Init_Class_ft_bitmap_glyph_class(FT_Glyph_Class*);
+  void FT_Init_Class_ft_outline_glyph_class( FT_Glyph_Class*  clazz );
+  void FT_Init_Class_ft_bitmap_glyph_class( FT_Glyph_Class*  clazz );
+
+  /* forward declaration of PIC init function from ftrfork.c (not modularized) */
+  void FT_Init_Table_raccess_guess_table( ft_raccess_guess_rec*  record );
 
   /* forward declaration of PIC init functions from ftinit.c */
-  FT_Error ft_create_default_module_classes(FT_Library);
-  void ft_destroy_default_module_classes(FT_Library);
+  FT_Error
+  ft_create_default_module_classes( FT_Library  library );
+
+  void
+  ft_destroy_default_module_classes( FT_Library  library );
 
   void
-  ft_base_pic_free( FT_Library library )
+  ft_base_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory    memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory          memory = library->memory;
     if ( pic_container->base )
     {
       /* Destroy default module classes (in case FT_Add_Default_Modules was used) */
@@ -48,17 +54,17 @@
 
 
   FT_Error
-  ft_base_pic_init( FT_Library library )
+  ft_base_pic_init( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Error        error = FT_Err_Ok;
-    BasePIC*     container;
-    FT_Memory    memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Error           error = FT_Err_Ok;
+    BasePIC*           container;
+    FT_Memory          memory = library->memory;
 
     /* allocate pointer, clear and set global container pointer */
     if ( FT_ALLOC ( container, sizeof ( *container ) ) )
       return error;
-    FT_MEM_SET( container, 0, sizeof(*container) );
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->base = container;
 
     /* initialize default modules list and pointers */
@@ -67,12 +73,16 @@
       goto Exit;
 
     /* initialize pointer table - this is how the module usually expects this data */
-    FT_Init_Class_ft_outline_glyph_class(&container->ft_outline_glyph_class);
-    FT_Init_Class_ft_bitmap_glyph_class(&container->ft_bitmap_glyph_class);
+    FT_Init_Class_ft_outline_glyph_class(
+      &container->ft_outline_glyph_class );
+    FT_Init_Class_ft_bitmap_glyph_class(
+      &container->ft_bitmap_glyph_class );
+    FT_Init_Table_raccess_guess_table(
+      (ft_raccess_guess_rec*)&container->ft_raccess_guess_table);
 
 Exit:
-    if(error)
-      ft_base_pic_free(library);
+    if( error )
+      ft_base_pic_free( library );
     return error;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/basepic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/base/basepic.h
index bb17745769e..bf90bef0be7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/basepic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/basepic.h
@@ -19,7 +19,7 @@
 #ifndef __BASEPIC_H__
 #define __BASEPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -28,28 +28,43 @@ FT_BEGIN_HEADER
 #define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class
 #define FT_BITMAP_GLYPH_CLASS_GET  &ft_bitmap_glyph_class
 #define FT_DEFAULT_MODULES_GET     ft_default_modules
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#define FT_RACCESS_GUESS_TABLE_GET ft_raccess_guess_table
+#endif
 
 #else /* FT_CONFIG_OPTION_PIC */
 
 #include FT_GLYPH_H
 
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#include FT_INTERNAL_RFORK_H
+#endif
+
+
   typedef struct BasePIC_
   {
     FT_Module_Class** default_module_classes;
     FT_Glyph_Class ft_outline_glyph_class;
     FT_Glyph_Class ft_bitmap_glyph_class;
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+    ft_raccess_guess_rec ft_raccess_guess_table[FT_RACCESS_N_RULES];
+#endif
   } BasePIC;
 
 #define GET_PIC(lib)                  ((BasePIC*)((lib)->pic_container.base))
 #define FT_OUTLINE_GLYPH_CLASS_GET    (&GET_PIC(library)->ft_outline_glyph_class)
 #define FT_BITMAP_GLYPH_CLASS_GET     (&GET_PIC(library)->ft_bitmap_glyph_class)
 #define FT_DEFAULT_MODULES_GET        (GET_PIC(library)->default_module_classes)
+#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#define FT_RACCESS_GUESS_TABLE_GET    (GET_PIC(library)->ft_raccess_guess_table)
+#endif
 
+  /* see basepic.c for the implementation. */
   void
-  ft_base_pic_free( FT_Library library );
+  ft_base_pic_free( FT_Library  library );
 
   FT_Error
-  ft_base_pic_init( FT_Library library );
+  ft_base_pic_init( FT_Library  library );
 
 #endif /* FT_CONFIG_OPTION_PIC */
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftadvanc.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftadvanc.c
index 8ab7fcb9271..a8bb43d3d0d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftadvanc.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftadvanc.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Quick computation of advance widths (body).                          */
 /*                                                                         */
-/*  Copyright 2008, 2009 by                                                */
+/*  Copyright 2008, 2009, 2011 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -129,7 +129,7 @@
     {
       error = func( face, start, count, flags, padvances );
       if ( !error )
-        goto Exit;
+        return _ft_face_scale_advances( face, padvances, count, flags );
 
       if ( error != FT_ERROR_BASE( FT_Err_Unimplemented_Feature ) )
         return error;
@@ -147,16 +147,13 @@
       if ( error )
         break;
 
+      /* scale from 26.6 to 16.16 */
       padvances[nn] = ( flags & FT_LOAD_VERTICAL_LAYOUT )
-                      ? face->glyph->advance.y
-                      : face->glyph->advance.x;
+                      ? face->glyph->advance.y << 10
+                      : face->glyph->advance.x << 10;
     }
 
-    if ( error )
-      return error;
-
-  Exit:
-    return _ft_face_scale_advances( face, padvances, count, flags );
+    return error;
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftapi.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftapi.c
index 8914d1f4e99..8914d1f4e99 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftapi.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftapi.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbase.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbase.c
index 6a27ea95a62..5e5d70ec4b6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbase.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbase.c
@@ -34,7 +34,7 @@
 #include "fttrigon.c"
 #include "ftutil.c"
 
-#if defined( FT_MACINTOSH ) && !defined ( DARWIN_NO_CARBON )
+#ifdef FT_MACINTOSH
 #include "ftmac.c"
 #endif
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbase.h b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbase.h
index 516f4bb7fd3..51a1db18b84 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbase.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbase.h
@@ -49,15 +49,15 @@ FT_BEGIN_HEADER
                          FT_Face     *aface );
 
 
-#if defined( FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK ) && \
-    ( !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) )
+#if  defined( FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK ) && \
+    !defined( FT_MACINTOSH )
   /* Mac OS X/Darwin kernel often changes recommended method to access */
   /* the resource fork and older methods makes the kernel issue the    */
   /* warning of deprecated method.  To calm it down, the methods based */
   /* on Darwin VFS should be grouped and skip the rest methods after   */
   /* the case the resource is opened but found to lack a font in it.   */
   FT_LOCAL( FT_Bool )
-  raccess_rule_by_darwin_vfs( FT_UInt  rule_index );
+  ft_raccess_rule_by_darwin_vfs( FT_Library library, FT_UInt  rule_index );
 #endif
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbbox.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbbox.c
index 4b8e9112fee..4b8e9112fee 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbbox.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbbox.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbdf.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbdf.c
index d29adf09dd3..d29adf09dd3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbitmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbitmap.c
index 15c9d6559aa..84fa3227537 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftbitmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftbitmap.c
@@ -231,7 +231,7 @@
     if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) ||
          ( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) )
       return FT_Err_Invalid_Argument;
-       
+
     xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6;
     ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6;
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftcalc.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftcalc.c
index 3892fabfe93..2aeea0459bc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftcalc.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftcalc.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Arithmetic computations (body).                                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008 by             */
+/*  Copyright 1996-2006, 2008, 2012 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -307,7 +307,7 @@
       q <<= 1;
       r  |= lo >> 31;
 
-      if ( r >= (FT_UInt32)y )
+      if ( r >= y )
       {
         r -= y;
         q |= 1;
@@ -373,7 +373,7 @@
     if ( a <= 46340L && b <= 46340L && c <= 176095L && c > 0 )
       a = ( a * b + ( c >> 1 ) ) / c;
 
-    else if ( c > 0 )
+    else if ( (FT_Int32)c > 0 )
     {
       FT_Int64  temp, temp2;
 
@@ -412,7 +412,7 @@
     if ( a <= 46340L && b <= 46340L && c > 0 )
       a = a * b / c;
 
-    else if ( c > 0 )
+    else if ( (FT_Int32)c > 0 )
     {
       FT_Int64  temp;
 
@@ -464,7 +464,7 @@
      *  Unfortunately, it doesn't work (at least not portably).
      *
      *  It makes the assumption that right-shift on a negative signed value
-     *  fills the leftmost bits by copying the sign bit.  This is wrong. 
+     *  fills the leftmost bits by copying the sign bit.  This is wrong.
      *  According to K&R 2nd ed, section `A7.8 Shift Operators' on page 206,
      *  the result of right-shift of a negative signed value is
      *  implementation-defined.  At least one implementation fills the
@@ -544,7 +544,7 @@
     s  = (FT_Int32)a; a = FT_ABS( a );
     s ^= (FT_Int32)b; b = FT_ABS( b );
 
-    if ( b == 0 )
+    if ( (FT_UInt32)b == 0 )
     {
       /* check for division by 0 */
       q = (FT_UInt32)0x7FFFFFFFL;
@@ -552,15 +552,16 @@
     else if ( ( a >> 16 ) == 0 )
     {
       /* compute result directly */
-      q = (FT_UInt32)( (a << 16) + (b >> 1) ) / (FT_UInt32)b;
+      q = (FT_UInt32)( ( a << 16 ) + ( b >> 1 ) ) / (FT_UInt32)b;
     }
     else
     {
       /* we need more bits; we have to do it by hand */
       FT_Int64  temp, temp2;
 
-      temp.hi  = (FT_Int32) (a >> 16);
-      temp.lo  = (FT_UInt32)(a << 16);
+
+      temp.hi  = (FT_Int32) ( a >> 16 );
+      temp.lo  = (FT_UInt32)( a << 16 );
       temp2.hi = 0;
       temp2.lo = (FT_UInt32)( b >> 1 );
       FT_Add64( &temp, &temp2, &temp );
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftcid.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftcid.c
index 733aae14751..733aae14751 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftcid.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftcid.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftdbgmem.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftdbgmem.c
index 12fed04bb94..12fed04bb94 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftdbgmem.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftdbgmem.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftdebug.c
index 2adbeabeb23..2adbeabeb23 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftdebug.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftfstype.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftfstype.c
index d0ef7b7c1b0..d0ef7b7c1b0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftfstype.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftfstype.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgasp.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgasp.c
index 8485d29259e..8485d29259e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgasp.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgasp.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgloadr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgloadr.c
index 8483450192c..8483450192c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgloadr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgloadr.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftglyph.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftglyph.c
index b22050800b7..591b57a75a6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftglyph.c
@@ -254,7 +254,7 @@
   }
 
 
-  FT_DEFINE_GLYPH( ft_outline_glyph_class, 
+  FT_DEFINE_GLYPH( ft_outline_glyph_class,
     sizeof ( FT_OutlineGlyphRec ),
     FT_GLYPH_FORMAT_OUTLINE,
 
@@ -512,42 +512,42 @@
     FT_Error                  error = FT_Err_Ok;
     FT_Glyph                  glyph;
     FT_BitmapGlyph            bitmap = NULL;
-
     const FT_Glyph_Class*     clazz;
 
-#ifdef FT_CONFIG_OPTION_PIC
-    FT_Library                library = FT_GLYPH( glyph )->library;
-#endif
+    /* FT_BITMAP_GLYPH_CLASS_GET derefers `library' in PIC mode */
+    FT_Library                library;
 
 
     /* check argument */
     if ( !the_glyph )
       goto Bad;
-
-    /* we render the glyph into a glyph bitmap using a `dummy' glyph slot */
-    /* then calling FT_Render_Glyph_Internal()                            */
-
     glyph = *the_glyph;
     if ( !glyph )
       goto Bad;
 
-    clazz = glyph->clazz;
+    clazz   = glyph->clazz;
+    library = glyph->library;
+    if ( !library || !clazz )
+      goto Bad;
 
     /* when called with a bitmap glyph, do nothing and return successfully */
     if ( clazz == FT_BITMAP_GLYPH_CLASS_GET )
       goto Exit;
 
-    if ( !clazz || !clazz->glyph_prepare )
+    if ( !clazz->glyph_prepare )
       goto Bad;
 
+    /* we render the glyph into a glyph bitmap using a `dummy' glyph slot */
+    /* then calling FT_Render_Glyph_Internal()                            */
+
     FT_MEM_ZERO( &dummy, sizeof ( dummy ) );
     FT_MEM_ZERO( &dummy_internal, sizeof ( dummy_internal ) );
     dummy.internal = &dummy_internal;
-    dummy.library  = glyph->library;
+    dummy.library  = library;
     dummy.format   = clazz->glyph_format;
 
     /* create result bitmap glyph */
-    error = ft_new_glyph( glyph->library, FT_BITMAP_GLYPH_CLASS_GET,
+    error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET,
                           (FT_Glyph*)(void*)&bitmap );
     if ( error )
       goto Exit;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgxval.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgxval.c
index aeeb8ce4fc9..aeeb8ce4fc9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftgxval.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftgxval.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftinit.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftinit.c
index 305177a7e16..91f8e2a18c7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftinit.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftinit.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType initialization layer (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2007, 2009 by                         */
+/*  Copyright 1996-2001, 2002, 2005, 2007, 2009, 2012 by                   */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -54,8 +54,10 @@
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_init
 
+
 #ifndef FT_CONFIG_OPTION_PIC
 
+
 #undef  FT_USE_MODULE
 #ifdef __cplusplus
 #define FT_USE_MODULE( type, x )  extern "C" const type  x;
@@ -63,10 +65,8 @@
 #define FT_USE_MODULE( type, x )  extern const type  x;
 #endif
 
-
 #include FT_CONFIG_MODULES_H
 
-
 #undef  FT_USE_MODULE
 #define FT_USE_MODULE( type, x )  (const FT_Module_Class*)&(x),
 
@@ -77,8 +77,10 @@
     0
   };
 
+
 #else /* FT_CONFIG_OPTION_PIC */
 
+
 #ifdef __cplusplus
 #define FT_EXTERNC  extern "C"
 #else
@@ -87,16 +89,19 @@
 
   /* declare the module's class creation/destruction functions */
 #undef  FT_USE_MODULE
-#define FT_USE_MODULE( type, x )  \
-  FT_EXTERNC FT_Error FT_Create_Class_##x( FT_Library library, FT_Module_Class** output_class ); \
-  FT_EXTERNC void     FT_Destroy_Class_##x( FT_Library library, FT_Module_Class*  clazz );
+#define FT_USE_MODULE( type, x )                            \
+  FT_EXTERNC FT_Error                                       \
+  FT_Create_Class_ ## x( FT_Library         library,        \
+                         FT_Module_Class*  *output_class ); \
+  FT_EXTERNC void                                           \
+  FT_Destroy_Class_ ## x( FT_Library        library,        \
+                          FT_Module_Class*  clazz );
 
 #include FT_CONFIG_MODULES_H
 
-
   /* count all module classes */
 #undef  FT_USE_MODULE
-#define FT_USE_MODULE( type, x )  MODULE_CLASS_##x,
+#define FT_USE_MODULE( type, x )  MODULE_CLASS_ ## x,
 
   enum
   {
@@ -104,26 +109,31 @@
     FT_NUM_MODULE_CLASSES
   };
 
-  /* destroy all module classes */  
+  /* destroy all module classes */
 #undef  FT_USE_MODULE
-#define FT_USE_MODULE( type, x )  \
-  if ( classes[i] ) { FT_Destroy_Class_##x(library, classes[i]); } \
-  i++;                                                             \
+#define FT_USE_MODULE( type, x )                   \
+  if ( classes[i] )                                \
+  {                                                \
+    FT_Destroy_Class_ ## x( library, classes[i] ); \
+  }                                                \
+  i++;
+
 
   FT_BASE_DEF( void )
   ft_destroy_default_module_classes( FT_Library  library )
   {
-    FT_Module_Class** classes;
-    FT_Memory         memory;
-    FT_UInt           i;
-    BasePIC*          pic_container = (BasePIC*)library->pic_container.base;
+    FT_Module_Class*  *classes;
+    FT_Memory          memory;
+    FT_UInt            i;
+    BasePIC*           pic_container = (BasePIC*)library->pic_container.base;
+
 
     if ( !pic_container->default_module_classes )
       return;
 
-    memory = library->memory;
+    memory  = library->memory;
     classes = pic_container->default_module_classes;
-    i = 0;
+    i       = 0;
 
 #include FT_CONFIG_MODULES_H
 
@@ -131,30 +141,37 @@
     pic_container->default_module_classes = 0;
   }
 
+
   /* initialize all module classes and the pointer table */
 #undef  FT_USE_MODULE
-#define FT_USE_MODULE( type, x )                \
-  error = FT_Create_Class_##x(library, &clazz); \
-  if (error) goto Exit;                         \
+#define FT_USE_MODULE( type, x )                     \
+  error = FT_Create_Class_ ## x( library, &clazz );  \
+  if ( error )                                       \
+    goto Exit;                                       \
   classes[i++] = clazz;
 
+
   FT_BASE_DEF( FT_Error )
   ft_create_default_module_classes( FT_Library  library )
   {
-    FT_Error          error;
-    FT_Memory         memory;
-    FT_Module_Class** classes;
-    FT_Module_Class*  clazz;
-    FT_UInt           i;
-    BasePIC*          pic_container = (BasePIC*)library->pic_container.base;
-
-    memory = library->memory;  
+    FT_Error           error;
+    FT_Memory          memory;
+    FT_Module_Class*  *classes;
+    FT_Module_Class*   clazz;
+    FT_UInt            i;
+    BasePIC*           pic_container = (BasePIC*)library->pic_container.base;
+
+
+    memory = library->memory;
+
     pic_container->default_module_classes = 0;
 
-    if ( FT_ALLOC(classes, sizeof(FT_Module_Class*) * (FT_NUM_MODULE_CLASSES + 1) ) )
+    if ( FT_ALLOC( classes, sizeof ( FT_Module_Class* ) * 
+                              ( FT_NUM_MODULE_CLASSES + 1 ) ) )
       return error;
+
     /* initialize all pointers to 0, especially the last one */
-    for (i = 0; i < FT_NUM_MODULE_CLASSES; i++)
+    for ( i = 0; i < FT_NUM_MODULE_CLASSES; i++ )
       classes[i] = 0;
     classes[FT_NUM_MODULE_CLASSES] = 0;
 
@@ -162,16 +179,19 @@
 
 #include FT_CONFIG_MODULES_H
 
-Exit:    
-    if (error) ft_destroy_default_module_classes( library );
-    else pic_container->default_module_classes = classes;
+  Exit:
+    if ( error )
+      ft_destroy_default_module_classes( library );
+    else
+      pic_container->default_module_classes = classes;
 
-    return error;    
+    return error;
   }
 
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
+
   /* documentation is in ftmodapi.h */
 
   FT_EXPORT_DEF( void )
@@ -181,9 +201,18 @@ Exit:
     const FT_Module_Class* const*  cur;
 
 
-    /* test for valid `library' delayed to FT_Add_Module() */
+    /* FT_DEFAULT_MODULES_GET dereferences `library' in PIC mode */
+#ifdef FT_CONFIG_OPTION_PIC
+    if ( !library )
+      return;
+#endif
+
+    /* GCC 4.6 warns the type difference:
+     *   FT_Module_Class** != const FT_Module_Class* const*
+     */
+    cur = (const FT_Module_Class* const*)FT_DEFAULT_MODULES_GET;
 
-    cur = FT_DEFAULT_MODULES_GET;
+    /* test for valid `library' delayed to FT_Add_Module() */
     while ( *cur )
     {
       error = FT_Add_Module( library, *cur );
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftlcdfil.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftlcdfil.c
index 0da4ba160e3..0da4ba160e3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftlcdfil.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftlcdfil.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftmac.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftmac.c
index 63f927d57d8..f2007485d16 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftmac.c
@@ -119,6 +119,8 @@
 #endif
 
 
+#ifdef FT_MACINTOSH
+
   /* This function is deprecated because FSSpec is deprecated in Mac OS X  */
   FT_EXPORT_DEF( FT_Error )
   FT_GetFile_From_Mac_Name( const char*  fontName,
@@ -144,7 +146,7 @@
   {
 #if defined( MAC_OS_X_VERSION_10_5 ) && \
     ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
- 
+
     OSStatus  err;
 
     err = ATSFontGetFileReference( ats_font_id, ats_font_ref );
@@ -1053,5 +1055,7 @@
 #endif
   }
 
+#endif /* FT_MACINTOSH */
+
 
 /* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftmm.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftmm.c
index 0307729811f..0307729811f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftmm.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftmm.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftobjs.c
index 64575af59ea..36ee79749fc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (body).                            */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -445,6 +445,10 @@
           else
             prev->next = cur->next;
 
+          /* finalize client-specific data */
+          if ( slot->generic.finalizer )
+            slot->generic.finalizer( slot );
+
           ft_glyphslot_done( slot );
           FT_FREE( slot );
           break;
@@ -1187,7 +1191,7 @@
   /* there's a Mac-specific extended implementation of FT_New_Face() */
   /* in src/base/ftmac.c                                             */
 
-#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON )
+#ifndef FT_MACINTOSH
 
   /* documentation is in freetype.h */
 
@@ -1211,7 +1215,7 @@
     return FT_Open_Face( library, &args, face_index, aface );
   }
 
-#endif  /* defined( FT_MACINTOSH ) && !defined( DARWIN_NO_CARBON ) */
+#endif
 
 
   /* documentation is in freetype.h */
@@ -1520,7 +1524,7 @@
   }
 
 
-#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON )
+#ifndef FT_MACINTOSH
 
   /* The resource header says we've got resource_cnt `POST' (type1) */
   /* resources in this file.  They all need to be coalesced into    */
@@ -1875,7 +1879,7 @@
 
     for ( i = 0; i < FT_RACCESS_N_RULES; i++ )
     {
-      is_darwin_vfs = raccess_rule_by_darwin_vfs( i );
+      is_darwin_vfs = ft_raccess_rule_by_darwin_vfs( library, i );
       if ( is_darwin_vfs && vfs_rfork_has_no_font )
       {
         FT_TRACE3(( "Skip rule %d: darwin vfs resource fork"
@@ -4085,10 +4089,10 @@
   /*    all child faces.                                                   */
   /*                                                                       */
   /* <InOut>                                                               */
-  /*     module :: A handle to the target driver object.                   */
+  /*    module :: A handle to the target driver object.                    */
   /*                                                                       */
   /* <Note>                                                                */
-  /*     The driver _must_ be LOCKED!                                      */
+  /*    The driver _must_ be LOCKED!                                       */
   /*                                                                       */
   static void
   Destroy_Module( FT_Module  module )
@@ -4098,10 +4102,6 @@
     FT_Library        library = module->library;
 
 
-    /* finalize client-data - before anything else */
-    if ( module->generic.finalizer )
-      module->generic.finalizer( module );
-
     if ( library && library->auto_hinter == module )
       library->auto_hinter = 0;
 
@@ -4318,6 +4318,7 @@
         FT_Module*  cur     = library->modules;
         FT_Module*  limit   = cur + library->num_modules;
 
+
         for ( ; cur < limit; cur++ )
         {
           if ( cur[0] != module )
@@ -4511,10 +4512,6 @@
 
     memory = library->memory;
 
-    /* Discard client-data */
-    if ( library->generic.finalizer )
-      library->generic.finalizer( library );
-
     /*
      * Close all faces in the library.  If we don't do this, we can have
      * some subtle memory leaks.
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftotval.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftotval.c
index 694fd2b87a0..694fd2b87a0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftotval.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftotval.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftoutln.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftoutln.c
index 356b1561161..9ae276d082a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftoutln.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftoutln.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType outline management (body).                                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */
+/*  Copyright 1996-2008, 2010, 2012 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -771,7 +771,7 @@
         return 1;
     }
 
-    return ( n % 2 );
+    return n & 1;
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpatent.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpatent.c
index 82b42f03438..82b42f03438 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpatent.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpatent.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpfr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpfr.c
index 3a0f92d07ae..3a0f92d07ae 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpfr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpic.c
index d5271a9726a..b74e90dad31 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftpic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftpic.c
@@ -26,15 +26,15 @@
   /* documentation is in ftpic.h */
 
   FT_BASE_DEF( FT_Error )
-  ft_pic_container_init( FT_Library library )
+  ft_pic_container_init( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Error error = FT_Err_Ok;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Error  error = FT_Err_Ok;
 
-    FT_MEM_SET( pic_container, 0, sizeof(*pic_container) );
+    FT_MEM_SET( pic_container, 0, sizeof ( *pic_container ) );
 
     error = ft_base_pic_init( library );
-    if(error)
+    if ( error )
       return error;
 
     return FT_Err_Ok;
@@ -43,7 +43,7 @@
 
   /* Destroy the contents of the container. */
   FT_BASE_DEF( void )
-  ft_pic_container_destroy( FT_Library library )
+  ft_pic_container_destroy( FT_Library  library )
   {
     ft_base_pic_free( library );
   }
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftrfork.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftrfork.c
index 33768b0e395..01d8625e6f8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftrfork.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftrfork.c
@@ -28,7 +28,7 @@
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_RFORK_H
-
+#include "basepic.h"
 
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_raccess
@@ -253,14 +253,6 @@
   /*************************************************************************/
   /*************************************************************************/
 
-  typedef FT_Error
-  (*raccess_guess_func)( FT_Library  library,
-                         FT_Stream   stream,
-                         char       *base_file_name,
-                         char      **result_file_name,
-                         FT_Long    *result_offset );
-
-
   static FT_Error
   raccess_guess_apple_double( FT_Library  library,
                               FT_Stream   stream,
@@ -325,6 +317,20 @@
                                 FT_Long    *result_offset );
 
 
+  CONST_FT_RFORK_RULE_ARRAY_BEGIN(ft_raccess_guess_table,
+                                  ft_raccess_guess_rec)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(apple_double,      apple_double)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(apple_single,      apple_single)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_ufs_export, darwin_ufs_export)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_newvfs,     darwin_newvfs)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_hfsplus,    darwin_hfsplus)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(vfat,              vfat)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_cap,         linux_cap)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_double,      linux_double)
+  CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_netatalk,    linux_netatalk)
+  CONST_FT_RFORK_RULE_ARRAY_END
+
+
   /*************************************************************************/
   /****                                                                 ****/
   /****                       Helper functions                          ****/
@@ -348,43 +354,6 @@
                           const char  *original_name,
                           const char  *insertion );
 
-
-  typedef enum  FT_RFork_Rule_ {
-    FT_RFork_Rule_invalid = -2,
-    FT_RFork_Rule_uknown, /* -1 */
-    FT_RFork_Rule_apple_double,
-    FT_RFork_Rule_apple_single,
-    FT_RFork_Rule_darwin_ufs_export,
-    FT_RFork_Rule_darwin_newvfs,
-    FT_RFork_Rule_darwin_hfsplus,
-    FT_RFork_Rule_vfat,
-    FT_RFork_Rule_linux_cap,
-    FT_RFork_Rule_linux_double,
-    FT_RFork_Rule_linux_netatalk
-  } FT_RFork_Rule;
-
-  /* For fast translation between rule index and rule type,
-   * the macros FT_RFORK_xxx should be kept consistent with
-   * the raccess_guess_funcs table
-   */
-  typedef struct raccess_guess_rec_ {
-    raccess_guess_func  func;
-    FT_RFork_Rule       type;
-  } raccess_guess_rec;
-
-  static raccess_guess_rec  raccess_guess_table[FT_RACCESS_N_RULES] =
-  {
-    { raccess_guess_apple_double,	FT_RFork_Rule_apple_double, },
-    { raccess_guess_apple_single,	FT_RFork_Rule_apple_single, },
-    { raccess_guess_darwin_ufs_export,	FT_RFork_Rule_darwin_ufs_export, },
-    { raccess_guess_darwin_newvfs,	FT_RFork_Rule_darwin_newvfs, },
-    { raccess_guess_darwin_hfsplus,	FT_RFork_Rule_darwin_hfsplus, },
-    { raccess_guess_vfat,		FT_RFork_Rule_vfat, },
-    { raccess_guess_linux_cap,		FT_RFork_Rule_linux_cap, },
-    { raccess_guess_linux_double,	FT_RFork_Rule_linux_double, },
-    { raccess_guess_linux_netatalk,	FT_RFork_Rule_linux_netatalk, },
-  };
-
   FT_BASE_DEF( void )
   FT_Raccess_Guess( FT_Library  library,
                     FT_Stream   stream,
@@ -407,7 +376,7 @@
       if ( errors[i] )
         continue ;
 
-      errors[i] = (raccess_guess_table[i].func)( library,
+      errors[i] = (FT_RACCESS_GUESS_TABLE_GET[i].func)( library,
                                                  stream, base_name,
                                                  &(new_names[i]),
                                                  &(offsets[i]) );
@@ -417,21 +386,28 @@
   }
 
 
-#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON )
+#ifndef FT_MACINTOSH
   static FT_RFork_Rule
-  raccess_get_rule_type_from_rule_index( FT_UInt  rule_index )
+  raccess_get_rule_type_from_rule_index( FT_Library  library,
+                                         FT_UInt     rule_index )
   {
+    FT_UNUSED( library );
+
     if ( rule_index >= FT_RACCESS_N_RULES )
       return FT_RFork_Rule_invalid;
 
-    return raccess_guess_table[rule_index].type;
+    return FT_RACCESS_GUESS_TABLE_GET[rule_index].type;
   }
 
 
+  /*
+   * For this function, refer ftbase.h.
+   */
   FT_LOCAL_DEF( FT_Bool )
-  raccess_rule_by_darwin_vfs( FT_UInt  rule_index )
+  ft_raccess_rule_by_darwin_vfs( FT_Library  library,
+                                 FT_UInt     rule_index )
   {
-    switch( raccess_get_rule_type_from_rule_index( rule_index ) )
+    switch( raccess_get_rule_type_from_rule_index( library, rule_index ) )
     {
       case FT_RFork_Rule_darwin_newvfs:
       case FT_RFork_Rule_darwin_hfsplus:
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsnames.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsnames.c
index 3447888ca23..3447888ca23 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsnames.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftstream.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftstream.c
index fc2868e8dae..fc2868e8dae 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftstream.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftstream.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftstroke.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftstroke.c
index 5399efe9d3a..5399efe9d3a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftstroke.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftstroke.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsynth.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsynth.c
index d4ec0da570a..d4ec0da570a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsynth.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsynth.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsystem.c
index 7e203bef802..7e203bef802 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftsystem.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/fttrigon.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/fttrigon.c
index fdf433ab866..fdf433ab866 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/fttrigon.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/fttrigon.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/fttype1.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/fttype1.c
index 885dba5984e..885dba5984e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/fttype1.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/fttype1.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftutil.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftutil.c
index 5f77be557ad..5f77be557ad 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftutil.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftwinfnt.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftwinfnt.c
index bc2e90e1f6b..bc2e90e1f6b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftwinfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftwinfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftxf86.c b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftxf86.c
index a4bf767dfa2..a4bf767dfa2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/ftxf86.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/ftxf86.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/base/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/base/rules.mk
index 10f578abc8c..10f578abc8c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/base/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/base/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/Jamfile
index da23ccd0add..da23ccd0add 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/README b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/README
index b761aba2b28..b761aba2b28 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdf.c b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdf.c
index f95fb76225f..f95fb76225f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdf.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdf.h b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdf.h
index 561b4158a51..d11be6f147f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdf.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001, 2002, 2003, 2004 Francesco Zappa Nardelli
+ * Copyright 2001-2004, 2011 Francesco Zappa Nardelli
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -226,8 +226,10 @@ FT_BEGIN_HEADER
 
     void*            internal;       /* Internal data for the font.         */
 
-    unsigned long    nmod[2048];     /* Bitmap indicating modified glyphs.  */
-    unsigned long    umod[2048];     /* Bitmap indicating modified          */
+    /* The size of the next two arrays must be in sync with the */
+    /* size of the `have' array in the `bdf_parse_t' structure. */
+    unsigned long    nmod[34816];    /* Bitmap indicating modified glyphs.  */
+    unsigned long    umod[34816];    /* Bitmap indicating modified          */
                                      /* unencoded glyphs.                   */
     unsigned short   modified;       /* Boolean indicating font modified.   */
     unsigned short   bpp;            /* Bits per pixel.                     */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdfdrivr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdfdrivr.c
index 47d0eae89fe..0edcc77b6c9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdfdrivr.c
@@ -2,7 +2,7 @@
 
     FreeType font driver for bdf files
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by
+    Copyright (C) 2001-2008, 2011 by
     Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_OBJECTS_H
 #include FT_BDF_H
-#include FT_TRUETYPE_IDS_H 
+#include FT_TRUETYPE_IDS_H
 
 #include FT_SERVICE_BDF_H
 #include FT_SERVICE_XFREE86_NAME_H
@@ -332,8 +332,6 @@ THE SOFTWARE.
     FT_FREE( bdfface->available_sizes );
 
     FT_FREE( face->bdffont );
-
-    FT_TRACE4(( "BDF_Face_Done: done face\n" ));
   }
 
 
@@ -356,6 +354,8 @@ THE SOFTWARE.
     FT_UNUSED( face_index );
 
 
+    FT_TRACE2(( "BDF driver\n" ));
+
     if ( FT_STREAM_SEEK( 0 ) )
       goto Exit;
 
@@ -367,7 +367,7 @@ THE SOFTWARE.
     error = bdf_load_font( stream, memory, &options, &font );
     if ( error == BDF_Err_Missing_Startfont_Field )
     {
-      FT_TRACE2(( "[not a valid BDF file]\n" ));
+      FT_TRACE2(( "  not a BDF file\n" ));
       goto Fail;
     }
     else if ( error )
@@ -379,10 +379,10 @@ THE SOFTWARE.
       bdf_property_t*  prop = NULL;
 
 
-      FT_TRACE4(( "number of glyphs: %d (%d)\n",
+      FT_TRACE4(( "  number of glyphs: allocated %d (used %d)\n",
                   font->glyphs_size,
                   font->glyphs_used ));
-      FT_TRACE4(( "number of unencoded glyphs: %d (%d)\n",
+      FT_TRACE4(( "  number of unencoded glyphs: allocated %d (used %d)\n",
                   font->unencoded_size,
                   font->unencoded_used ));
 
@@ -482,7 +482,7 @@ THE SOFTWARE.
         for ( n = 0; n < font->glyphs_size; n++ )
         {
           (face->en_table[n]).enc = cur[n].encoding;
-          FT_TRACE4(( "idx %d, val 0x%lX\n", n, cur[n].encoding ));
+          FT_TRACE4(( "  idx %d, val 0x%lX\n", n, cur[n].encoding ));
           (face->en_table[n]).glyph = (FT_Short)n;
 
           if ( cur[n].encoding == font->default_char )
@@ -490,7 +490,8 @@ THE SOFTWARE.
             if ( n < FT_UINT_MAX )
               face->default_glyph = (FT_UInt)n;
             else
-              FT_TRACE1(( "idx %d is too large for this system\n", n ));
+              FT_TRACE1(( "BDF_Face_Init:"
+                          " idx %d is too large for this system\n", n ));
           }
         }
       }
@@ -761,8 +762,8 @@ THE SOFTWARE.
       case BDF_INTEGER:
         if ( prop->value.l > 0x7FFFFFFFL || prop->value.l < ( -1 - 0x7FFFFFFFL ) )
         {
-          FT_TRACE1(( "bdf_get_bdf_property: " ));
-          FT_TRACE1(( "too large integer 0x%x is truncated\n" ));
+          FT_TRACE1(( "bdf_get_bdf_property:"
+                      " too large integer 0x%x is truncated\n" ));
         }
         aproperty->type      = BDF_PROPERTY_TYPE_INTEGER;
         aproperty->u.integer = (FT_Int32)prop->value.l;
@@ -771,8 +772,8 @@ THE SOFTWARE.
       case BDF_CARDINAL:
         if ( prop->value.ul > 0xFFFFFFFFUL )
         {
-          FT_TRACE1(( "bdf_get_bdf_property: " ));
-          FT_TRACE1(( "too large cardinal 0x%x is truncated\n" ));
+          FT_TRACE1(( "bdf_get_bdf_property:"
+                      " too large cardinal 0x%x is truncated\n" ));
         }
         aproperty->type       = BDF_PROPERTY_TYPE_CARDINAL;
         aproperty->u.cardinal = (FT_UInt32)prop->value.ul;
@@ -847,9 +848,9 @@ THE SOFTWARE.
 
       0,
 
-      (FT_Module_Constructor)0,
-      (FT_Module_Destructor) 0,
-      (FT_Module_Requester)  bdf_driver_requester
+      0,                        /* FT_Module_Constructor */
+      0,                        /* FT_Module_Destructor  */
+      bdf_driver_requester
     },
 
     sizeof ( BDF_FaceRec ),
@@ -869,9 +870,9 @@ THE SOFTWARE.
 #endif
     BDF_Glyph_Load,
 
-    0,                          /* FT_Face_GetKerningFunc   */
-    0,                          /* FT_Face_AttachFunc       */
-    0,                          /* FT_Face_GetAdvancesFunc  */
+    0,                          /* FT_Face_GetKerningFunc  */
+    0,                          /* FT_Face_AttachFunc      */
+    0,                          /* FT_Face_GetAdvancesFunc */
 
     BDF_Size_Request,
     BDF_Size_Select
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdfdrivr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdfdrivr.h
index db7093bb45f..ca0dae50d22 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdfdrivr.h
@@ -38,7 +38,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   typedef struct  BDF_encoding_el_
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdferror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdferror.h
index b27fa333bbc..ea545aca06c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdferror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdferror.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001, 2002 Francesco Zappa Nardelli
+ * Copyright 2001, 2002, 2012 Francesco Zappa Nardelli
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,6 +33,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  BDF_Err_
 #define FT_ERR_BASE    FT_Mod_Err_BDF
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdflib.c b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdflib.c
index 61bae36b305..b7b685754ca 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/bdflib.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/bdflib.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001-2011
+ * Copyright 2001-2012
  *   Francesco Zappa Nardelli
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -169,6 +169,43 @@
                         sizeof ( _bdf_properties[0] );
 
 
+  /* Auto correction messages. */
+#define ACMSG1   "FONT_ASCENT property missing.  " \
+                 "Added `FONT_ASCENT %hd'.\n"
+#define ACMSG2   "FONT_DESCENT property missing.  " \
+                 "Added `FONT_DESCENT %hd'.\n"
+#define ACMSG3   "Font width != actual width.  Old: %hd New: %hd.\n"
+#define ACMSG4   "Font left bearing != actual left bearing.  " \
+                 "Old: %hd New: %hd.\n"
+#define ACMSG5   "Font ascent != actual ascent.  Old: %hd New: %hd.\n"
+#define ACMSG6   "Font descent != actual descent.  Old: %hd New: %hd.\n"
+#define ACMSG7   "Font height != actual height. Old: %hd New: %hd.\n"
+#define ACMSG8   "Glyph scalable width (SWIDTH) adjustments made.\n"
+#define ACMSG9   "SWIDTH field missing at line %ld.  Set automatically.\n"
+#define ACMSG10  "DWIDTH field missing at line %ld.  Set to glyph width.\n"
+#define ACMSG11  "SIZE bits per pixel field adjusted to %hd.\n"
+#define ACMSG12  "Duplicate encoding %ld (%s) changed to unencoded.\n"
+#define ACMSG13  "Glyph %ld extra rows removed.\n"
+#define ACMSG14  "Glyph %ld extra columns removed.\n"
+#define ACMSG15  "Incorrect glyph count: %ld indicated but %ld found.\n"
+#define ACMSG16  "Glyph %ld missing columns padded with zero bits.\n"
+
+  /* Error messages. */
+#define ERRMSG1  "[line %ld] Missing `%s' line.\n"
+#define ERRMSG2  "[line %ld] Font header corrupted or missing fields.\n"
+#define ERRMSG3  "[line %ld] Font glyphs corrupted or missing fields.\n"
+#define ERRMSG4  "[line %ld] BBX too big.\n"
+#define ERRMSG5  "[line %ld] `%s' value too big.\n"
+#define ERRMSG6  "[line %ld] Input line too long.\n"
+#define ERRMSG7  "[line %ld] Font name too long.\n"
+#define ERRMSG8  "[line %ld] Invalid `%s' value.\n"
+#define ERRMSG9  "[line %ld] Invalid keyword.\n"
+
+  /* Debug messages. */
+#define DBGMSG1  "  [%6ld] %s" /* no \n */
+#define DBGMSG2  " (0x%lX)\n"
+
+
   /*************************************************************************/
   /*                                                                       */
   /* Hash table utilities for the properties.                              */
@@ -377,7 +414,8 @@
     bdf_font_t*     font;
     bdf_options_t*  opts;
 
-    unsigned long   have[2048];
+    unsigned long   have[34816]; /* must be in sync with `nmod' and `umod' */
+                                 /* arrays from `bdf_font_t' structure     */
     _bdf_list_t     list;
 
     FT_Memory       memory;
@@ -424,7 +462,7 @@
     if ( num_items > list->size )
     {
       unsigned long  oldsize = list->size; /* same as _bdf_list_t.size */
-      unsigned long  newsize = oldsize + ( oldsize >> 1 ) + 4;
+      unsigned long  newsize = oldsize + ( oldsize >> 1 ) + 5;
       unsigned long  bigsize = (unsigned long)( FT_INT_MAX / sizeof ( char* ) );
       FT_Memory      memory  = list->memory;
 
@@ -507,6 +545,10 @@
   }
 
 
+  /* The code below ensures that we have at least 4 + 1 `field' */
+  /* elements in `list' (which are possibly NULL) so that we    */
+  /* don't have to check the number of fields in most cases.    */
+
   static FT_Error
   _bdf_list_split( _bdf_list_t*   list,
                    char*          separators,
@@ -521,6 +563,13 @@
 
     /* Initialize the list. */
     list->used = 0;
+    if ( list->size )
+    {
+      list->field[0] = (char*)empty;
+      list->field[1] = (char*)empty;
+      list->field[2] = (char*)empty;
+      list->field[3] = (char*)empty;
+    }
 
     /* If the line is empty, then simply return. */
     if ( linelen == 0 || line[0] == 0 )
@@ -687,6 +736,7 @@
 
           if ( buf_size >= 65536UL )  /* limit ourselves to 64KByte */
           {
+            FT_ERROR(( "_bdf_readstream: " ERRMSG6, lineno ));
             error = BDF_Err_Invalid_Argument;
             goto Exit;
           }
@@ -1079,33 +1129,6 @@
 #define _BDF_GLYPH_HEIGHT_CHECK  0x80000000UL
 
 
-  /* Auto correction messages. */
-#define ACMSG1   "FONT_ASCENT property missing.  " \
-                 "Added \"FONT_ASCENT %hd\".\n"
-#define ACMSG2   "FONT_DESCENT property missing.  " \
-                 "Added \"FONT_DESCENT %hd\".\n"
-#define ACMSG3   "Font width != actual width.  Old: %hd New: %hd.\n"
-#define ACMSG4   "Font left bearing != actual left bearing.  " \
-                 "Old: %hd New: %hd.\n"
-#define ACMSG5   "Font ascent != actual ascent.  Old: %hd New: %hd.\n"
-#define ACMSG6   "Font descent != actual descent.  Old: %hd New: %hd.\n"
-#define ACMSG7   "Font height != actual height. Old: %hd New: %hd.\n"
-#define ACMSG8   "Glyph scalable width (SWIDTH) adjustments made.\n"
-#define ACMSG9   "SWIDTH field missing at line %ld.  Set automatically.\n"
-#define ACMSG10  "DWIDTH field missing at line %ld.  Set to glyph width.\n"
-#define ACMSG11  "SIZE bits per pixel field adjusted to %hd.\n"
-#define ACMSG12  "Duplicate encoding %ld (%s) changed to unencoded.\n"
-#define ACMSG13  "Glyph %ld extra rows removed.\n"
-#define ACMSG14  "Glyph %ld extra columns removed.\n"
-#define ACMSG15  "Incorrect glyph count: %ld indicated but %ld found.\n"
-
-  /* Error messages. */
-#define ERRMSG1  "[line %ld] Missing \"%s\" line.\n"
-#define ERRMSG2  "[line %ld] Font header corrupted or missing fields.\n"
-#define ERRMSG3  "[line %ld] Font glyphs corrupted or missing fields.\n"
-#define ERRMSG4  "[line %ld] BBX too big.\n"
-
-
   static FT_Error
   _bdf_add_comment( bdf_font_t*    font,
                     char*          comment,
@@ -1137,7 +1160,8 @@
   /* default specified in the options.                                 */
   static FT_Error
   _bdf_set_default_spacing( bdf_font_t*     font,
-                            bdf_options_t*  opts )
+                            bdf_options_t*  opts,
+                            unsigned long   lineno )
   {
     size_t       len;
     char         name[256];
@@ -1162,6 +1186,7 @@
     /* Limit ourselves to 256 characters in the font name. */
     if ( len >= 256 )
     {
+      FT_ERROR(( "_bdf_set_default_spacing: " ERRMSG7, lineno ));
       error = BDF_Err_Invalid_Argument;
       goto Exit;
     }
@@ -1241,7 +1266,8 @@
     ep = line + linelen;
 
     /* Trim the leading whitespace if it exists. */
-    *sp++ = 0;
+    if ( *sp )
+      *sp++ = 0;
     while ( *sp                           &&
             ( *sp == ' ' || *sp == '\t' ) )
       sp++;
@@ -1265,9 +1291,10 @@
 
 
   static FT_Error
-  _bdf_add_property( bdf_font_t*  font,
-                     char*        name,
-                     char*        value )
+  _bdf_add_property( bdf_font_t*    font,
+                     char*          name,
+                     char*          value,
+                     unsigned long  lineno )
   {
     size_t          propid;
     hashnode        hn;
@@ -1405,6 +1432,7 @@
     {
       if ( !fp->value.atom )
       {
+        FT_ERROR(( "_bdf_add_property: " ERRMSG8, lineno, "SPACING" ));
         error = BDF_Err_Invalid_File_Format;
         goto Exit;
       }
@@ -1493,8 +1521,9 @@
 
       /* Limit ourselves to 1,114,112 glyphs in the font (this is the */
       /* number of code points available in Unicode).                 */
-      if ( p->cnt >= 1114112UL )
+      if ( p->cnt >= 0x110000UL )
       {
+        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "CHARS" ));
         error = BDF_Err_Invalid_Argument;
         goto Exit;
       }
@@ -1554,6 +1583,7 @@
 
       if ( !s )
       {
+        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG8, lineno, "STARTCHAR" ));
         error = BDF_Err_Invalid_File_Format;
         goto Exit;
       }
@@ -1565,6 +1595,8 @@
 
       p->flags |= _BDF_GLYPH;
 
+      FT_TRACE4(( DBGMSG1, lineno, s ));
+
       goto Exit;
     }
 
@@ -1585,11 +1617,23 @@
 
       p->glyph_enc = _bdf_atol( p->list.field[1], 0, 10 );
 
-      /* Check that the encoding is in the range [0,65536] because */
-      /* otherwise p->have (a bitmap with static size) overflows.  */
+      /* Normalize negative encoding values.  The specification only */
+      /* allows -1, but we can be more generous here.                */
+      if ( p->glyph_enc < -1 )
+        p->glyph_enc = -1;
+
+      /* Check for alternative encoding format. */
+      if ( p->glyph_enc == -1 && p->list.used > 2 )
+        p->glyph_enc = _bdf_atol( p->list.field[2], 0, 10 );
+
+      FT_TRACE4(( DBGMSG2, p->glyph_enc ));
+
+      /* Check that the encoding is in the Unicode range because  */
+      /* otherwise p->have (a bitmap with static size) overflows. */
       if ( p->glyph_enc > 0                               &&
            (size_t)p->glyph_enc >= sizeof ( p->have ) * 8 )
       {
+        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG5, lineno, "ENCODING" ));
         error = BDF_Err_Invalid_File_Format;
         goto Exit;
       }
@@ -1702,19 +1746,32 @@
       for ( i = 0; i < nibbles; i++ )
       {
         c = line[i];
+        if ( !isdigok( hdigits, c ) )
+          break;
         *bp = (FT_Byte)( ( *bp << 4 ) + a2i[c] );
         if ( i + 1 < nibbles && ( i & 1 ) )
           *++bp = 0;
       }
 
+      /* If any line has not enough columns,            */
+      /* indicate they have been padded with zero bits. */
+      if ( i < nibbles                            &&
+           !( p->flags & _BDF_GLYPH_WIDTH_CHECK ) )
+      {
+        FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG16, glyph->encoding ));
+        p->flags       |= _BDF_GLYPH_WIDTH_CHECK;
+        font->modified  = 1;
+      }
+
       /* Remove possible garbage at the right. */
       mask_index = ( glyph->bbx.width * p->font->bpp ) & 7;
       if ( glyph->bbx.width )
         *bp &= nibble_mask[mask_index];
 
       /* If any line has extra columns, indicate they have been removed. */
-      if ( ( line[nibbles] == '0' || a2i[(int)line[nibbles]] != 0 ) &&
-           !( p->flags & _BDF_GLYPH_WIDTH_CHECK )                   )
+      if ( i == nibbles                           &&
+           isdigok( hdigits, line[nibbles] )      &&
+           !( p->flags & _BDF_GLYPH_WIDTH_CHECK ) )
       {
         FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG14, glyph->encoding ));
         p->flags       |= _BDF_GLYPH_WIDTH_CHECK;
@@ -1729,12 +1786,7 @@
     if ( ft_memcmp( line, "SWIDTH", 6 ) == 0 )
     {
       if ( !( p->flags & _BDF_ENCODING ) )
-      {
-        /* Missing ENCODING field. */
-        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENCODING" ));
-        error = BDF_Err_Missing_Encoding_Field;
-        goto Exit;
-      }
+        goto Missing_Encoding;
 
       error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
       if ( error )
@@ -1749,6 +1801,9 @@
     /* Expect the DWIDTH (scalable width) field next. */
     if ( ft_memcmp( line, "DWIDTH", 6 ) == 0 )
     {
+      if ( !( p->flags & _BDF_ENCODING ) )
+        goto Missing_Encoding;
+
       error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
       if ( error )
         goto Exit;
@@ -1774,6 +1829,9 @@
     /* Expect the BBX field next. */
     if ( ft_memcmp( line, "BBX", 3 ) == 0 )
     {
+      if ( !( p->flags & _BDF_ENCODING ) )
+        goto Missing_Encoding;
+
       error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
       if ( error )
         goto Exit;
@@ -1851,10 +1909,10 @@
       }
 
       /* Allocate enough space for the bitmap. */
-      glyph->bpr   = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3;
+      glyph->bpr = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3;
 
       bitmap_size = glyph->bpr * glyph->bbx.height;
-      if ( bitmap_size > 0xFFFFU )
+      if ( glyph->bpr > 0xFFFFU || bitmap_size > 0xFFFFU )
       {
         FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno ));
         error = BDF_Err_Bbx_Too_Big;
@@ -1872,7 +1930,14 @@
       goto Exit;
     }
 
+    FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG9, lineno ));
     error = BDF_Err_Invalid_File_Format;
+    goto Exit;
+
+  Missing_Encoding:
+    /* Missing ENCODING field. */
+    FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENCODING" ));
+    error = BDF_Err_Missing_Encoding_Field;
 
   Exit:
     if ( error && ( p->flags & _BDF_GLYPH ) )
@@ -1917,7 +1982,8 @@
       {
         p->font->font_ascent = p->font->bbx.ascent;
         ft_sprintf( nbuf, "%hd", p->font->bbx.ascent );
-        error = _bdf_add_property( p->font, (char *)"FONT_ASCENT", nbuf );
+        error = _bdf_add_property( p->font, (char *)"FONT_ASCENT",
+                                   nbuf, lineno );
         if ( error )
           goto Exit;
 
@@ -1929,7 +1995,8 @@
       {
         p->font->font_descent = p->font->bbx.descent;
         ft_sprintf( nbuf, "%hd", p->font->bbx.descent );
-        error = _bdf_add_property( p->font, (char *)"FONT_DESCENT", nbuf );
+        error = _bdf_add_property( p->font, (char *)"FONT_DESCENT",
+                                   nbuf, lineno );
         if ( error )
           goto Exit;
 
@@ -1955,13 +2022,13 @@
       value += 7;
       if ( *value )
         *value++ = 0;
-      error = _bdf_add_property( p->font, name, value );
+      error = _bdf_add_property( p->font, name, value, lineno );
       if ( error )
         goto Exit;
     }
     else if ( _bdf_is_atom( line, linelen, &name, &value, p->font ) )
     {
-      error = _bdf_add_property( p->font, name, value );
+      error = _bdf_add_property( p->font, name, value, lineno );
       if ( error )
         goto Exit;
     }
@@ -1975,7 +2042,7 @@
       _bdf_list_shift( &p->list, 1 );
       value = _bdf_list_join( &p->list, ' ', &vlen );
 
-      error = _bdf_add_property( p->font, name, value );
+      error = _bdf_add_property( p->font, name, value, lineno );
       if ( error )
         goto Exit;
     }
@@ -2041,7 +2108,8 @@
 
       if ( ft_memcmp( line, "STARTFONT", 9 ) != 0 )
       {
-        /* No STARTFONT field is a good indication of a problem. */
+        /* we don't emit an error message since this code gets */
+        /* explicitly caught one level higher                  */
         error = BDF_Err_Missing_Startfont_Field;
         goto Exit;
       }
@@ -2154,6 +2222,7 @@
 
       if ( !s )
       {
+        FT_ERROR(( "_bdf_parse_start: " ERRMSG8, lineno, "FONT" ));
         error = BDF_Err_Invalid_File_Format;
         goto Exit;
       }
@@ -2167,7 +2236,7 @@
 
       /* If the font name is an XLFD name, set the spacing to the one in  */
       /* the font name.  If there is no spacing fall back on the default. */
-      error = _bdf_set_default_spacing( p->font, p->opts );
+      error = _bdf_set_default_spacing( p->font, p->opts, lineno );
       if ( error )
         goto Exit;
 
@@ -2248,14 +2317,16 @@
       /* for compiling fonts.                                   */
       p->font->font_ascent = p->font->bbx.ascent;
       ft_sprintf( nbuf, "%hd", p->font->bbx.ascent );
-      error = _bdf_add_property( p->font, (char *)"FONT_ASCENT", nbuf );
+      error = _bdf_add_property( p->font, (char *)"FONT_ASCENT",
+                                 nbuf, lineno );
       if ( error )
         goto Exit;
       FT_TRACE2(( "_bdf_parse_properties: " ACMSG1, p->font->bbx.ascent ));
 
       p->font->font_descent = p->font->bbx.descent;
       ft_sprintf( nbuf, "%hd", p->font->bbx.descent );
-      error = _bdf_add_property( p->font, (char *)"FONT_DESCENT", nbuf );
+      error = _bdf_add_property( p->font, (char *)"FONT_DESCENT",
+                                 nbuf, lineno );
       if ( error )
         goto Exit;
       FT_TRACE2(( "_bdf_parse_properties: " ACMSG2, p->font->bbx.descent ));
@@ -2269,6 +2340,7 @@
       goto Exit;
     }
 
+    FT_ERROR(( "_bdf_parse_start: " ERRMSG9, lineno ));
     error = BDF_Err_Invalid_File_Format;
 
   Exit:
@@ -2381,22 +2453,20 @@
 
     if ( p->flags & _BDF_START )
     {
+      /* The ENDFONT field was never reached or did not exist. */
+      if ( !( p->flags & _BDF_GLYPHS ) )
       {
-        /* The ENDFONT field was never reached or did not exist. */
-        if ( !( p->flags & _BDF_GLYPHS ) )
-        {
-          /* Error happened while parsing header. */
-          FT_ERROR(( "bdf_load_font: " ERRMSG2, lineno ));
-          error = BDF_Err_Corrupted_Font_Header;
-          goto Exit;
-        }
-        else
-        {
-          /* Error happened when parsing glyphs. */
-          FT_ERROR(( "bdf_load_font: " ERRMSG3, lineno ));
-          error = BDF_Err_Corrupted_Font_Glyphs;
-          goto Exit;
-        }
+        /* Error happened while parsing header. */
+        FT_ERROR(( "bdf_load_font: " ERRMSG2, lineno ));
+        error = BDF_Err_Corrupted_Font_Header;
+        goto Exit;
+      }
+      else
+      {
+        /* Error happened when parsing glyphs. */
+        FT_ERROR(( "bdf_load_font: " ERRMSG3, lineno ));
+        error = BDF_Err_Corrupted_Font_Glyphs;
+        goto Exit;
       }
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/module.mk
index fe06ae8e064..fe06ae8e064 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/rules.mk
index 6ff1614ddec..6ff1614ddec 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bdf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bdf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/Jamfile
index 3da986dce65..3da986dce65 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/ftbzip2.c b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/ftbzip2.c
index e443dc85e88..d60ee3ea0fa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/ftbzip2.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/ftbzip2.c
@@ -8,7 +8,7 @@
 /*  parse compressed PCF fonts, as found with many X11 server              */
 /*  distributions.                                                         */
 /*                                                                         */
-/*  Copyright 2010 by                                                      */
+/*  Copyright 2010, 2012 by                                                */
 /*  Joel Klinghed.                                                         */
 /*                                                                         */
 /*  Based on src/gzip/ftgzip.c, Copyright 2002 - 2010 by                   */
@@ -35,6 +35,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  Bzip2_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Bzip2
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/rules.mk
index 0ff2628b4a1..0ff2628b4a1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/bzip2/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/bzip2/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/Jamfile
index 340cff77423..340cff77423 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcache.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcache.c
index d41e91e5ec1..d41e91e5ec1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcache.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcache.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcbasic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcbasic.c
index 09d793ecf2e..d4fc353c42d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcbasic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcbasic.c
@@ -467,7 +467,7 @@
   }
 
 
-  
+
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 
   /* yet another backwards-legacy structure */
@@ -608,7 +608,7 @@
   const FTC_SFamilyClassRec  ftc_basic_sbit_family_class =
   {
     {
-      sizeof( FTC_BasicFamilyRec ),
+      sizeof ( FTC_BasicFamilyRec ),
       ftc_basic_family_compare,
       ftc_basic_family_init,
       0,                            /* FTC_MruNode_ResetFunc */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccache.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccache.c
index f01c403f828..f01c403f828 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccache.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccache.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccache.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccache.h
index d60984f77f7..d60984f77f7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccache.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccache.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccback.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccback.h
index 80ec9ce44b7..80ec9ce44b7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccback.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccback.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccmap.c
index b7bd2919d98..ad436ef0cfa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftccmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftccmap.c
@@ -320,7 +320,7 @@
 
     /*
      * If cmap_index is greater than the maximum number of cachable
-     * charmaps, we assume the request is from a legacy rogue client 
+     * charmaps, we assume the request is from a legacy rogue client
      * using old internal header. See include/config/ftoption.h.
      */
     if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE && !no_cmap_change )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcerror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcerror.h
index 5998d42daf6..0e055709bb7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcerror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcerror.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Caching sub-system error codes (specification only).                 */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  FTC_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Cache
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcglyph.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcglyph.c
index 441e177238a..441e177238a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcglyph.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcglyph.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcglyph.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcglyph.h
index 5fed19cb8fa..5fed19cb8fa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcglyph.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcglyph.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcimage.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcimage.c
index c242ece021e..c242ece021e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcimage.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcimage.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcimage.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcimage.h
index 20d5d3e07df..20d5d3e07df 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcimage.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcimage.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmanag.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmanag.c
index 548ebe951fd..76a510d049d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmanag.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmanag.c
@@ -28,7 +28,7 @@
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "cache system does not support PIC yet"
-#endif 
+#endif
 
 
 #undef  FT_COMPONENT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmanag.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmanag.h
index d6c85162a5c..d6c85162a5c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmanag.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmanag.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmru.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmru.c
index dc8b4cc3970..dc8b4cc3970 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmru.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmru.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmru.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmru.h
index 8c3797fb055..8c3797fb055 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcmru.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcmru.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcsbits.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcsbits.c
index 8bf8d607eb1..8bf8d607eb1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcsbits.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcsbits.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcsbits.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcsbits.h
index df55dca8066..df55dca8066 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/ftcsbits.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/ftcsbits.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/rules.mk
index ed75a6a91fd..ed75a6a91fd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cache/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cache/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/Jamfile
index 6705d3cfdb7..6705d3cfdb7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cff.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cff.c
index fccfd442f5d..fccfd442f5d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cff.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cff.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffcmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffcmap.c
index 1298371105d..1298371105d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffcmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffcmap.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffcmap.h
index 3f7f67bbe05..3f7f67bbe05 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffdrivr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffdrivr.c
index bf2d016c05d..eb4c14ee5d3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -125,7 +125,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    Load_Glyph                                                         */
+  /*    cff_glyph_load                                                     */
   /*                                                                       */
   /* <Description>                                                         */
   /*    A driver method used to load a glyph within a given glyph slot.    */
@@ -149,10 +149,10 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_CALLBACK_DEF( FT_Error )
-  Load_Glyph( FT_GlyphSlot  cffslot,        /* CFF_GlyphSlot */
-              FT_Size       cffsize,        /* CFF_Size      */
-              FT_UInt       glyph_index,
-              FT_Int32      load_flags )
+  cff_glyph_load( FT_GlyphSlot  cffslot,      /* CFF_GlyphSlot */
+                  FT_Size       cffsize,      /* CFF_Size      */
+                  FT_UInt       glyph_index,
+                  FT_Int32      load_flags )
   {
     FT_Error       error;
     CFF_GlyphSlot  slot = (CFF_GlyphSlot)cffslot;
@@ -203,7 +203,7 @@
 
     for ( nn = 0; nn < count; nn++ )
     {
-      error = Load_Glyph( slot, face->size, start + nn, flags );
+      error = cff_glyph_load( slot, face->size, start + nn, flags );
       if ( error )
         break;
 
@@ -239,7 +239,7 @@
                  " cannot get glyph name from CFF & CEF fonts\n"
                  "                   "
                  " without the `PSNames' module\n" ));
-      error = CFF_Err_Unknown_File_Format;
+      error = CFF_Err_Missing_Module;
       goto Exit;
     }
 
@@ -466,7 +466,7 @@
                                                     dict->cid_registry );
         *registry = cff->registry;
       }
-      
+
       if ( ordering )
       {
         if ( cff->ordering == NULL )
@@ -489,7 +489,7 @@
         *supplement = (FT_Int)dict->cid_supplement;
       }
     }
-      
+
   Fail:
     return error;
   }
@@ -599,19 +599,35 @@
   cff_get_interface( FT_Module    driver,       /* CFF_Driver */
                      const char*  module_interface )
   {
+    FT_Library           library;
     FT_Module            sfnt;
     FT_Module_Interface  result;
 
 
+    /* FT_CFF_SERVICES_GET derefers `library' in PIC mode */
+#ifdef FT_CONFIG_OPTION_PIC
+    if ( !driver )
+      return NULL;
+    library = driver->library;
+    if ( !library )
+      return NULL;
+#endif
+
     result = ft_service_list_lookup( FT_CFF_SERVICES_GET, module_interface );
     if ( result != NULL )
-      return  result;
+      return result;
 
+    /* `driver' is not yet evaluated in non-PIC mode */
+#ifndef FT_CONFIG_OPTION_PIC
     if ( !driver )
       return NULL;
+    library = driver->library;
+    if ( !library )
+      return NULL;
+#endif
 
     /* we pass our request to the `sfnt' module */
-    sfnt = FT_Get_Module( driver->library, "sfnt" );
+    sfnt = FT_Get_Module( library, "sfnt" );
 
     return sfnt ? sfnt->clazz->get_interface( sfnt, module_interface ) : 0;
   }
@@ -625,12 +641,13 @@
 #define CFF_SIZE_SELECT 0
 #endif
 
-  FT_DEFINE_DRIVER(cff_driver_class,
+  FT_DEFINE_DRIVER( cff_driver_class,
+
       FT_MODULE_FONT_DRIVER       |
       FT_MODULE_DRIVER_SCALABLE   |
       FT_MODULE_DRIVER_HAS_HINTER,
 
-      sizeof( CFF_DriverRec ),
+      sizeof ( CFF_DriverRec ),
       "cff",
       0x10000L,
       0x20000L,
@@ -642,9 +659,9 @@
       cff_get_interface,
 
     /* now the specific driver fields */
-    sizeof( TT_FaceRec ),
-    sizeof( CFF_SizeRec ),
-    sizeof( CFF_GlyphSlotRec ),
+    sizeof ( TT_FaceRec ),
+    sizeof ( CFF_SizeRec ),
+    sizeof ( CFF_GlyphSlotRec ),
 
     cff_face_init,
     cff_face_done,
@@ -653,14 +670,14 @@
     cff_slot_init,
     cff_slot_done,
 
-    ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */
+    ft_stub_set_char_sizes,  /* FT_CONFIG_OPTION_OLD_INTERNALS */
     ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
-    Load_Glyph,
+    cff_glyph_load,
 
     cff_get_kerning,
-    0,                      /* FT_Face_AttachFunc      */
-    cff_get_advances,       /* FT_Face_GetAdvancesFunc */
+    0,                       /* FT_Face_AttachFunc */
+    cff_get_advances,
 
     cff_size_request,
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffdrivr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffdrivr.h
index 50e8138701e..50e8138701e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffdrivr.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfferrs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfferrs.h
index 1b2a5c95c88..801d73ec6b7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfferrs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfferrs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CFF error codes (specification only).                                */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  CFF_Err_
 #define FT_ERR_BASE    FT_Mod_Err_CFF
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffgload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffgload.c
index cb06bdf10aa..84847fda570 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffgload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffgload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType Glyph Loader (body).                                        */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1513,11 +1513,9 @@
               goto Stack_Underflow;
 
             /* if num_args isn't of the form 4n or 4n+1, */
-            /* we reduce it to 4n+1                      */
+            /* we enforce it by clearing the second bit  */
 
-            nargs = num_args - num_args % 4;
-            if ( num_args - nargs > 0 )
-              nargs += 1;
+            nargs = num_args & ~2;
 
             if ( cff_builder_start_point( builder, x, y ) )
               goto Fail;
@@ -1560,11 +1558,9 @@
               goto Stack_Underflow;
 
             /* if num_args isn't of the form 4n or 4n+1, */
-            /* we reduce it to 4n+1                      */
+            /* we enforce it by clearing the second bit  */
 
-            nargs = num_args - num_args % 4;
-            if ( num_args - nargs > 0 )
-              nargs += 1;
+            nargs = num_args & ~2;
 
             if ( cff_builder_start_point( builder, x, y ) )
               goto Fail;
@@ -1612,11 +1608,9 @@
               goto Stack_Underflow;
 
             /* if num_args isn't of the form 8n, 8n+1, 8n+4, or 8n+5, */
-            /* we reduce it to the largest one which fits             */
+            /* we enforce it by clearing the second bit               */
 
-            nargs = num_args - num_args % 4;
-            if ( num_args - nargs > 0 )
-              nargs += 1;
+            nargs = num_args & ~2;
 
             args -= nargs;
             if ( check_points( builder, ( nargs / 4 ) * 3 ) )
@@ -1963,6 +1957,7 @@
             /* Save glyph width so that the subglyphs don't overwrite it. */
             FT_Pos  glyph_width = decoder->glyph_width;
 
+
             error = cff_operator_seac( decoder,
                                        0L, args[-4], args[-3],
                                        (FT_Int)( args[-2] >> 16 ),
@@ -2705,7 +2700,7 @@
       FT_Byte   fd_index = cff_fd_select_get( &cff->fd_select,
                                               glyph_index );
 
-      if ( fd_index >= cff->num_subfonts ) 
+      if ( fd_index >= cff->num_subfonts )
         fd_index = (FT_Byte)( cff->num_subfonts - 1 );
 
       top_upm = cff->top_font.font_dict.units_per_em;
@@ -2961,7 +2956,7 @@
         if ( has_vertical_info )
           metrics->vertBearingX = metrics->horiBearingX -
                                     metrics->horiAdvance / 2;
-        else 
+        else
         {
           if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
             ft_synthesize_vertical_metrics( metrics,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffgload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffgload.h
index 38937be5c11..38937be5c11 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffgload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffload.c
index 8bbf4743e0f..2be6ba06837 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffload.c
@@ -1458,7 +1458,7 @@
          font->header_size      < 4 ||
          font->absolute_offsize > 4 )
     {
-      FT_TRACE2(( "[not a CFF font header]\n" ));
+      FT_TRACE2(( "  not a CFF font header\n" ));
       error = CFF_Err_Unknown_File_Format;
       goto Exit;
     }
@@ -1576,7 +1576,7 @@
     if ( dict->charstrings_offset == 0 )
     {
       FT_ERROR(( "cff_font_load: no charstrings offset\n" ));
-      error = CFF_Err_Unknown_File_Format;
+      error = CFF_Err_Invalid_File_Format;
       goto Exit;
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffload.h
index c755de9a200..804961964b8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffload.h
@@ -60,7 +60,7 @@ FT_BEGIN_HEADER
 
 
   FT_LOCAL( FT_Error )
-  cff_font_load( FT_Library library, 
+  cff_font_load( FT_Library library,
                  FT_Stream  stream,
                  FT_Int     face_index,
                  CFF_Font   font,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffobjs.c
index 15707a2a3c3..6ad0e508974 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType objects manager (body).                                     */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -403,7 +403,7 @@
     FT_Int32  idx             = 0;
     FT_Int32  length          = strlen( name ) + 1;
     FT_Bool   continue_search = 1;
- 
+
 
     while ( continue_search )
     {
@@ -494,13 +494,19 @@
     sfnt = (SFNT_Service)FT_Get_Module_Interface(
              library, "sfnt" );
     if ( !sfnt )
-      goto Bad_Format;
+    {
+      FT_ERROR(( "cff_face_init: cannot access `sfnt' module\n" ));
+      error = CFF_Err_Missing_Module;
+      goto Exit;
+    }
 
     FT_FACE_FIND_GLOBAL_SERVICE( face, psnames, POSTSCRIPT_CMAPS );
 
     pshinter = (PSHinter_Service)FT_Get_Module_Interface(
                  library, "pshinter" );
 
+    FT_TRACE2(( "CFF driver\n" ));
+
     /* create input stream from resource */
     if ( FT_STREAM_SEEK( 0 ) )
       goto Exit;
@@ -511,8 +517,9 @@
     {
       if ( face->format_tag != TTAG_OTTO )  /* `OTTO'; OpenType/CFF font */
       {
-        FT_TRACE2(( "[not a valid OpenType/CFF font]\n" ));
-        goto Bad_Format;
+        FT_TRACE2(( "  not an OpenType/CFF font\n" ));
+        error = CFF_Err_Unknown_File_Format;
+        goto Exit;
       }
 
       /* if we are performing a simple font format check, exit immediately */
@@ -604,7 +611,8 @@
                    " cannot open CFF & CEF fonts\n"
                    "              "
                    " without the `PSNames' module\n" ));
-        goto Bad_Format;
+        error = CFF_Err_Missing_Module;
+        goto Exit;
       }
 
 #ifdef FT_DEBUG_LEVEL_TRACE
@@ -772,7 +780,7 @@
           char*  family_name = NULL;
 
 
-          remove_subset_prefix( cffface->family_name ); 
+          remove_subset_prefix( cffface->family_name );
 
           if ( dict->family_name )
           {
@@ -819,7 +827,7 @@
                 style_name = cff_strcpy( memory, fullp );
 
                 /* remove the style part from the family name (if present) */
-                remove_style( cffface->family_name, style_name ); 
+                remove_style( cffface->family_name, style_name );
               }
               break;
             }
@@ -847,22 +855,22 @@
         /*                                                                 */
         /* Compute face flags.                                             */
         /*                                                                 */
-        flags = (FT_UInt32)( FT_FACE_FLAG_SCALABLE   | /* scalable outlines */
-                             FT_FACE_FLAG_HORIZONTAL | /* horizontal data   */
-                             FT_FACE_FLAG_HINTER );    /* has native hinter */
+        flags = FT_FACE_FLAG_SCALABLE   | /* scalable outlines */
+                FT_FACE_FLAG_HORIZONTAL | /* horizontal data   */
+                FT_FACE_FLAG_HINTER;      /* has native hinter */
 
         if ( sfnt_format )
-          flags |= (FT_UInt32)FT_FACE_FLAG_SFNT;
+          flags |= FT_FACE_FLAG_SFNT;
 
         /* fixed width font? */
         if ( dict->is_fixed_pitch )
-          flags |= (FT_UInt32)FT_FACE_FLAG_FIXED_WIDTH;
+          flags |= FT_FACE_FLAG_FIXED_WIDTH;
 
   /* XXX: WE DO NOT SUPPORT KERNING METRICS IN THE GPOS TABLE FOR NOW */
 #if 0
         /* kerning available? */
         if ( face->kern_pairs )
-          flags |= (FT_UInt32)FT_FACE_FLAG_KERNING;
+          flags |= FT_FACE_FLAG_KERNING;
 #endif
 
         cffface->face_flags = flags;
@@ -1014,10 +1022,6 @@
 
   Exit:
     return error;
-
-  Bad_Format:
-    error = CFF_Err_Unknown_File_Format;
-    goto Exit;
   }
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffobjs.h
index 3c81cee0094..3c81cee0094 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffparse.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffparse.c
index 61fa87c8098..61fa87c8098 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffparse.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffparse.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffparse.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffparse.h
index 61d91ed2e2d..61d91ed2e2d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffparse.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffpic.c
new file mode 100644
index 00000000000..1c19d58bcbf
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffpic.c
@@ -0,0 +1,148 @@
+/***************************************************************************/
+/*                                                                         */
+/*  cffpic.c                                                               */
+/*                                                                         */
+/*    The FreeType position independent code services for cff module.      */
+/*                                                                         */
+/*  Copyright 2009, 2010 by                                                */
+/*  Oran Agra and Mickey Gabel.                                            */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_OBJECTS_H
+#include "cffcmap.h"
+#include "cffpic.h"
+#include "cfferrs.h"
+
+#ifdef FT_CONFIG_OPTION_PIC
+
+  /* forward declaration of PIC init functions from cffdrivr.c */
+  FT_Error
+  FT_Create_Class_cff_services(
+    FT_Library           library,
+    FT_ServiceDescRec**  output_class );
+
+  void
+  FT_Destroy_Class_cff_services(
+    FT_Library          library,
+    FT_ServiceDescRec*  clazz );
+
+  void
+  FT_Init_Class_cff_service_ps_info(
+    FT_Library             library,
+    FT_Service_PsInfoRec*  clazz );
+
+  void
+  FT_Init_Class_cff_service_glyph_dict(
+    FT_Library                library,
+    FT_Service_GlyphDictRec*  clazz );
+
+  void
+  FT_Init_Class_cff_service_ps_name(
+    FT_Library                 library,
+    FT_Service_PsFontNameRec*  clazz );
+
+  void
+  FT_Init_Class_cff_service_get_cmap_info(
+    FT_Library              library,
+    FT_Service_TTCMapsRec*  clazz );
+
+  void
+  FT_Init_Class_cff_service_cid_info(
+    FT_Library          library,
+    FT_Service_CIDRec*  clazz );
+
+  /* forward declaration of PIC init functions from cffparse.c */
+  FT_Error
+  FT_Create_Class_cff_field_handlers(
+    FT_Library           library,
+    CFF_Field_Handler**  output_class );
+
+  void
+  FT_Destroy_Class_cff_field_handlers(
+    FT_Library          library,
+    CFF_Field_Handler*  clazz );
+
+  void
+  cff_driver_class_pic_free( FT_Library  library )
+  {
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
+    if ( pic_container->cff )
+    {
+      CffModulePIC*  container = ( CffModulePIC* )pic_container->cff;
+
+
+      if ( container->cff_services )
+        FT_Destroy_Class_cff_services( library,
+                                       container->cff_services );
+      container->cff_services = NULL;
+      if ( container->cff_field_handlers )
+        FT_Destroy_Class_cff_field_handlers(
+          library, container->cff_field_handlers );
+      container->cff_field_handlers = NULL;
+      FT_FREE( container );
+      pic_container->cff = NULL;
+    }
+  }
+
+
+  FT_Error
+  cff_driver_class_pic_init( FT_Library  library )
+  {
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Error           error         = CFF_Err_Ok;
+    CffModulePIC*      container;
+    FT_Memory          memory        = library->memory;
+
+
+    /* allocate pointer, clear and set global container pointer */
+    if ( FT_ALLOC ( container, sizeof ( *container ) ) )
+      return error;
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
+    pic_container->cff = container;
+
+    /* initialize pointer table - this is how the module usually expects this data */
+    error = FT_Create_Class_cff_services( library,
+                                          &container->cff_services );
+    if ( error )
+      goto Exit;
+    error = FT_Create_Class_cff_field_handlers(
+              library, &container->cff_field_handlers );
+    if ( error )
+      goto Exit;
+    FT_Init_Class_cff_service_ps_info(
+      library, &container->cff_service_ps_info );
+    FT_Init_Class_cff_service_glyph_dict(
+      library, &container->cff_service_glyph_dict );
+    FT_Init_Class_cff_service_ps_name(
+      library, &container->cff_service_ps_name );
+    FT_Init_Class_cff_service_get_cmap_info(
+      library, &container->cff_service_get_cmap_info );
+    FT_Init_Class_cff_service_cid_info(
+      library, &container->cff_service_cid_info );
+    FT_Init_Class_cff_cmap_encoding_class_rec(
+      library, &container->cff_cmap_encoding_class_rec );
+    FT_Init_Class_cff_cmap_unicode_class_rec(
+      library, &container->cff_cmap_unicode_class_rec );
+Exit:
+    if ( error )
+      cff_driver_class_pic_free( library );
+    return error;
+  }
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffpic.h
index e29d068134b..342edd84520 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cffpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cffpic.h
@@ -19,7 +19,7 @@
 #ifndef __CFFPIC_H__
 #define __CFFPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -68,6 +68,13 @@ FT_BEGIN_HEADER
 #define FT_CFF_CMAP_UNICODE_CLASS_REC_GET  (GET_PIC(library)->cff_cmap_unicode_class_rec)
 #define FT_CFF_FIELD_HANDLERS_GET          (GET_PIC(library)->cff_field_handlers)
 
+  /* see cffpic.c for the implementation */
+  void
+  cff_driver_class_pic_free( FT_Library  library );
+
+  FT_Error
+  cff_driver_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfftoken.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfftoken.h
index bcb4276a78f..bcb4276a78f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfftoken.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfftoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfftypes.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfftypes.h
index cae368956b5..7c99036b50f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/cfftypes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/cfftypes.h
@@ -269,7 +269,7 @@ FT_BEGIN_HEADER
     /* since version 2.3.6 */
     FT_String*       registry;
     FT_String*       ordering;
-      
+
   } CFF_FontRec, *CFF_Font;
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/module.mk
index ef1391c279b..ef1391c279b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/rules.mk
index ca7aa5de890..ca7aa5de890 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cff/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cff/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/Jamfile
index ebeaed54ea2..ebeaed54ea2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/ciderrs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/ciderrs.h
index 01813e18986..ef13155504e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/ciderrs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/ciderrs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID error codes (specification only).                                */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  CID_Err_
 #define FT_ERR_BASE    FT_Mod_Err_CID
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidgload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidgload.c
index 81742d167a1..bd840234004 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidgload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidgload.c
@@ -426,7 +426,7 @@
       metrics->horiBearingX = cbox.xMin;
       metrics->horiBearingY = cbox.yMax;
 
-      if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) 
+      if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
       {
         /* make up vertical ones */
         ft_synthesize_vertical_metrics( metrics,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidgload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidgload.h
index a0a91bfea83..a0a91bfea83 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidgload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidload.c
index 5f712bcf175..3b840b73b6a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID-keyed Type1 font loader (body).                                  */
 /*                                                                         */
-/*  Copyright 1996-2006, 2009, 2011 by                                     */
+/*  Copyright 1996-2006, 2009, 2011-2012 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -147,8 +147,8 @@
 
 
   FT_CALLBACK_DEF( FT_Error )
-  parse_font_matrix( CID_Face     face,
-                     CID_Parser*  parser )
+  cid_parse_font_matrix( CID_Face     face,
+                         CID_Parser*  parser )
   {
     FT_Matrix*    matrix;
     FT_Vector*    offset;
@@ -268,7 +268,7 @@
 #include "cidtoken.h"
 
     T1_FIELD_CALLBACK( "FDArray",         parse_fd_array, 0 )
-    T1_FIELD_CALLBACK( "FontMatrix",      parse_font_matrix, 0 )
+    T1_FIELD_CALLBACK( "FontMatrix",      cid_parse_font_matrix, 0 )
     T1_FIELD_CALLBACK( "ExpansionFactor", parse_expansion_factor, 0 )
 
     { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
@@ -513,8 +513,8 @@
 
 
   static void
-  t1_init_loader( CID_Loader*  loader,
-                  CID_Face     face )
+  cid_init_loader( CID_Loader*  loader,
+                   CID_Face     face )
   {
     FT_UNUSED( face );
 
@@ -522,8 +522,8 @@
   }
 
 
-  static void
-  t1_done_loader( CID_Loader*  loader )
+  static  void
+  cid_done_loader( CID_Loader*  loader )
   {
     CID_Parser*  parser = &loader->parser;
 
@@ -641,7 +641,7 @@
     FT_Error     error;
 
 
-    t1_init_loader( &loader, face );
+    cid_init_loader( &loader, face );
 
     parser = &loader.parser;
     error = cid_parser_new( parser, face->root.stream, face->root.memory,
@@ -682,7 +682,7 @@
     error = cid_read_subrs( face );
 
   Exit:
-    t1_done_loader( &loader );
+    cid_done_loader( &loader );
     return error;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidload.h
index 8c172ffee2d..8c172ffee2d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidobjs.c
index eb82168888c..cc2a2008e76 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID objects manager (body).                                          */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by       */
+/*  Copyright 1996-2006, 2008, 2010-2011 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -299,6 +299,13 @@
       psaux = (PSAux_Service)FT_Get_Module_Interface(
                 FT_FACE_LIBRARY( face ), "psaux" );
 
+      if ( !psaux )
+      {
+        FT_ERROR(( "cid_face_init: cannot access `psaux' module\n" ));
+        error = CID_Err_Missing_Module;
+        goto Exit;
+      }
+
       face->psaux = psaux;
     }
 
@@ -311,6 +318,8 @@
       face->pshinter = pshinter;
     }
 
+    FT_TRACE2(( "CID driver\n" ));
+
     /* open the tokenizer; this will also check the font format */
     if ( FT_STREAM_SEEK( 0 ) )
       goto Exit;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidobjs.h
index aee346d1c88..aee346d1c88 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidparse.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidparse.c
index efed618f5af..4d21160ceac 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidparse.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidparse.c
@@ -73,7 +73,7 @@
     if ( ft_strncmp( (char *)stream->cursor,
                      "%!PS-Adobe-3.0 Resource-CIDFont", 31 ) )
     {
-      FT_TRACE2(( "[not a valid CID-keyed font]\n" ));
+      FT_TRACE2(( "  not a CID-keyed font\n" ));
       error = CID_Err_Unknown_File_Format;
     }
 
@@ -99,7 +99,7 @@
         if ( stream_len == 0 )
         {
           FT_TRACE2(( "cid_parser_new: no `StartData' keyword found\n" ));
-          error = CID_Err_Unknown_File_Format;
+          error = CID_Err_Invalid_File_Format;
           goto Exit;
         }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidparse.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidparse.h
index ca37deab936..ca37deab936 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidparse.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidriver.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidriver.c
index 86ee3bba344..694070aab7d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidriver.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidriver.c
@@ -111,13 +111,13 @@
 
     if ( registry )
       *registry = cid->registry;
-      
+
     if ( ordering )
       *ordering = cid->ordering;
 
     if ( supplement )
       *supplement = cid->supplement;
-      
+
     return CID_Err_Ok;
   }
 
@@ -196,7 +196,7 @@
       FT_MODULE_DRIVER_SCALABLE   |
       FT_MODULE_DRIVER_HAS_HINTER,
 
-      sizeof( FT_DriverRec ),
+      sizeof ( FT_DriverRec ),
       "t1cid",   /* module name           */
       0x10000L,  /* version 1.0 of driver */
       0x20000L,  /* requires FreeType 2.0 */
@@ -209,9 +209,9 @@
     },
 
     /* then the other font drivers fields */
-    sizeof( CID_FaceRec ),
-    sizeof( CID_SizeRec ),
-    sizeof( CID_GlyphSlotRec ),
+    sizeof ( CID_FaceRec ),
+    sizeof ( CID_SizeRec ),
+    sizeof ( CID_GlyphSlotRec ),
 
     cid_face_init,
     cid_face_done,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidriver.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidriver.h
index c7f424bb389..3c45e068862 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidriver.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidriver.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_CALLBACK_TABLE
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidtoken.h b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidtoken.h
index 904cb09cf4d..904cb09cf4d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/cidtoken.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/cidtoken.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/module.mk
index ce30bfd7ae4..ce30bfd7ae4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/rules.mk
index f3627446126..f3627446126 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/type1cid.c b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/type1cid.c
index 0b866e97c44..0b866e97c44 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/cid/type1cid.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/cid/type1cid.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/Jamfile
index 88049a625d3..88049a625d3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/README b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/README
index 28e535b0bcc..28e535b0bcc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvalid.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvalid.c
index bc36e675d14..bc36e675d14 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvalid.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvalid.h
index 27be9ecca85..27be9ecca85 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvbsln.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvbsln.c
index 3d100315636..3d100315636 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvbsln.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvbsln.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvcommn.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvcommn.c
index d3c48d4ea6b..72efd6ff5d4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvcommn.c
@@ -1334,7 +1334,7 @@
     l[1] = stateArray_length_p;
     l[2] = entryTable_length_p;
 
-    gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid );
+    gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, valid );
   }
 
 
@@ -1704,9 +1704,9 @@
                         const FT_String*  name,
                         GXV_odtect_Range  odtect )
   {
-    odtect->range[ odtect->nRanges ].start  = start;
-    odtect->range[ odtect->nRanges ].length = length;
-    odtect->range[ odtect->nRanges ].name   = (FT_String*)name;
+    odtect->range[odtect->nRanges].start  = start;
+    odtect->range[odtect->nRanges].length = length;
+    odtect->range[odtect->nRanges].name   = (FT_String*)name;
     odtect->nRanges++;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvcommn.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvcommn.h
index 35c043dbd83..1ff87e4423c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvcommn.h
@@ -4,7 +4,8 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT common tables validation (specification).             */
 /*                                                                         */
-/*  Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
+/*  Copyright 2004, 2005, 2012                                             */
+/*  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,       */
@@ -316,7 +317,7 @@ FT_BEGIN_HEADER
 #define GXV_32BIT_ALIGNMENT_VALIDATE( a ) \
           FT_BEGIN_STMNT                  \
             {                             \
-              if ( 0 != ( (a) % 4 ) )     \
+              if ( (a) & 3 )              \
                 FT_INVALID_OFFSET ;       \
             }                             \
           FT_END_STMNT
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxverror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxverror.h
index 01961992273..7d2ef780975 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxverror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxverror.h
@@ -4,7 +4,8 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT validation module error codes (specification only).   */
 /*                                                                         */
-/*  Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
+/*  Copyright 2004, 2005, 2012                                             */
+/*    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,       */
@@ -38,6 +39,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  GXV_Err_
 #define FT_ERR_BASE    FT_Mod_Err_GXV
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfeat.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfeat.c
index 46792bbf98d..6f75650991a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfeat.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfeat.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueTypeGX/AAT feat table validation (body).                         */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2008 by                                          */
+/*  Copyright 2004, 2005, 2008, 2012 by                                    */
 /*  suzuki toshiya, Masatake YAMATO, Red Hat K.K.,                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
@@ -176,7 +176,7 @@
     setting = FT_NEXT_USHORT( p );
 
     /* If we have exclusive setting, the setting should be odd. */
-    if ( exclusive && ( setting % 2 ) == 0 )
+    if ( exclusive && ( setting & 1 ) == 0 )
       FT_INVALID_DATA;
 
     gxv_feat_name_index_validate( p, limit, valid );
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfeat.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfeat.h
index 049d23a0b92..049d23a0b92 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfeat.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfeat.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfgen.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfgen.c
index e48778a2a15..e48778a2a15 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvfgen.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvfgen.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvjust.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvjust.c
index 7816e0b7fb8..7816e0b7fb8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvjust.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvjust.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvkern.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvkern.c
index 0ec978f7bee..0ec978f7bee 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvkern.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvkern.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvlcar.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvlcar.c
index f14fa5b1313..f14fa5b1313 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvlcar.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvlcar.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmod.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmod.c
index b2b16b1ff38..502fe5dca70 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmod.c
@@ -269,7 +269,7 @@
   const FT_Module_Class  gxv_module_class =
   {
     0,
-    sizeof( FT_ModuleRec ),
+    sizeof ( FT_ModuleRec ),
     "gxvalid",
     0x10000L,
     0x20000L,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmod.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmod.h
index d912a8f8381..22732ba9920 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmod.h
@@ -36,7 +36,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Module_Class )  gxv_module_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort.c
index 465462a0502..465462a0502 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort.h
index 1e5a1f5ab68..1e5a1f5ab68 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort0.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort0.c
index b136ceda275..b136ceda275 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort0.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort0.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort1.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort1.c
index 1c17a5d92ad..1c17a5d92ad 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort1.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort1.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort2.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort2.c
index 9e08fb792a2..9e08fb792a2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort2.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort2.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort4.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort4.c
index 83470988c09..83470988c09 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort4.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort4.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort5.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort5.c
index 32cfb036399..32cfb036399 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmort5.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmort5.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx.c
index 4b1dd00507e..4b1dd00507e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx.h
index 28c1a44f6fb..28c1a44f6fb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx0.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx0.c
index 6a736c17750..6a736c17750 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx0.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx0.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx1.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx1.c
index ce0009a16f1..ce0009a16f1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx1.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx1.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx2.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx2.c
index 9d2b0bc4af0..9d2b0bc4af0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx2.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx2.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx4.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx4.c
index c0d2f78e397..c0d2f78e397 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx4.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx4.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx5.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx5.c
index d8cf7007978..d8cf7007978 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvmorx5.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvmorx5.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvopbd.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvopbd.c
index e1250609460..e1250609460 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvopbd.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvopbd.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvprop.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvprop.c
index 54777271aab..0be21336f86 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvprop.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvprop.c
@@ -233,7 +233,7 @@
 
     /* XXX: check range? */
     offset = (FT_UShort)( base_value_p->u +
-                          relative_gindex * sizeof( FT_UShort ) );
+                          relative_gindex * sizeof ( FT_UShort ) );
     p      = valid->lookuptbl_head + offset;
     limit  = lookuptbl_limit;
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvtrak.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvtrak.c
index 11fbd7ccfb8..11fbd7ccfb8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/gxvtrak.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/gxvtrak.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/module.mk
index 9fd098e2c5e..9fd098e2c5e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/rules.mk
index 57bc0823db7..57bc0823db7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gxvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gxvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/Jamfile
index a7aafa05180..a7aafa05180 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/adler32.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/adler32.c
index c53f9dd125d..c53f9dd125d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/adler32.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/adler32.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/ftgzip.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/ftgzip.c
index 52966ece71e..f3d2ef94fcd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/ftgzip.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/ftgzip.c
@@ -8,7 +8,7 @@
 /*  parse compressed PCF fonts, as found with many X11 server              */
 /*  distributions.                                                         */
 /*                                                                         */
-/*  Copyright 2002-2006, 2009-2011 by                                      */
+/*  Copyright 2002-2006, 2009-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -32,6 +32,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  Gzip_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Gzip
 
@@ -42,7 +43,7 @@
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "gzip code does not support PIC yet"
-#endif 
+#endif
 
 #ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infblock.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infblock.c
index d6e2dc297da..d6e2dc297da 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infblock.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infblock.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infblock.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infblock.h
index c2535a1e452..c2535a1e452 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infblock.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infblock.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infcodes.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infcodes.c
index f7bfd58c4ff..f7bfd58c4ff 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infcodes.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infcodes.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infcodes.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infcodes.h
index 154d7f896ca..154d7f896ca 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infcodes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infcodes.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inffixed.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inffixed.h
index 4d4760ea00e..4d4760ea00e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inffixed.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inffixed.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inflate.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inflate.c
index 8877fa3eb2b..8877fa3eb2b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inflate.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inflate.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inftrees.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inftrees.c
index ef536521686..ef536521686 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inftrees.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inftrees.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inftrees.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inftrees.h
index 07bf2aa0bf8..07bf2aa0bf8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/inftrees.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/inftrees.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infutil.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infutil.c
index 6087b406473..6087b406473 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infutil.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infutil.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infutil.h
index 7174b6dd0ff..7174b6dd0ff 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/infutil.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/infutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/rules.mk
index d2a43a6a890..d2a43a6a890 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zconf.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zconf.h
index 3abf0ba03b0..3abf0ba03b0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zconf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zconf.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zlib.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zlib.h
index 50d0d3f146d..50d0d3f146d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zlib.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zlib.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zutil.c b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zutil.c
index 7ad0c1f81bb..7ad0c1f81bb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zutil.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zutil.h b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zutil.h
index c9688cd9c04..c9688cd9c04 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/gzip/zutil.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/gzip/zutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/Jamfile
index 6f1f516e7cf..6f1f516e7cf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftlzw.c b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftlzw.c
index 7f254999ad8..35e392b43c4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftlzw.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftlzw.c
@@ -8,7 +8,7 @@
 /*  be used to parse compressed PCF fonts, as found with many X11 server   */
 /*  distributions.                                                         */
 /*                                                                         */
-/*  Copyright 2004, 2005, 2006, 2009, 2010 by                              */
+/*  Copyright 2004-2006, 2009, 2010, 2012 by                               */
 /*  Albert Chin-A-Young.                                                   */
 /*                                                                         */
 /*  Based on code in src/gzip/ftgzip.c, Copyright 2004 by                  */
@@ -34,6 +34,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  LZW_Err_
 #define FT_ERR_BASE    FT_Mod_Err_LZW
 
@@ -44,7 +45,7 @@
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "lzw code does not support PIC yet"
-#endif 
+#endif
 
 #include "ftzopen.h"
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftzopen.c b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftzopen.c
index d7a64576bad..d7a64576bad 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftzopen.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftzopen.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftzopen.h b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftzopen.h
index f7d2936be2f..f7d2936be2f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/ftzopen.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/ftzopen.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/rules.mk
index 5550a48d64b..5550a48d64b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/lzw/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/lzw/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/Jamfile
index b457143de4f..b457143de4f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/module.mk
index 9cadde55e46..9cadde55e46 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvalid.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvalid.c
index d5c2b75abb6..d5c2b75abb6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvalid.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvalid.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvalid.h b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvalid.h
index eb99b9cc48e..eb99b9cc48e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvalid.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvalid.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvbase.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvbase.c
index d742d2dc95f..d742d2dc95f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvbase.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvbase.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvcommn.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvcommn.c
index a4f885b51f8..a4f885b51f8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvcommn.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvcommn.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvcommn.h b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvcommn.h
index 898887fc954..898887fc954 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvcommn.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvcommn.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otverror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otverror.h
index 041b538368c..522f4a20073 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otverror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otverror.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType validation module error codes (specification only).         */
 /*                                                                         */
-/*  Copyright 2004, 2005 by                                                */
+/*  Copyright 2004, 2005, 2012 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  OTV_Err_
 #define FT_ERR_BASE    FT_Mod_Err_OTvalid
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgdef.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgdef.c
index 3633ad0de18..3633ad0de18 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgdef.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgdef.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgpos.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgpos.c
index 49b46183a32..49b46183a32 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgpos.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgpos.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgpos.h b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgpos.h
index 14ca408261d..14ca408261d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgpos.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgpos.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgsub.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgsub.c
index ed499d1e92d..ed499d1e92d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvgsub.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvgsub.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvjstf.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvjstf.c
index a616a23432c..a616a23432c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvjstf.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvjstf.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmath.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmath.c
index 96f841f2a9c..96f841f2a9c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmath.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmath.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmod.c b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmod.c
index 620e45233dd..acf213f237d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmod.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmod.c
@@ -266,7 +266,7 @@
   const FT_Module_Class  otv_module_class =
   {
     0,
-    sizeof( FT_ModuleRec ),
+    sizeof ( FT_ModuleRec ),
     "otvalid",
     0x10000L,
     0x20000L,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmod.h b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmod.h
index 573b2a0c4b9..f7e1550787a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/otvmod.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/otvmod.h
@@ -29,7 +29,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Module_Class )  otv_module_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/rules.mk
index 53bd41e5e7d..53bd41e5e7d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/otvalid/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/otvalid/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/Jamfile
index 752fcac2a11..752fcac2a11 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/README b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/README
index 8858d68ca94..8858d68ca94 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/module.mk
index df383ff0fbe..df383ff0fbe 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcf.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcf.c
index 11d5b7b2a06..11d5b7b2a06 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcf.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcf.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcf.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcf.h
index af0ffc33781..af0ffc33781 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcf.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfdrivr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfdrivr.c
index af2a2d986f3..ba5448842ad 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfdrivr.c
@@ -2,8 +2,7 @@
 
     FreeType font driver for pcf files
 
-    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009,
-                  2010 by
+    Copyright (C) 2000-2004, 2006-2011 by
     Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,7 +35,7 @@ THE SOFTWARE.
 #include FT_BZIP2_H
 #include FT_ERRORS_H
 #include FT_BDF_H
-#include FT_TRUETYPE_IDS_H 
+#include FT_TRUETYPE_IDS_H
 
 #include "pcf.h"
 #include "pcfdrivr.h"
@@ -248,8 +247,6 @@ THE SOFTWARE.
     FT_FREE( face->charset_encoding );
     FT_FREE( face->charset_registry );
 
-    FT_TRACE4(( "PCF_Face_Done: done face\n" ));
-
     /* close compressed stream if any */
     if ( pcfface->stream == &face->comp_stream )
     {
@@ -274,6 +271,8 @@ THE SOFTWARE.
     FT_UNUSED( face_index );
 
 
+    FT_TRACE2(( "PCF driver\n" ));
+
     error = pcf_load_font( stream, face );
     if ( error )
     {
@@ -405,7 +404,7 @@ THE SOFTWARE.
     return error;
 
   Fail:
-    FT_TRACE2(( "[not a valid PCF file]\n" ));
+    FT_TRACE2(( "  not a PCF file\n" ));
     PCF_Face_Done( pcfface );
     error = PCF_Err_Unknown_File_Format;  /* error */
     goto Exit;
@@ -684,8 +683,8 @@ THE SOFTWARE.
 
       0,
 
-      0,
-      0,
+      0,                    /* FT_Module_Constructor */
+      0,                    /* FT_Module_Destructor  */
       pcf_driver_requester
     },
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfdrivr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfdrivr.h
index a81d7309e5f..54614951b5d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfdrivr.h
@@ -35,7 +35,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
   FT_EXPORT_VAR( const FT_Driver_ClassRec )  pcf_driver_class;
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcferror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcferror.h
index d75c067aa6a..e51fff8ea60 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcferror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcferror.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PCF error codes (specification only).                                */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  PCF_Err_
 #define FT_ERR_BASE    FT_Mod_Err_PCF
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfread.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfread.c
index f8c2a239b95..d9914c03a13 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfread.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfread.c
@@ -2,8 +2,7 @@
 
     FreeType font driver for pcf fonts
 
-  Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-            2010 by
+  Copyright 2000-2010, 2012 by
   Francesco Zappa Nardelli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -496,7 +495,8 @@ THE SOFTWARE.
       goto Bail;
     }
 
-    if ( FT_NEW_ARRAY( strings, string_size ) )
+    /* allocate one more byte so that we have a final null byte */
+    if ( FT_NEW_ARRAY( strings, string_size + 1 ) )
       goto Bail;
 
     error = FT_Stream_Read( stream, (FT_Byte*)strings, string_size );
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfread.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfread.h
index c9524f13464..c9524f13464 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfread.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfread.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfutil.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfutil.c
index b91274f935b..b91274f935b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfutil.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfutil.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfutil.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfutil.h
index ce10fb541d5..ce10fb541d5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/pcfutil.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/pcfutil.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/rules.mk
index 78641528fab..78641528fab 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pcf/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pcf/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/Jamfile
index 9e2f2b8d050..9e2f2b8d050 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/module.mk
index 8d1d28a9d23..8d1d28a9d23 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfr.c
index eb2c4edb7ec..eb2c4edb7ec 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfr.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrcmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrcmap.c
index 9c8f9ed8eb3..9c8f9ed8eb3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrcmap.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrcmap.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrcmap.h
index a6269530543..a6269530543 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrcmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrdrivr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrdrivr.c
index 0053050a2ad..c59d8ae98bd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrdrivr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrdrivr.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR driver interface (body).                                */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2008, 2010 by                        */
+/*  Copyright 2002-2004, 2006, 2008, 2010, 2011 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -173,7 +173,7 @@
       FT_MODULE_FONT_DRIVER     |
       FT_MODULE_DRIVER_SCALABLE,
 
-      sizeof( FT_DriverRec ),
+      sizeof ( FT_DriverRec ),
 
       "pfr",
       0x10000L,
@@ -181,14 +181,14 @@
 
       NULL,
 
-      0,
-      0,
+      0,                /* FT_Module_Constructor */
+      0,                /* FT_Module_Destructor  */
       pfr_get_service
     },
 
-    sizeof( PFR_FaceRec ),
-    sizeof( PFR_SizeRec ),
-    sizeof( PFR_SlotRec ),
+    sizeof ( PFR_FaceRec ),
+    sizeof ( PFR_SizeRec ),
+    sizeof ( PFR_SlotRec ),
 
     pfr_face_init,
     pfr_face_done,
@@ -205,9 +205,9 @@
 
     pfr_get_kerning,
     0,                  /* FT_Face_AttachFunc      */
-    0,                   /* FT_Face_GetAdvancesFunc */
-    0,                  /* FT_Size_RequestFunc */
-    0,                  /* FT_Size_SelectFunc  */
+    0,                  /* FT_Face_GetAdvancesFunc */
+    0,                  /* FT_Size_RequestFunc     */
+    0,                  /* FT_Size_SelectFunc      */
   };
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrdrivr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrdrivr.h
index da0a1aa6344..75f86c5cddf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrdrivr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrdrivr.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Driver_ClassRec )  pfr_driver_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrerror.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrerror.h
index 2e1c401dd23..94dc8c5e1c1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrerror.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrerror.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PFR error codes (specification only).                                */
 /*                                                                         */
-/*  Copyright 2002 by                                                      */
+/*  Copyright 2002, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  PFR_Err_
 #define FT_ERR_BASE    FT_Mod_Err_PFR
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrgload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrgload.c
index 6f65b01f5e9..6f65b01f5e9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrgload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrgload.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrgload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrgload.h
index 7cc7a8702a4..7cc7a8702a4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrgload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrload.c
index 325322e9869..325322e9869 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrload.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrload.h
index ed010715d1c..ed010715d1c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrobjs.c
index 3e5e86e2109..c65cf29909c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType PFR object methods (body).                                  */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by            */
+/*  Copyright 2002-2008, 2010-2011 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -23,7 +23,7 @@
 #include "pfrsbit.h"
 #include FT_OUTLINE_H
 #include FT_INTERNAL_DEBUG_H
-#include FT_TRUETYPE_IDS_H 
+#include FT_TRUETYPE_IDS_H
 
 #include "pfrerror.h"
 
@@ -77,6 +77,8 @@
     FT_UNUSED( params );
 
 
+    FT_TRACE2(( "PFR driver\n" ));
+
     /* load the header and check it */
     error = pfr_header_load( &face->header, stream );
     if ( error )
@@ -84,7 +86,7 @@
 
     if ( !pfr_header_check( &face->header ) )
     {
-      FT_TRACE4(( "pfr_face_init: not a valid PFR font\n" ));
+      FT_TRACE2(( "  not a PFR font\n" ));
       error = PFR_Err_Unknown_File_Format;
       goto Exit;
     }
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrobjs.h
index f6aa8b44cc6..f6aa8b44cc6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrsbit.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrsbit.c
index 52bc2c8c39a..52bc2c8c39a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrsbit.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrsbit.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrsbit.h
index 015e9e6dada..015e9e6dada 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrsbit.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrtypes.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrtypes.h
index 918310814c5..918310814c5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/pfrtypes.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/pfrtypes.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/rules.mk
index 60b96c74154..60b96c74154 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pfr/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pfr/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/Jamfile
index faeded90445..faeded90445 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/afmparse.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/afmparse.c
index d7de3736f7f..5f3f9e61588 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/afmparse.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/afmparse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    AFM parser (body).                                                   */
 /*                                                                         */
-/*  Copyright 2006, 2007, 2008, 2009, 2010 by                              */
+/*  Copyright 2006-2010, 2012 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -631,9 +631,6 @@
         tk->max_ptsize = shared_vals[3].u.f;
         tk->max_kern   = shared_vals[4].u.f;
 
-        /* is this correct? */
-        if ( tk->degree < 0 && tk->min_kern > 0 )
-          tk->min_kern = -tk->min_kern;
         break;
 
       case AFM_TOKEN_ENDTRACKKERN:
@@ -754,7 +751,7 @@
       case AFM_TOKEN_ENDFONTMETRICS:
         fi->NumKernPair = n + 1;
         ft_qsort( fi->KernPairs, fi->NumKernPair,
-                  sizeof( AFM_KernPairRec ),
+                  sizeof ( AFM_KernPairRec ),
                   afm_compare_kern_pairs );
         return PSaux_Err_Ok;
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/afmparse.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/afmparse.h
index 35d96046c5d..35d96046c5d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/afmparse.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/afmparse.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/module.mk
index 42bf6f51999..42bf6f51999 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psaux.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psaux.c
index a4b9c5c6e45..a4b9c5c6e45 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psaux.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psaux.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxerr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxerr.h
index d0baa3cbb9c..d52375f8cb8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxerr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxerr.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PS auxiliary module error codes (specification only).                */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  PSaux_Err_
 #define FT_ERR_BASE    FT_Mod_Err_PSaux
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxmod.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxmod.c
index 4c3579f7b8e..4b1249d49b6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxmod.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxmod.c
@@ -123,7 +123,7 @@
   const FT_Module_Class  psaux_module_class =
   {
     0,
-    sizeof( FT_ModuleRec ),
+    sizeof ( FT_ModuleRec ),
     "psaux",
     0x20000L,
     0x20000L,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxmod.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxmod.h
index 35e042dbce7..12172369248 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psauxmod.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psauxmod.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Module_Class )  psaux_driver_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psconv.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psconv.c
index 1531d8f0fb5..9ea7fb98880 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psconv.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psconv.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Some convenience conversions (body).                                 */
 /*                                                                         */
-/*  Copyright 2006, 2008, 2009 by                                          */
+/*  Copyright 2006, 2008, 2009, 2012 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -79,7 +79,7 @@
     FT_Bool   sign = 0;
 
 
-    if ( p == limit || base < 2 || base > 36 )
+    if ( p >= limit || base < 2 || base > 36 )
       return 0;
 
     if ( *p == '-' || *p == '+' )
@@ -150,7 +150,7 @@
     FT_Bool   sign = 0;
 
 
-    if ( p == limit )
+    if ( p >= limit )
       return 0;
 
     if ( *p == '-' || *p == '+' )
@@ -346,7 +346,11 @@
 
 #if 1
 
-    p  = *cursor;
+    p = *cursor;
+
+    if ( p >= limit )
+      return 0;
+
     if ( n > (FT_UInt)( limit - p ) )
       n = (FT_UInt)( limit - p );
 
@@ -434,6 +438,10 @@
 #if 1
 
     p = *cursor;
+
+    if ( p >= limit )
+      return 0;
+
     if ( n > (FT_UInt)(limit - p) )
       n = (FT_UInt)(limit - p);
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psconv.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psconv.h
index 84854ba0d16..84854ba0d16 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psconv.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psconv.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psobjs.c
index a28b5fc241b..06df6e66493 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auxiliary functions for PostScript fonts (body).                     */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -589,7 +589,7 @@
     }
 
   Exit:
-    if ( cur == parser->cursor )
+    if ( cur < limit && cur == parser->cursor )
     {
       FT_ERROR(( "ps_parser_skip_PS_token:"
                  " current token is `%c' which is self-delimiting\n"
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psobjs.h
index e380c60dabb..e380c60dabb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/psobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/psobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/rules.mk
index 7a1be37b692..7a1be37b692 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1cmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1cmap.c
index f933e4da88d..9e5bd34ffec 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1cmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1cmap.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 character map support (body).                                 */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007 by                                    */
+/*  Copyright 2002, 2003, 2006, 2007, 2012 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -264,8 +264,8 @@
   /*************************************************************************/
 
   FT_CALLBACK_DEF( const char * )
-  t1_get_glyph_name( T1_Face  face,
-                     FT_UInt  idx )
+  psaux_get_glyph_name( T1_Face  face,
+                        FT_UInt  idx )
   {
     return face->type1.glyph_names[idx];
   }
@@ -282,7 +282,7 @@
     return psnames->unicodes_init( memory,
                                    unicodes,
                                    face->type1.num_glyphs,
-                                   (PS_GetGlyphNameFunc)&t1_get_glyph_name,
+                                   (PS_GetGlyphNameFunc)&psaux_get_glyph_name,
                                    (PS_FreeGlyphNameFunc)NULL,
                                    (FT_Pointer)face );
   }
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1cmap.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1cmap.h
index 7ae65d2fa16..7ae65d2fa16 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1cmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1cmap.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1decode.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1decode.c
index b3ccbdde0d0..ea678412245 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1decode.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1decode.c
@@ -199,7 +199,7 @@
 
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     T1_Face      face  = (T1_Face)decoder->builder.face;
-#endif     
+#endif
 
 
     if ( decoder->seac )
@@ -400,7 +400,7 @@
     if ( decoder->buildchar && decoder->len_buildchar > 0 )
       ft_memset( &decoder->buildchar[0],
                  0,
-                 sizeof( decoder->buildchar[0] ) * decoder->len_buildchar );
+                 sizeof ( decoder->buildchar[0] ) * decoder->len_buildchar );
 
     FT_TRACE4(( "\n"
                 "Start charstring\n" ));
@@ -880,7 +880,7 @@
             ft_memcpy( &decoder->buildchar[idx],
                        blend->weight_vector,
                        blend->num_designs *
-                         sizeof( blend->weight_vector[0] ) );
+                         sizeof ( blend->weight_vector[0] ) );
           }
           break;
 
@@ -1113,7 +1113,7 @@
             FT_TRACE4(( "BuildCharArray = [ " ));
 
             for ( i = 0; i < decoder->len_buildchar; ++i )
-              FT_TRACE4(( "%d ", decoder->buildchar[ i ] ));
+              FT_TRACE4(( "%d ", decoder->buildchar[i] ));
 
             FT_TRACE4(( "]\n" ));
           }
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1decode.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1decode.h
index 00728db501e..00728db501e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psaux/t1decode.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psaux/t1decode.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/Jamfile
index 779f1b0b828..779f1b0b828 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/module.mk
index ed24eb7fa89..ed24eb7fa89 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshalgo.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshalgo.c
index d798978914a..d798978914a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshalgo.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshalgo.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshalgo.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshalgo.h
index 1a248a70524..1a248a70524 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshalgo.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshalgo.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshglob.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshglob.c
index 31231ad0094..31231ad0094 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshglob.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshglob.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshglob.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshglob.h
index c511626157a..c511626157a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshglob.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshglob.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshinter.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshinter.c
index b35a2a91c53..b35a2a91c53 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshinter.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshinter.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshmod.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshmod.c
index 91da5d7e6bc..91da5d7e6bc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshmod.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshmod.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshmod.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshmod.h
index 0ae7e96f54e..0ae7e96f54e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshmod.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshmod.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshnterr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshnterr.h
index 3c0029fbf39..7cc180f0cac 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshnterr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshnterr.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PS Hinter error codes (specification only).                          */
 /*                                                                         */
-/*  Copyright 2003 by                                                      */
+/*  Copyright 2003, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  PSH_Err_
 #define FT_ERR_BASE    FT_Mod_Err_PShinter
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshpic.c
index 5efb4229489..1e0f9a9dcff 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshpic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshpic.c
@@ -20,17 +20,22 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "pshpic.h"
+#include "pshnterr.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from pshmod.c */
-  void FT_Init_Class_pshinter_interface( FT_Library, PSHinter_Interface*);
+  void
+  FT_Init_Class_pshinter_interface( FT_Library           library,
+                                    PSHinter_Interface*  clazz );
 
   void
-  pshinter_module_class_pic_free( FT_Library library )
+  pshinter_module_class_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
     if ( pic_container->pshinter )
     {
       FT_FREE( pic_container->pshinter );
@@ -53,13 +58,14 @@
       return error;
     FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->pshinter = container;
-    
+
     /* add call to initialization function when you add new scripts */
-    FT_Init_Class_pshinter_interface(library, &container->pshinter_interface);
+    FT_Init_Class_pshinter_interface(
+      library, &container->pshinter_interface );
 
 /*Exit:*/
-    if(error)
-      pshinter_module_class_pic_free(library);
+    if( error )
+      pshinter_module_class_pic_free( library );
     return error;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshpic.h
index 3555d8e8513..c10bdd99969 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshpic.h
@@ -19,7 +19,7 @@
 #ifndef __PSHPIC_H__
 #define __PSHPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -40,6 +40,12 @@ FT_BEGIN_HEADER
 #define GET_PIC(lib)                    ((PSHinterPIC*)((lib)->pic_container.autofit))
 #define FTPSHINTER_INTERFACE_GET        (GET_PIC(library)->pshinter_interface)
 
+  /* see pshpic.c for the implementation */
+  void
+  pshinter_module_class_pic_free( FT_Library  library );
+
+  FT_Error
+  pshinter_module_class_pic_init( FT_Library  library );
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshrec.c b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshrec.c
index 0910cc5e6a5..0910cc5e6a5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshrec.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshrec.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshrec.h b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshrec.h
index dcb3197f94d..dcb3197f94d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/pshrec.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/pshrec.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/rules.mk
index 888ece10589..888ece10589 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/pshinter/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/pshinter/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/Jamfile
index 06c0dda66f2..06c0dda66f2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/module.mk
index a6e908257cb..a6e908257cb 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psmodule.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psmodule.c
index 7528696938a..361917415fa 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psmodule.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psmodule.c
@@ -521,7 +521,7 @@
 
 
 #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-  FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, 
+  FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
     (PS_Unicode_ValueFunc)     ps_unicode_value,
     (PS_Unicodes_InitFunc)     ps_unicodes_init,
     (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index,
@@ -536,7 +536,7 @@
 
 #else
 
-  FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, 
+  FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
     0,
     0,
     0,
@@ -552,7 +552,7 @@
 #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
 
 
-  FT_DEFINE_SERVICEDESCREC1(pscmaps_services, 
+  FT_DEFINE_SERVICEDESCREC1(pscmaps_services,
     FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET
   )
 
@@ -563,7 +563,19 @@
   psnames_get_service( FT_Module    module,
                        const char*  service_id )
   {
+    /* FT_PSCMAPS_SERVICES_GET derefers `library' in PIC mode */
+#ifdef FT_CONFIG_OPTION_PIC
+    FT_Library  library;
+
+
+    if ( !module )
+      return NULL;
+    library = module->library;
+    if ( !library )
+      return NULL;
+#else
     FT_UNUSED( module );
+#endif
 
     return ft_service_list_lookup( FT_PSCMAPS_SERVICES_GET, service_id );
   }
@@ -578,7 +590,7 @@
 #endif
 
   FT_DEFINE_MODULE(psnames_module_class,
-  
+
     0,  /* this is not a font driver, nor a renderer */
     sizeof ( FT_ModuleRec ),
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psmodule.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psmodule.h
index 28fa14807c0..28fa14807c0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psmodule.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psmodule.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psnamerr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psnamerr.h
index ae1541d960a..acda7f967ee 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psnamerr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psnamerr.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    PS names module error codes (specification only).                    */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  PSnames_Err_
 #define FT_ERR_BASE    FT_Mod_Err_PSnames
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psnames.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psnames.c
index 1ede225dc9c..1ede225dc9c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/psnames.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/psnames.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pspic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pspic.c
index b9075d5a5a6..467ab7329e6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pspic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pspic.c
@@ -20,24 +20,37 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "pspic.h"
+#include "psnamerr.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from psmodule.c */
-  FT_Error FT_Create_Class_pscmaps_services( FT_Library, FT_ServiceDescRec**);
-  void FT_Destroy_Class_pscmaps_services( FT_Library, FT_ServiceDescRec*);
-  void FT_Init_Class_pscmaps_interface( FT_Library, FT_Service_PsCMapsRec*);
+  FT_Error
+  FT_Create_Class_pscmaps_services( FT_Library           library,
+                                    FT_ServiceDescRec**  output_class );
+  void
+  FT_Destroy_Class_pscmaps_services( FT_Library          library,
+                                     FT_ServiceDescRec*  clazz );
 
   void
-  psnames_module_class_pic_free(  FT_Library library )
+  FT_Init_Class_pscmaps_interface( FT_Library              library,
+                                   FT_Service_PsCMapsRec*  clazz );
+
+  void
+  psnames_module_class_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
     if ( pic_container->psnames )
     {
-      PSModulePIC* container = (PSModulePIC*)pic_container->psnames;
+      PSModulePIC*  container = (PSModulePIC*)pic_container->psnames;
+
+
       if(container->pscmaps_services)
-        FT_Destroy_Class_pscmaps_services(library, container->pscmaps_services);
+        FT_Destroy_Class_pscmaps_services( library,
+                                           container->pscmaps_services );
       container->pscmaps_services = NULL;
       FT_FREE( container );
       pic_container->psnames = NULL;
@@ -57,18 +70,20 @@
     /* allocate pointer, clear and set global container pointer */
     if ( FT_ALLOC ( container, sizeof ( *container ) ) )
       return error;
-    FT_MEM_SET( container, 0, sizeof(*container) );
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->psnames = container;
 
     /* initialize pointer table - this is how the module usually expects this data */
-    error = FT_Create_Class_pscmaps_services(library, &container->pscmaps_services);
-    if(error) 
+    error = FT_Create_Class_pscmaps_services(
+              library, &container->pscmaps_services );
+    if ( error )
       goto Exit;
-    FT_Init_Class_pscmaps_interface(library, &container->pscmaps_interface);
-    
+    FT_Init_Class_pscmaps_interface( library,
+                                     &container->pscmaps_interface );
+
 Exit:
-    if(error)
-      psnames_module_class_pic_free(library);
+    if ( error )
+      psnames_module_class_pic_free( library );
     return error;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pspic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pspic.h
index 75a14fdcb9b..1169b89f0c8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pspic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pspic.h
@@ -19,7 +19,7 @@
 #ifndef __PSPIC_H__
 #define __PSPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -42,6 +42,13 @@ FT_BEGIN_HEADER
 #define FT_PSCMAPS_SERVICES_GET     (GET_PIC(library)->pscmaps_services)
 #define FT_PSCMAPS_INTERFACE_GET    (GET_PIC(library)->pscmaps_interface)
 
+  /* see pspic.c for the implementation */
+  void
+  psnames_module_class_pic_free( FT_Library  library );
+
+  FT_Error
+  psnames_module_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pstables.h b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pstables.h
index 0a6637f9853..0a6637f9853 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/pstables.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/pstables.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/rules.mk
index 4cd39a8ccf1..4cd39a8ccf1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/psnames/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/psnames/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/Jamfile
index 4f60e87c788..4f60e87c788 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftmisc.h b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftmisc.h
index 7773924feb6..7773924feb6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftmisc.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftmisc.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftraster.c b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftraster.c
index 55e2d0d75ac..f85845ec63a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftraster.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftraster.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph rasterizer (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011 by */
+/*  Copyright 1996-2003, 2005, 2007-2012 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -369,18 +369,23 @@
 
   /* Simple record used to implement a stack of bands, required */
   /* by the sub-banding mechanism                               */
-  typedef struct  TBand_
+  typedef struct  black_TBand_
   {
     Short  y_min;   /* band's minimum */
     Short  y_max;   /* band's maximum */
 
-  } TBand;
+  } black_TBand;
 
 
 #define AlignProfileSize \
   ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( long ) )
 
 
+#undef RAS_ARG
+#undef RAS_ARGS
+#undef RAS_VAR
+#undef RAS_VARS
+
 #ifdef FT_STATIC_RASTER
 
 
@@ -396,8 +401,8 @@
 #else /* !FT_STATIC_RASTER */
 
 
-#define RAS_ARGS       PWorker    worker,
-#define RAS_ARG        PWorker    worker
+#define RAS_ARGS       black_PWorker  worker,
+#define RAS_ARG        black_PWorker  worker
 
 #define RAS_VARS       worker,
 #define RAS_VAR        worker
@@ -408,7 +413,7 @@
 #endif /* !FT_STATIC_RASTER */
 
 
-  typedef struct TWorker_  TWorker, *PWorker;
+  typedef struct black_TWorker_  black_TWorker, *black_PWorker;
 
 
   /* prototypes used for sweep function dispatch */
@@ -428,6 +433,10 @@
 
 
   /* NOTE: These operations are only valid on 2's complement processors */
+#undef FLOOR
+#undef CEILING
+#undef TRUNC
+#undef SCALED
 
 #define FLOOR( x )    ( (x) & -ras.precision )
 #define CEILING( x )  ( ( (x) + ras.precision - 1 ) & -ras.precision )
@@ -442,7 +451,7 @@
   /* Thus, their offset can be coded with less opcodes, resulting in a   */
   /* smaller executable.                                                 */
 
-  struct  TWorker_
+  struct  black_TWorker_
   {
     Int         precision_bits;     /* precision related variables         */
     Int         precision;
@@ -515,8 +524,8 @@
 
     TPoint      arcs[3 * MaxBezier + 1]; /* The Bezier stack               */
 
-    TBand       band_stack[16];     /* band stack used for sub-banding     */
-    Int         band_top;           /* band stack top                      */
+    black_TBand  band_stack[16];    /* band stack used for sub-banding     */
+    Int          band_top;          /* band stack top                      */
 
 #ifdef FT_RASTER_OPTION_ANTI_ALIASING
 
@@ -540,20 +549,20 @@
   };
 
 
-  typedef struct  TRaster_
+  typedef struct  black_TRaster_
   {
-    char*    buffer;
-    long     buffer_size;
-    void*    memory;
-    PWorker  worker;
-    Byte     grays[5];
-    Short    gray_width;
+    char*          buffer;
+    long           buffer_size;
+    void*          memory;
+    black_PWorker  worker;
+    Byte           grays[5];
+    Short          gray_width;
 
-  } TRaster, *PRaster;
+  } black_TRaster, *black_PRaster;
 
 #ifdef FT_STATIC_RASTER
 
-  static TWorker  cur_ras;
+  static black_TWorker  cur_ras;
 #define ras  cur_ras
 
 #else /* !FT_STATIC_RASTER */
@@ -3391,7 +3400,7 @@
 
 
   static void
-  ft_black_init( PRaster  raster )
+  ft_black_init( black_PRaster  raster )
   {
 #ifdef FT_RASTER_OPTION_ANTI_ALIASING
     FT_UInt  n;
@@ -3419,7 +3428,7 @@
   ft_black_new( void*       memory,
                 FT_Raster  *araster )
   {
-     static TRaster  the_raster;
+     static black_TRaster  the_raster;
      FT_UNUSED( memory );
 
 
@@ -3443,11 +3452,11 @@
 
 
   static int
-  ft_black_new( FT_Memory   memory,
-                PRaster    *araster )
+  ft_black_new( FT_Memory       memory,
+                black_PRaster  *araster )
   {
-    FT_Error  error;
-    PRaster   raster = NULL;
+    FT_Error       error;
+    black_PRaster  raster = NULL;
 
 
     *araster = 0;
@@ -3464,9 +3473,11 @@
 
 
   static void
-  ft_black_done( PRaster  raster )
+  ft_black_done( black_PRaster  raster )
   {
     FT_Memory  memory = (FT_Memory)raster->memory;
+
+
     FT_FREE( raster );
   }
 
@@ -3475,15 +3486,15 @@
 
 
   static void
-  ft_black_reset( PRaster  raster,
-                  char*    pool_base,
-                  long     pool_size )
+  ft_black_reset( black_PRaster  raster,
+                  char*          pool_base,
+                  long           pool_size )
   {
     if ( raster )
     {
-      if ( pool_base && pool_size >= (long)sizeof(TWorker) + 2048 )
+      if ( pool_base && pool_size >= (long)sizeof ( black_TWorker ) + 2048 )
       {
-        PWorker  worker = (PWorker)pool_base;
+        black_PWorker  worker = (black_PWorker)pool_base;
 
 
         raster->buffer      = pool_base + ( ( sizeof ( *worker ) + 7 ) & ~7 );
@@ -3501,7 +3512,7 @@
 
 
   static void
-  ft_black_set_mode( PRaster        raster,
+  ft_black_set_mode( black_PRaster  raster,
                      unsigned long  mode,
                      const char*    palette )
   {
@@ -3528,12 +3539,12 @@
 
 
   static int
-  ft_black_render( PRaster                  raster,
+  ft_black_render( black_PRaster            raster,
                    const FT_Raster_Params*  params )
   {
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
     const FT_Bitmap*   target_map = params->target;
-    PWorker            worker;
+    black_PWorker      worker;
 
 
     if ( !raster || !raster->buffer || !raster->buffer_size )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftraster.h b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftraster.h
index 80fe46debaf..80fe46debaf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftraster.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftraster.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftrend1.c b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftrend1.c
index 28b1b589712..859cb7d864f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftrend1.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftrend1.c
@@ -244,10 +244,10 @@
   }
 
 
-  FT_DEFINE_RENDERER(ft_raster1_renderer_class,
-    
+  FT_DEFINE_RENDERER( ft_raster1_renderer_class,
+
       FT_MODULE_RENDERER,
-      sizeof( FT_RendererRec ),
+      sizeof ( FT_RendererRec ),
 
       "raster1",
       0x10000L,
@@ -275,11 +275,10 @@
   /* to register it by hand in your application.  It should only be    */
   /* used for backwards-compatibility with FT 1.x anyway.              */
   /*                                                                   */
-  FT_DEFINE_RENDERER(ft_raster5_renderer_class,
-  
-    
+  FT_DEFINE_RENDERER( ft_raster5_renderer_class,
+
       FT_MODULE_RENDERER,
-      sizeof( FT_RendererRec ),
+      sizeof ( FT_RendererRec ),
 
       "raster5",
       0x10000L,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftrend1.h b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftrend1.h
index 4cf128622a9..4cf128622a9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/ftrend1.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/ftrend1.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/module.mk
index cbff5df96ea..cbff5df96ea 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/raster.c b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/raster.c
index 1202a116cdf..1202a116cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/raster.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/raster.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rasterrs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rasterrs.h
index 5df9a7ab1ed..ab85c002a30 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rasterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rasterrs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    monochrome renderer error codes (specification only).                */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  Raster_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Raster
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rastpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rastpic.c
index e31c5497633..2883e3fde4c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rastpic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rastpic.c
@@ -20,21 +20,25 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "rastpic.h"
+#include "rasterrs.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from ftraster.c */
-  void FT_Init_Class_ft_standard_raster(FT_Raster_Funcs*);
+  void
+  FT_Init_Class_ft_standard_raster( FT_Raster_Funcs*  funcs );
 
   void
-  ft_raster1_renderer_class_pic_free(  FT_Library library )
+  ft_raster1_renderer_class_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
     if ( pic_container->raster )
     {
       RasterPIC* container = (RasterPIC*)pic_container->raster;
-      if(--container->ref_count)
+      if ( --container->ref_count )
         return;
       FT_FREE( container );
       pic_container->raster = NULL;
@@ -43,7 +47,7 @@
 
 
   FT_Error
-  ft_raster1_renderer_class_pic_init( FT_Library library )
+  ft_raster1_renderer_class_pic_init( FT_Library  library )
   {
     FT_PIC_Container* pic_container = &library->pic_container;
     FT_Error          error         = Raster_Err_Ok;
@@ -51,7 +55,7 @@
     FT_Memory         memory        = library->memory;
 
 
-    /* since this function also serve raster5 renderer, 
+    /* since this function also serve raster5 renderer,
        it implements reference counting */
     if ( pic_container->raster )
     {
@@ -60,28 +64,31 @@
     }
 
     /* allocate pointer, clear and set global container pointer */
-    if ( FT_ALLOC ( container, sizeof ( *container ) ) )
+    if ( FT_ALLOC( container, sizeof ( *container ) ) )
       return error;
-    FT_MEM_SET( container, 0, sizeof(*container) );
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->raster = container;
     container->ref_count = 1;
 
     /* initialize pointer table - this is how the module usually expects this data */
-    FT_Init_Class_ft_standard_raster(&container->ft_standard_raster);
+    FT_Init_Class_ft_standard_raster( &container->ft_standard_raster );
 /*Exit:*/
-    if(error)
-      ft_raster1_renderer_class_pic_free(library);
+    if( error )
+      ft_raster1_renderer_class_pic_free( library );
     return error;
   }
 
   /* re-route these init and free functions to the above functions */
-  FT_Error ft_raster5_renderer_class_pic_init(FT_Library library)
+  FT_Error
+  ft_raster5_renderer_class_pic_init( FT_Library  library )
   {
-    return ft_raster1_renderer_class_pic_init(library);
+    return ft_raster1_renderer_class_pic_init( library );
   }
-  void ft_raster5_renderer_class_pic_free(FT_Library library)
+
+  void
+  ft_raster5_renderer_class_pic_free( FT_Library  library )
   {
-    ft_raster1_renderer_class_pic_free(library);
+    ft_raster1_renderer_class_pic_free( library );
   }
 
 #endif /* FT_CONFIG_OPTION_PIC */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rastpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rastpic.h
index dcd82b8ca8f..7822a24b484 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rastpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rastpic.h
@@ -19,7 +19,7 @@
 #ifndef __RASTPIC_H__
 #define __RASTPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -38,6 +38,19 @@ FT_BEGIN_HEADER
 #define GET_PIC(lib)               ((RasterPIC*)((lib)->pic_container.raster))
 #define FT_STANDARD_RASTER_GET     (GET_PIC(library)->ft_standard_raster)
 
+  /* see rastpic.c for the implementation */
+  void
+  ft_raster1_renderer_class_pic_free( FT_Library  library );
+
+  void
+  ft_raster5_renderer_class_pic_free( FT_Library  library );
+
+  FT_Error
+  ft_raster1_renderer_class_pic_init( FT_Library  library );
+
+  FT_Error
+  ft_raster5_renderer_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rules.mk
index 0e0b5e4ebd6..0e0b5e4ebd6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/raster/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/raster/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/Jamfile
index cb20b1b04b1..cb20b1b04b1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/module.mk
index 95fd6a31437..95fd6a31437 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/rules.mk
index 02cee585df2..02cee585df2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfdriver.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfdriver.c
index 247aa679983..847d83d2e81 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfdriver.c
@@ -422,8 +422,19 @@
   sfnt_get_interface( FT_Module    module,
                       const char*  module_interface )
   {
-    FT_UNUSED( module );
+    /* FT_SFNT_SERVICES_GET derefers `library' in PIC mode */
+#ifdef FT_CONFIG_OPTION_PIC
+    FT_Library  library;
+
 
+    if ( !module )
+      return NULL;
+    library = module->library;
+    if ( !library )
+      return NULL;
+#else
+    FT_UNUSED( module );
+#endif
     return ft_service_list_lookup( FT_SFNT_SERVICES_GET, module_interface );
   }
 
@@ -556,14 +567,14 @@
 #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#define PUT_EMBEDDED_BITMAPS(a) a 
+#define PUT_EMBEDDED_BITMAPS(a) a
 #else
-#define PUT_EMBEDDED_BITMAPS(a) 0 
+#define PUT_EMBEDDED_BITMAPS(a) 0
 #endif
 #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#define PUT_PS_NAMES(a) a 
+#define PUT_PS_NAMES(a) a
 #else
-#define PUT_PS_NAMES(a) 0 
+#define PUT_PS_NAMES(a) 0
 #endif
 
   FT_DEFINE_SFNT_INTERFACE(sfnt_interface,
@@ -637,9 +648,9 @@
 
 
   FT_DEFINE_MODULE(sfnt_module_class,
-  
+
     0,  /* not a font driver or renderer */
-    sizeof( FT_ModuleRec ),
+    sizeof ( FT_ModuleRec ),
 
     "sfnt",     /* driver name                            */
     0x10000L,   /* driver version 1.0                     */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfdriver.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfdriver.h
index 5de25d51ca4..5de25d51ca4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sferrors.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sferrors.h
index 27f90de285f..564a3fe3943 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sferrors.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sferrors.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    SFNT error codes (specification only).                               */
 /*                                                                         */
-/*  Copyright 2001, 2004 by                                                */
+/*  Copyright 2001, 2004, 2012 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  SFNT_Err_
 #define FT_ERR_BASE    FT_Mod_Err_SFNT
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfnt.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfnt.c
index fc507b49613..fc507b49613 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfnt.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfntpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfntpic.c
new file mode 100644
index 00000000000..1372376db2c
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfntpic.c
@@ -0,0 +1,146 @@
+/***************************************************************************/
+/*                                                                         */
+/*  sfntpic.c                                                              */
+/*                                                                         */
+/*    The FreeType position independent code services for sfnt module.     */
+/*                                                                         */
+/*  Copyright 2009, 2010 by                                                */
+/*  Oran Agra and Mickey Gabel.                                            */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INTERNAL_OBJECTS_H
+#include "sfntpic.h"
+#include "sferrors.h"
+
+#ifdef FT_CONFIG_OPTION_PIC
+
+  /* forward declaration of PIC init functions from sfdriver.c */
+  FT_Error
+  FT_Create_Class_sfnt_services( FT_Library           library,
+                                 FT_ServiceDescRec**  ouput_class );
+
+  void
+  FT_Destroy_Class_sfnt_services( FT_Library          library,
+                                  FT_ServiceDescRec*  clazz );
+
+  void
+  FT_Init_Class_sfnt_service_bdf( FT_Service_BDFRec*  clazz );
+
+  void
+  FT_Init_Class_sfnt_interface( FT_Library       library,
+                                SFNT_Interface*  clazz );
+
+  void
+  FT_Init_Class_sfnt_service_glyph_dict(
+    FT_Library                library,
+    FT_Service_GlyphDictRec*  clazz );
+
+  void
+  FT_Init_Class_sfnt_service_ps_name(
+    FT_Library                 library,
+    FT_Service_PsFontNameRec*  clazz );
+
+  void
+  FT_Init_Class_tt_service_get_cmap_info(
+    FT_Library              library,
+    FT_Service_TTCMapsRec*  clazz );
+
+  void
+  FT_Init_Class_sfnt_service_sfnt_table(
+    FT_Service_SFNT_TableRec*  clazz );
+
+  /* forward declaration of PIC init functions from ttcmap.c */
+  FT_Error
+  FT_Create_Class_tt_cmap_classes( FT_Library       library,
+                                   TT_CMap_Class**  output_class );
+
+  void
+  FT_Destroy_Class_tt_cmap_classes( FT_Library      library,
+                                    TT_CMap_Class*  clazz );
+
+  void
+  sfnt_module_class_pic_free( FT_Library  library )
+  {
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
+    if ( pic_container->sfnt )
+    {
+      sfntModulePIC*  container = (sfntModulePIC*)pic_container->sfnt;
+
+
+      if ( container->sfnt_services )
+        FT_Destroy_Class_sfnt_services( library,
+                                        container->sfnt_services );
+      container->sfnt_services = NULL;
+      if ( container->tt_cmap_classes )
+        FT_Destroy_Class_tt_cmap_classes( library,
+                                          container->tt_cmap_classes );
+      container->tt_cmap_classes = NULL;
+      FT_FREE( container );
+      pic_container->sfnt = NULL;
+    }
+  }
+
+
+  FT_Error
+  sfnt_module_class_pic_init(  FT_Library library )
+  {
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Error           error = SFNT_Err_Ok;
+    sfntModulePIC*     container;
+    FT_Memory          memory = library->memory;
+
+
+    /* allocate pointer, clear and set global container pointer */
+    if ( FT_ALLOC ( container, sizeof ( *container ) ) )
+      return error;
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
+    pic_container->sfnt = container;
+
+    /* initialize pointer table - this is how the module usually expects this data */
+    error = FT_Create_Class_sfnt_services( library,
+                                           &container->sfnt_services );
+    if ( error )
+      goto Exit;
+    error = FT_Create_Class_tt_cmap_classes( library,
+                                             &container->tt_cmap_classes );
+    if ( error )
+      goto Exit;
+
+    FT_Init_Class_sfnt_service_glyph_dict(
+      library, &container->sfnt_service_glyph_dict );
+    FT_Init_Class_sfnt_service_ps_name(
+      library, &container->sfnt_service_ps_name );
+    FT_Init_Class_tt_service_get_cmap_info(
+      library, &container->tt_service_get_cmap_info );
+    FT_Init_Class_sfnt_service_sfnt_table(
+      &container->sfnt_service_sfnt_table );
+#ifdef TT_CONFIG_OPTION_BDF
+    FT_Init_Class_sfnt_service_bdf( &container->sfnt_service_bdf );
+#endif
+    FT_Init_Class_sfnt_interface( library, &container->sfnt_interface );
+
+Exit:
+    if ( error )
+      sfnt_module_class_pic_free( library );
+    return error;
+  }
+
+
+
+#endif /* FT_CONFIG_OPTION_PIC */
+
+
+/* END */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfntpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfntpic.h
index 6943b4250a2..f7993d193b6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfntpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfntpic.h
@@ -19,7 +19,7 @@
 #ifndef __SFNTPIC_H__
 #define __SFNTPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -76,6 +76,13 @@ typedef struct sfntModulePIC_
 #define FT_SFNT_SERVICE_BDF_GET           (GET_PIC(library)->sfnt_service_bdf)
 #define FT_SFNT_INTERFACE_GET             (GET_PIC(library)->sfnt_interface)
 
+  /* see sfntpic.c for the implementation */
+  void
+  sfnt_module_class_pic_free( FT_Library  library );
+
+  FT_Error
+  sfnt_module_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
 /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfobjs.c
index 44471f6b675..d7be631afbc 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfobjs.c
@@ -376,7 +376,10 @@
          tag != TTAG_true    &&
          tag != TTAG_typ1    &&
          tag != 0x00020000UL )
+    {
+      FT_TRACE2(( "  not a font using the SFNT container format\n" ));
       return SFNT_Err_Unknown_File_Format;
+    }
 
     face->ttc_header.tag = TTAG_ttcf;
 
@@ -452,7 +455,10 @@
     {
       sfnt = (SFNT_Service)FT_Get_Module_Interface( library, "sfnt" );
       if ( !sfnt )
-        return SFNT_Err_Invalid_File_Format;
+      {
+        FT_ERROR(( "sfnt_init_face: cannot access `sfnt' module\n" ));
+        return SFNT_Err_Missing_Module;
+      }
 
       face->sfnt       = sfnt;
       face->goto_table = sfnt->goto_table;
@@ -460,6 +466,8 @@
 
     FT_FACE_FIND_GLOBAL_SERVICE( face, face->psnames, POSTSCRIPT_CMAPS );
 
+    FT_TRACE2(( "SFNT driver\n" ));
+
     error = sfnt_open_font( stream, face );
     if ( error )
       return error;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfobjs.h
index 6241c93b392..6241c93b392 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/sfobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/sfobjs.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttbdf.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttbdf.c
index 18845c39c2e..18845c39c2e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttbdf.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttbdf.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttbdf.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttbdf.h
index 48a10d6e9b3..48a10d6e9b3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttbdf.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttbdf.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmap.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmap.c
index 544750ab17f..1dfd9876f18 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmap.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmap.c
@@ -3363,7 +3363,7 @@
       return error;
 
     /* the location of the class instances follows the array of pointers */
-    recs = (TT_CMap_ClassRec*) (((char*)clazz)+(sizeof(*clazz)*(i+1))); 
+    recs = (TT_CMap_ClassRec*) (((char*)clazz)+(sizeof(*clazz)*(i+1)));
     i=0;
 
 #undef TTCMAPCITEM
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmap.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmap.h
index 15a4a21e500..94f797897e1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmap.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmap.h
@@ -70,7 +70,7 @@ FT_BEGIN_HEADER
     format_, validate_, get_cmap_info_                                       \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_,          \
     char_next_, char_var_index_, char_var_default_, variant_list_,           \
@@ -92,9 +92,9 @@ FT_BEGIN_HEADER
     clazz->format = format_;                                                 \
     clazz->validate = validate_;                                             \
     clazz->get_cmap_info = get_cmap_info_;                                   \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   typedef struct  TT_ValidatorRec_
   {
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmapc.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmapc.h
index 4c9c6a56f72..4c9c6a56f72 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttcmapc.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttcmapc.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttkern.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttkern.c
index 46888988e4a..46888988e4a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttkern.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttkern.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttkern.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttkern.h
index df1da9b273e..df1da9b273e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttkern.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttkern.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttload.c
index 5fb9aea4e5b..5fb9aea4e5b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttload.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttload.h
index 49a1aee1633..49a1aee1633 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttmtx.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttmtx.c
index 73ac8b2d55f..73ac8b2d55f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttmtx.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttmtx.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttmtx.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttmtx.h
index 8b91a113d85..8b91a113d85 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttmtx.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttmtx.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttpost.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttpost.c
index 6f4bb1d0d32..6f4bb1d0d32 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttpost.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttpost.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttpost.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttpost.h
index 6f06d75a719..6f06d75a719 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttpost.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttpost.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit.c
index 283ba7ef728..283ba7ef728 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit.h b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit.h
index 7ea2af18436..7ea2af18436 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit0.c b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit0.c
index 38bcf210ead..38bcf210ead 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/sfnt/ttsbit0.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/sfnt/ttsbit0.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/Jamfile
index a8496aa2c2c..a8496aa2c2c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftgrays.c b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftgrays.c
index 895e748594d..4c0eea596d5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftgrays.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftgrays.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    A new `perfect' anti-aliasing renderer (body).                       */
 /*                                                                         */
-/*  Copyright 2000-2003, 2005-2011 by                                      */
+/*  Copyright 2000-2003, 2005-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -232,10 +232,15 @@ typedef ptrdiff_t  FT_PtrDist;
 
   /* as usual, for the speed hungry :-) */
 
+#undef RAS_ARG
+#undef RAS_ARG_
+#undef RAS_VAR
+#undef RAS_VAR_
+
 #ifndef FT_STATIC_RASTER
 
-#define RAS_ARG   PWorker  worker
-#define RAS_ARG_  PWorker  worker,
+#define RAS_ARG   gray_PWorker  worker
+#define RAS_ARG_  gray_PWorker  worker,
 
 #define RAS_VAR   worker
 #define RAS_VAR_  worker,
@@ -253,6 +258,11 @@ typedef ptrdiff_t  FT_PtrDist;
   /* must be at least 6 bits! */
 #define PIXEL_BITS  8
 
+#undef FLOOR
+#undef CEILING
+#undef TRUNC
+#undef SCALED
+
 #define ONE_PIXEL       ( 1L << PIXEL_BITS )
 #define PIXEL_MASK      ( -1L << PIXEL_BITS )
 #define TRUNC( x )      ( (TCoord)( (x) >> PIXEL_BITS ) )
@@ -310,15 +320,15 @@ typedef ptrdiff_t  FT_PtrDist;
 
   typedef struct  TCell_
   {
-    TPos   x;     /* same with TWorker.ex */
-    TCoord cover; /* same with TWorker.cover */
-    TArea  area;
-    PCell  next;
+    TPos    x;     /* same with gray_TWorker.ex    */
+    TCoord  cover; /* same with gray_TWorker.cover */
+    TArea   area;
+    PCell   next;
 
   } TCell;
 
 
-  typedef struct  TWorker_
+  typedef struct  gray_TWorker_
   {
     TCoord  ex, ey;
     TPos    min_ex, max_ex;
@@ -329,7 +339,7 @@ typedef ptrdiff_t  FT_PtrDist;
     TCoord  cover;
     int     invalid;
 
-    PCell   cells;
+    PCell       cells;
     FT_PtrDist  max_cells;
     FT_PtrDist  num_cells;
 
@@ -363,25 +373,25 @@ typedef ptrdiff_t  FT_PtrDist;
     PCell*     ycells;
     TPos       ycount;
 
-  } TWorker, *PWorker;
+  } gray_TWorker, *gray_PWorker;
 
 
 #ifndef FT_STATIC_RASTER
 #define ras  (*worker)
 #else
-  static TWorker  ras;
+  static gray_TWorker  ras;
 #endif
 
 
-  typedef struct TRaster_
+  typedef struct gray_TRaster_
   {
-    void*    buffer;
-    long     buffer_size;
-    int      band_size;
-    void*    memory;
-    PWorker  worker;
+    void*         buffer;
+    long          buffer_size;
+    int           band_size;
+    void*         memory;
+    gray_PWorker  worker;
 
-  } TRaster, *PRaster;
+  } gray_TRaster, *gray_PRaster;
 
 
 
@@ -878,6 +888,8 @@ typedef ptrdiff_t  FT_PtrDist;
     FT_Vector*  arc;
 
 
+    levels = ras.lev_stack;
+
     arc      = ras.bez_stack;
     arc[0].x = UPSCALE( to->x );
     arc[0].y = UPSCALE( to->y );
@@ -916,7 +928,6 @@ typedef ptrdiff_t  FT_PtrDist;
       level++;
     } while ( dx > ONE_PIXEL / 4 );
 
-    levels    = ras.lev_stack;
     levels[0] = level;
 
     do
@@ -1109,7 +1120,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
   static int
   gray_move_to( const FT_Vector*  to,
-                PWorker           worker )
+                gray_PWorker      worker )
   {
     TPos  x, y;
 
@@ -1131,7 +1142,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
   static int
   gray_line_to( const FT_Vector*  to,
-                PWorker           worker )
+                gray_PWorker      worker )
   {
     gray_render_line( RAS_VAR_ UPSCALE( to->x ), UPSCALE( to->y ) );
     return 0;
@@ -1141,7 +1152,7 @@ typedef ptrdiff_t  FT_PtrDist;
   static int
   gray_conic_to( const FT_Vector*  control,
                  const FT_Vector*  to,
-                 PWorker           worker )
+                 gray_PWorker      worker )
   {
     gray_render_conic( RAS_VAR_ control, to );
     return 0;
@@ -1152,7 +1163,7 @@ typedef ptrdiff_t  FT_PtrDist;
   gray_cubic_to( const FT_Vector*  control1,
                  const FT_Vector*  control2,
                  const FT_Vector*  to,
-                 PWorker           worker )
+                 gray_PWorker      worker )
   {
     gray_render_cubic( RAS_VAR_ control1, control2, to );
     return 0;
@@ -1163,7 +1174,7 @@ typedef ptrdiff_t  FT_PtrDist;
   gray_render_span( int             y,
                     int             count,
                     const FT_Span*  spans,
-                    PWorker         worker )
+                    gray_PWorker    worker )
   {
     unsigned char*  p;
     FT_Bitmap*      map = &worker->target;
@@ -1675,11 +1686,11 @@ typedef ptrdiff_t  FT_PtrDist;
 #endif /* _STANDALONE_ */
 
 
-  typedef struct  TBand_
+  typedef struct  gray_TBand_
   {
     TPos  min, max;
 
-  } TBand;
+  } gray_TBand;
 
     FT_DEFINE_OUTLINE_FUNCS(func_interface,
       (FT_Outline_MoveTo_Func) gray_move_to,
@@ -1716,11 +1727,11 @@ typedef ptrdiff_t  FT_PtrDist;
   static int
   gray_convert_glyph( RAS_ARG )
   {
-    TBand            bands[40];
-    TBand* volatile  band;
-    int volatile     n, num_bands;
-    TPos volatile    min, max, max_y;
-    FT_BBox*         clip;
+    gray_TBand            bands[40];
+    gray_TBand* volatile  band;
+    int volatile          n, num_bands;
+    TPos volatile         min, max, max_y;
+    FT_BBox*              clip;
 
 
     /* Set up state in the raster object */
@@ -1784,7 +1795,7 @@ typedef ptrdiff_t  FT_PtrDist;
             cell_start += sizeof ( TCell ) - cell_mod;
 
           cell_end  = ras.buffer_size;
-          cell_end -= cell_end % sizeof( TCell );
+          cell_end -= cell_end % sizeof ( TCell );
 
           cells_max = (PCell)( (char*)ras.buffer + cell_end );
           ras.cells = (PCell)( (char*)ras.buffer + cell_start );
@@ -1851,12 +1862,12 @@ typedef ptrdiff_t  FT_PtrDist;
 
 
   static int
-  gray_raster_render( PRaster                  raster,
+  gray_raster_render( gray_PRaster             raster,
                       const FT_Raster_Params*  params )
   {
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
     const FT_Bitmap*   target_map = params->target;
-    PWorker            worker;
+    gray_PWorker       worker;
 
 
     if ( !raster || !raster->buffer || !raster->buffer_size )
@@ -1948,7 +1959,7 @@ typedef ptrdiff_t  FT_PtrDist;
   gray_raster_new( void*       memory,
                    FT_Raster*  araster )
   {
-    static TRaster  the_raster;
+    static gray_TRaster  the_raster;
 
     FT_UNUSED( memory );
 
@@ -1973,15 +1984,15 @@ typedef ptrdiff_t  FT_PtrDist;
   gray_raster_new( FT_Memory   memory,
                    FT_Raster*  araster )
   {
-    FT_Error  error;
-    PRaster   raster = NULL;
+    FT_Error      error;
+    gray_PRaster  raster = NULL;
 
 
     *araster = 0;
-    if ( !FT_ALLOC( raster, sizeof ( TRaster ) ) )
+    if ( !FT_ALLOC( raster, sizeof ( gray_TRaster ) ) )
     {
       raster->memory = memory;
-      *araster = (FT_Raster)raster;
+      *araster       = (FT_Raster)raster;
     }
 
     return error;
@@ -1991,7 +2002,7 @@ typedef ptrdiff_t  FT_PtrDist;
   static void
   gray_raster_done( FT_Raster  raster )
   {
-    FT_Memory  memory = (FT_Memory)((PRaster)raster)->memory;
+    FT_Memory  memory = (FT_Memory)((gray_PRaster)raster)->memory;
 
 
     FT_FREE( raster );
@@ -2005,19 +2016,20 @@ typedef ptrdiff_t  FT_PtrDist;
                      char*      pool_base,
                      long       pool_size )
   {
-    PRaster  rast = (PRaster)raster;
+    gray_PRaster  rast = (gray_PRaster)raster;
 
 
     if ( raster )
     {
-      if ( pool_base && pool_size >= (long)sizeof ( TWorker ) + 2048 )
+      if ( pool_base && pool_size >= (long)sizeof ( gray_TWorker ) + 2048 )
       {
-        PWorker  worker = (PWorker)pool_base;
+        gray_PWorker  worker = (gray_PWorker)pool_base;
 
 
         rast->worker      = worker;
         rast->buffer      = pool_base +
-                              ( ( sizeof ( TWorker ) + sizeof ( TCell ) - 1 ) &
+                              ( ( sizeof ( gray_TWorker ) +
+                                  sizeof ( TCell ) - 1 )  &
                                 ~( sizeof ( TCell ) - 1 ) );
         rast->buffer_size = (long)( ( pool_base + pool_size ) -
                                     (char*)rast->buffer ) &
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftgrays.h b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftgrays.h
index f20f55f14b6..f20f55f14b6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftgrays.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftgrays.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmerrs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmerrs.h
index 0c2a2ecd90b..413d2f1f701 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmerrs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmerrs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    smooth renderer error codes (specification only).                    */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  Smooth_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Smooth
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmooth.c b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmooth.c
index 1350a56618b..00499cc2868 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmooth.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmooth.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Anti-aliasing renderer interface (body).                             */
 /*                                                                         */
-/*  Copyright 2000-2006, 2009-2011 by                                      */
+/*  Copyright 2000-2006, 2009-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -105,9 +105,9 @@
     FT_Error     error;
     FT_Outline*  outline = NULL;
     FT_BBox      cbox;
-    FT_UInt      width, height, pitch;
+    FT_Pos       width, height, pitch;
 #ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-    FT_UInt      height_org, width_org;
+    FT_Pos       height_org, width_org;
 #endif
     FT_Bitmap*   bitmap;
     FT_Memory    memory;
@@ -151,7 +151,7 @@
       return Smooth_Err_Raster_Overflow;
     }
     else
-      width  = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
+      width  = ( cbox.xMax - cbox.xMin ) >> 6;
 
     if ( cbox.yMin < 0 && cbox.yMax > FT_INT_MAX + cbox.yMin )
     {
@@ -161,7 +161,7 @@
       return Smooth_Err_Raster_Overflow;
     }
     else
-      height = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
+      height = ( cbox.yMax - cbox.yMin ) >> 6;
 
     bitmap = &slot->bitmap;
     memory = render->root.memory;
@@ -223,7 +223,7 @@
 
     /* Required check is ( pitch * height < FT_ULONG_MAX ),     */
     /* but we care realistic cases only. Always pitch <= width. */
-    if ( width > 0x7FFFU || height > 0x7FFFU )
+    if ( width > 0x7FFF || height > 0x7FFF )
     {
       FT_ERROR(( "ft_smooth_render_generic: glyph too large: %u x %u\n",
                  width, height ));
@@ -421,10 +421,10 @@
   }
 
 
-  FT_DEFINE_RENDERER(ft_smooth_renderer_class,
+  FT_DEFINE_RENDERER( ft_smooth_renderer_class,
 
       FT_MODULE_RENDERER,
-      sizeof( FT_RendererRec ),
+      sizeof ( FT_RendererRec ),
 
       "smooth",
       0x10000L,
@@ -448,10 +448,10 @@
   )
 
 
-  FT_DEFINE_RENDERER(ft_smooth_lcd_renderer_class,
-  
+  FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class,
+
       FT_MODULE_RENDERER,
-      sizeof( FT_RendererRec ),
+      sizeof ( FT_RendererRec ),
 
       "smooth-lcd",
       0x10000L,
@@ -474,10 +474,10 @@
     (FT_Raster_Funcs*)    &FT_GRAYS_RASTER_GET
   )
 
-  FT_DEFINE_RENDERER(ft_smooth_lcdv_renderer_class,
+  FT_DEFINE_RENDERER( ft_smooth_lcdv_renderer_class,
 
       FT_MODULE_RENDERER,
-      sizeof( FT_RendererRec ),
+      sizeof ( FT_RendererRec ),
 
       "smooth-lcdv",
       0x10000L,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmooth.h b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmooth.h
index 3708790df17..3708790df17 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftsmooth.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftsmooth.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftspic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftspic.c
index 7adaab17d2f..601bcf98a9d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftspic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftspic.c
@@ -20,21 +20,27 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "ftspic.h"
+#include "ftsmerrs.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from ftgrays.c */
-  void FT_Init_Class_ft_grays_raster(FT_Raster_Funcs*);
+  void
+  FT_Init_Class_ft_grays_raster( FT_Raster_Funcs*  funcs );
 
   void
-  ft_smooth_renderer_class_pic_free(  FT_Library library )
+  ft_smooth_renderer_class_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
     if ( pic_container->smooth )
     {
-      SmoothPIC* container = (SmoothPIC*)pic_container->smooth;
-      if(--container->ref_count)
+      SmoothPIC*  container = (SmoothPIC*)pic_container->smooth;
+
+
+      if ( --container->ref_count )
         return;
       FT_FREE( container );
       pic_container->smooth = NULL;
@@ -51,9 +57,9 @@
     FT_Memory          memory        = library->memory;
 
 
-    /* since this function also serve smooth_lcd and smooth_lcdv renderers, 
+    /* since this function also serve smooth_lcd and smooth_lcdv renderers,
        it implements reference counting */
-    if(pic_container->smooth)
+    if ( pic_container->smooth )
     {
       ((SmoothPIC*)pic_container->smooth)->ref_count++;
       return error;
@@ -62,34 +68,37 @@
     /* allocate pointer, clear and set global container pointer */
     if ( FT_ALLOC ( container, sizeof ( *container ) ) )
       return error;
-    FT_MEM_SET( container, 0, sizeof(*container) );
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->smooth = container;
     container->ref_count = 1;
 
     /* initialize pointer table - this is how the module usually expects this data */
-    FT_Init_Class_ft_grays_raster(&container->ft_grays_raster);
+    FT_Init_Class_ft_grays_raster( &container->ft_grays_raster );
 /*Exit:*/
-    if(error)
-      ft_smooth_renderer_class_pic_free(library);
+    if ( error )
+      ft_smooth_renderer_class_pic_free( library );
     return error;
   }
 
   /* re-route these init and free functions to the above functions */
-  FT_Error ft_smooth_lcd_renderer_class_pic_init(FT_Library library)
+  FT_Error ft_smooth_lcd_renderer_class_pic_init( FT_Library  library )
   {
-    return ft_smooth_renderer_class_pic_init(library);
+    return ft_smooth_renderer_class_pic_init( library );
   }
-  void ft_smooth_lcd_renderer_class_pic_free(FT_Library library)
+
+  void ft_smooth_lcd_renderer_class_pic_free( FT_Library  library )
   {
-    ft_smooth_renderer_class_pic_free(library);
+    ft_smooth_renderer_class_pic_free( library );
   }
-  FT_Error ft_smooth_lcdv_renderer_class_pic_init(FT_Library library)
+
+  FT_Error ft_smooth_lcdv_renderer_class_pic_init( FT_Library  library )
   {
-    return ft_smooth_renderer_class_pic_init(library);
+    return ft_smooth_renderer_class_pic_init( library );
   }
-  void ft_smooth_lcdv_renderer_class_pic_free(FT_Library library)
+
+  void ft_smooth_lcdv_renderer_class_pic_free( FT_Library  library )
   {
-    ft_smooth_renderer_class_pic_free(library);
+    ft_smooth_renderer_class_pic_free( library );
   }
 
 #endif /* FT_CONFIG_OPTION_PIC */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftspic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftspic.h
index c7e0ce9d892..4686f5e35bf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/ftspic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/ftspic.h
@@ -19,7 +19,7 @@
 #ifndef __FTSPIC_H__
 #define __FTSPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #include FT_INTERNAL_PIC_H
@@ -38,6 +38,25 @@ FT_BEGIN_HEADER
 #define GET_PIC(lib)               ((SmoothPIC*)((lib)->pic_container.smooth))
 #define FT_GRAYS_RASTER_GET        (GET_PIC(library)->ft_grays_raster)
 
+  /* see ftspic.c for the implementation */
+  void
+  ft_smooth_renderer_class_pic_free( FT_Library  library );
+
+  void
+  ft_smooth_lcd_renderer_class_pic_free( FT_Library  library );
+
+  void
+  ft_smooth_lcdv_renderer_class_pic_free( FT_Library  library );
+
+  FT_Error
+  ft_smooth_renderer_class_pic_init( FT_Library  library );
+
+  FT_Error
+  ft_smooth_lcd_renderer_class_pic_init( FT_Library  library );
+
+  FT_Error
+  ft_smooth_lcdv_renderer_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/module.mk
index 47f6c040764..47f6c040764 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/rules.mk
index 88d0aa53ac2..88d0aa53ac2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/smooth.c b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/smooth.c
index a8ac51f9f8c..a8ac51f9f8c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/smooth/smooth.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/smooth/smooth.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/Jamfile
index 475161e07fd..475161e07fd 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/apinames.c b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/apinames.c
index 99e3028c934..3dc6559e43d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/apinames.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/apinames.c
@@ -10,7 +10,7 @@
  * accepted if you are using GCC for compilation (and probably by
  * other compilers too).
  *
- * Author: David Turner, 2005, 2006, 2008, 2009, 2010
+ * Author: David Turner, 2005, 2006, 2008-2012
  *
  * This code is explicitly placed into the public domain.
  *
@@ -59,8 +59,9 @@ static void
 names_add( const char*  name,
            const char*  end )
 {
-  int   nn, len, h;
-  Name  nm;
+  unsigned int  h;
+  int           nn, len;
+  Name          nm;
 
   if ( end <= name )
     return;
@@ -86,7 +87,8 @@ names_add( const char*  name,
   if ( num_names >= max_names )
   {
     max_names += (max_names >> 1) + 4;
-    the_names  = (NameRec*)realloc( the_names, sizeof(the_names[0])*max_names );
+    the_names  = (NameRec*)realloc( the_names,
+                                    sizeof ( the_names[0] ) * max_names );
     if ( the_names == NULL )
       panic( "not enough memory" );
   }
@@ -115,7 +117,8 @@ name_compare( const void*  name1,
 static void
 names_sort( void )
 {
-  qsort( the_names, (size_t)num_names, sizeof(the_names[0]), name_compare );
+  qsort( the_names, (size_t)num_names,
+         sizeof ( the_names[0] ), name_compare );
 }
 
 
@@ -169,7 +172,7 @@ names_dump( FILE*         out,
           int  len = dot - dll_name;
 
 
-          if ( len > (int)( sizeof( temp ) - 1 ) )
+          if ( len > (int)( sizeof ( temp ) - 1 ) )
             len = sizeof ( temp ) - 1;
 
           memcpy( temp, dll_name, len );
@@ -205,7 +208,7 @@ typedef enum  State_
 static int
 read_header_file( FILE*  file, int  verbose )
 {
-  static char  buff[ LINEBUFF_SIZE+1 ];
+  static char  buff[LINEBUFF_SIZE + 1];
   State        state = STATE_START;
 
   while ( !feof( file ) )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/chktrcmp.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/chktrcmp.py
index d0f342e6bdd..d0f342e6bdd 100755
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/chktrcmp.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/chktrcmp.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/cordic.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/cordic.py
index 3f80c5f09a5..3f80c5f09a5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/cordic.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/cordic.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/content.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/content.py
index b398955b81d..b398955b81d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/content.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/content.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/docbeauty.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/docbeauty.py
index 3ddf4a94a15..3ddf4a94a15 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/docbeauty.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/docbeauty.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/docmaker.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/docmaker.py
index 1d9de9fbff2..1d9de9fbff2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/docmaker.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/docmaker.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/formatter.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/formatter.py
index f62ce676c15..f62ce676c15 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/formatter.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/formatter.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/sources.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/sources.py
index 7b68c07019d..7b68c07019d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/sources.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/sources.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/tohtml.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/tohtml.py
index fffa120973d..fffa120973d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/tohtml.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/tohtml.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/utils.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/utils.py
index 1d96658c7d5..1d96658c7d5 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/docmaker/utils.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/docmaker/utils.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/Makefile b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/Makefile
index 2e619299cdf..2e619299cdf 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/Makefile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/Makefile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/README b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/README
index c093f15e811..c093f15e811 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/README
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/README
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/ftrandom.c b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/ftrandom.c
index 4daac0dc1d4..4daac0dc1d4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/ftrandom/ftrandom.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/ftrandom/ftrandom.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/glnames.py b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/glnames.py
index 8810bf57f1f..8810bf57f1f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/glnames.py
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/glnames.py
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_afm.c b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_afm.c
index f5f99363cab..f5f99363cab 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_afm.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_afm.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_bbox.c b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_bbox.c
index e085c5b3d6c..e085c5b3d6c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_bbox.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_bbox.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_trig.c b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_trig.c
index 8c8a544aa9b..8c8a544aa9b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/tools/test_trig.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/tools/test_trig.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/Jamfile
index a8cccfe1372..a8cccfe1372 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/module.mk
index baee81a7730..baee81a7730 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/rules.mk
index 507ef16b026..507ef16b026 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/truetype.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/truetype.c
index 4bd1209787e..4bd1209787e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/truetype.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/truetype.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttdriver.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttdriver.c
index e70a6112334..3669d458215 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttdriver.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType font driver implementation (body).                          */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -258,7 +258,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
-  /*    Load_Glyph                                                         */
+  /*    tt_glyph_load                                                      */
   /*                                                                       */
   /* <Description>                                                         */
   /*    A driver method used to load a glyph within a given glyph slot.    */
@@ -282,10 +282,10 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   static FT_Error
-  Load_Glyph( FT_GlyphSlot  ttslot,         /* TT_GlyphSlot */
-              FT_Size       ttsize,         /* TT_Size      */
-              FT_UInt       glyph_index,
-              FT_Int32      load_flags )
+  tt_glyph_load( FT_GlyphSlot  ttslot,      /* TT_GlyphSlot */
+                 FT_Size       ttsize,      /* TT_Size      */
+                 FT_UInt       glyph_index,
+                 FT_Int32      load_flags )
   {
     TT_GlyphSlot  slot = (TT_GlyphSlot)ttslot;
     TT_Size       size = (TT_Size)ttsize;
@@ -313,7 +313,7 @@
     if ( load_flags & FT_LOAD_NO_HINTING )
     {
       /* both FT_LOAD_NO_HINTING and FT_LOAD_NO_AUTOHINT   */
-      /* are necessary to disable hinting for tricky fonts */          
+      /* are necessary to disable hinting for tricky fonts */
 
       if ( FT_IS_TRICKY( face ) )
         load_flags &= ~FT_LOAD_NO_HINTING;
@@ -402,19 +402,35 @@
   tt_get_interface( FT_Module    driver,    /* TT_Driver */
                     const char*  tt_interface )
   {
+    FT_Library           library;
     FT_Module_Interface  result;
     FT_Module            sfntd;
     SFNT_Service         sfnt;
 
+
+    /* FT_TT_SERVICES_GET derefers `library' in PIC mode */
+#ifdef FT_CONFIG_OPTION_PIC
+    if ( !driver )
+      return NULL;
+    library = driver->library;
+    if ( !library )
+      return NULL;
+#endif
+
     result = ft_service_list_lookup( FT_TT_SERVICES_GET, tt_interface );
     if ( result != NULL )
       return result;
 
+#ifndef FT_CONFIG_OPTION_PIC
     if ( !driver )
       return NULL;
+    library = driver->library;
+    if ( !library )
+      return NULL;
+#endif
 
     /* only return the default interface from the SFNT module */
-    sfntd = FT_Get_Module( driver->library, "sfnt" );
+    sfntd = FT_Get_Module( library, "sfnt" );
     if ( sfntd )
     {
       sfnt = (SFNT_Service)( sfntd->clazz->module_interface );
@@ -440,11 +456,10 @@
 #define TT_SIZE_SELECT    0
 #endif
 
-  FT_DEFINE_DRIVER(tt_driver_class,
-  
-    
-      FT_MODULE_FONT_DRIVER        |
-      FT_MODULE_DRIVER_SCALABLE    |
+  FT_DEFINE_DRIVER( tt_driver_class,
+
+      FT_MODULE_FONT_DRIVER     |
+      FT_MODULE_DRIVER_SCALABLE |
       TT_HINTER_FLAG,
 
       sizeof ( TT_DriverRec ),
@@ -468,15 +483,15 @@
     tt_size_init,
     tt_size_done,
     tt_slot_init,
-    0,                      /* FT_Slot_DoneFunc */
+    0,                       /* FT_Slot_DoneFunc */
 
-    ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */
+    ft_stub_set_char_sizes,  /* FT_CONFIG_OPTION_OLD_INTERNALS */
     ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
-    Load_Glyph,
+    tt_glyph_load,
 
     tt_get_kerning,
-    0,                      /* FT_Face_AttachFunc      */
+    0,                       /* FT_Face_AttachFunc */
     tt_get_advances,
 
     tt_size_request,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttdriver.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttdriver.h
index aae00f2617f..aae00f2617f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttdriver.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttdriver.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/tterrors.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/tterrors.h
index d317c70e0eb..78d138fab2e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/tterrors.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/tterrors.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType error codes (specification only).                           */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  TT_Err_
 #define FT_ERR_BASE    FT_Mod_Err_TrueType
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgload.c
index f35521e17b5..ce8c8887b9f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType Glyph Loader (body).                                        */
 /*                                                                         */
-/*  Copyright 1996-2011                                                    */
+/*  Copyright 1996-2012                                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -362,19 +362,21 @@
     if ( n_contours >= 0xFFF || p + ( n_contours + 1 ) * 2 > limit )
       goto Invalid_Outline;
 
-    prev_cont = FT_NEXT_USHORT( p );
+    prev_cont = FT_NEXT_SHORT( p );
 
     if ( n_contours > 0 )
       cont[0] = prev_cont;
 
+    if ( prev_cont < 0 )
+      goto Invalid_Outline;
+
     for ( cont++; cont < cont_limit; cont++ )
     {
-      cont[0] = FT_NEXT_USHORT( p );
+      cont[0] = FT_NEXT_SHORT( p );
       if ( cont[0] <= prev_cont )
       {
         /* unordered contours: this is invalid */
-        error = TT_Err_Invalid_Table;
-        goto Fail;
+        goto Invalid_Outline;
       }
       prev_cont = cont[0];
     }
@@ -392,13 +394,6 @@
     if ( error )
       goto Fail;
 
-    /* we'd better check the contours table right now */
-    outline = &gloader->current.outline;
-
-    for ( cont = outline->contours + 1; cont < cont_limit; cont++ )
-      if ( cont[-1] >= cont[0] )
-        goto Invalid_Outline;
-
     /* reading the bytecode instructions */
     load->glyph->control_len  = 0;
     load->glyph->control_data = 0;
@@ -439,6 +434,8 @@
 
     p += n_ins;
 
+    outline = &gloader->current.outline;
+
     /* reading the point tags */
     flag       = (FT_Byte*)outline->tags;
     flag_limit = flag + n_points;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgload.h
index 05f75882dc6..05f75882dc6 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgxvar.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgxvar.c
index 69b702f621e..69b702f621e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgxvar.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgxvar.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgxvar.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgxvar.h
index 82dfc4431f2..82dfc4431f2 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttgxvar.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttgxvar.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttinterp.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttinterp.c
index c62c589e80b..3acb24a2f6f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttinterp.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType bytecode interpreter (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2011                                                    */
+/*  Copyright 1996-2012                                                    */
 /*  by David Turner, Robert Wilhelm, and Werner Lemberg.                   */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -715,7 +715,7 @@
     FT_Error  error;
 
 
-    if ( ( error = TT_Goto_CodeRange( exec, tt_coderange_glyph, 0  ) )
+    if ( ( error = TT_Goto_CodeRange( exec, tt_coderange_glyph, 0 ) )
            != TT_Err_Ok )
       return error;
 
@@ -1800,7 +1800,7 @@
 
     /* NOTE: Because the last instruction of a program may be a CALL */
     /*       which will return to the first byte *after* the code    */
-    /*       range, we test for AIP <= Size, instead of AIP < Size.  */
+    /*       range, we test for aIP <= Size, instead of aIP < Size.  */
 
     if ( aIP > range->size )
     {
@@ -2757,7 +2757,7 @@
     W = Vx * Vx + Vy * Vy;
 
     /* Now, we want that Sqrt( W ) = 0x4000 */
-    /* Or 0x10000000 <= W < 0x10004000        */
+    /* Or 0x10000000 <= W < 0x10004000      */
 
     if ( Vx < 0 )
     {
@@ -3199,36 +3199,42 @@
   }
 
 
-#define DO_JROT                            \
-    if ( args[1] != 0 )                    \
-    {                                      \
-      if ( args[0] == 0 && CUR.args == 0 ) \
-        CUR.error = TT_Err_Bad_Argument;   \
-      CUR.IP += args[0];                   \
-      if ( CUR.IP < 0 )                    \
-        CUR.error = TT_Err_Bad_Argument;   \
-      CUR.step_ins = FALSE;                \
+#define DO_JROT                                                   \
+    if ( args[1] != 0 )                                           \
+    {                                                             \
+      if ( args[0] == 0 && CUR.args == 0 )                        \
+        CUR.error = TT_Err_Bad_Argument;                          \
+      CUR.IP += args[0];                                          \
+      if ( CUR.IP < 0                                          || \
+           ( CUR.callTop > 0                                 &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
+        CUR.error = TT_Err_Bad_Argument;                          \
+      CUR.step_ins = FALSE;                                       \
     }
 
 
-#define DO_JMPR                          \
-    if ( args[0] == 0 && CUR.args == 0 ) \
-      CUR.error = TT_Err_Bad_Argument;   \
-    CUR.IP += args[0];                   \
-    if ( CUR.IP < 0 )                    \
-      CUR.error = TT_Err_Bad_Argument;   \
+#define DO_JMPR                                                 \
+    if ( args[0] == 0 && CUR.args == 0 )                        \
+      CUR.error = TT_Err_Bad_Argument;                          \
+    CUR.IP += args[0];                                          \
+    if ( CUR.IP < 0                                          || \
+         ( CUR.callTop > 0                                 &&   \
+           CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
+      CUR.error = TT_Err_Bad_Argument;                          \
     CUR.step_ins = FALSE;
 
 
-#define DO_JROF                            \
-    if ( args[1] == 0 )                    \
-    {                                      \
-      if ( args[0] == 0 && CUR.args == 0 ) \
-        CUR.error = TT_Err_Bad_Argument;   \
-      CUR.IP += args[0];                   \
-      if ( CUR.IP < 0 )                    \
-        CUR.error = TT_Err_Bad_Argument;   \
-      CUR.step_ins = FALSE;                \
+#define DO_JROF                                                   \
+    if ( args[1] == 0 )                                           \
+    {                                                             \
+      if ( args[0] == 0 && CUR.args == 0 )                        \
+        CUR.error = TT_Err_Bad_Argument;                          \
+      CUR.IP += args[0];                                          \
+      if ( CUR.IP < 0                                          || \
+           ( CUR.callTop > 0                                 &&   \
+             CUR.IP > CUR.callStack[CUR.callTop - 1].Cur_End ) )  \
+        CUR.error = TT_Err_Bad_Argument;                          \
+      CUR.step_ins = FALSE;                                       \
     }
 
 
@@ -4471,7 +4477,7 @@
       CUR.length = opcode_length[CUR.opcode];
       if ( CUR.length < 0 )
       {
-        if ( CUR.IP + 1 > CUR.codeSize )
+        if ( CUR.IP + 1 >= CUR.codeSize )
           goto Fail_Overflow;
         CUR.length = 2 - CUR.length * CUR.code[CUR.IP + 1];
       }
@@ -4640,6 +4646,7 @@
         return;
 
       case 0x2D:   /* ENDF */
+        rec->end = CUR.IP;
         return;
       }
     }
@@ -4757,6 +4764,7 @@
     pCrec->Caller_IP    = CUR.IP + 1;
     pCrec->Cur_Count    = 1;
     pCrec->Cur_Restart  = def->start;
+    pCrec->Cur_End      = def->end;
 
     CUR.callTop++;
 
@@ -4835,6 +4843,7 @@
       pCrec->Caller_IP    = CUR.IP + 1;
       pCrec->Cur_Count    = (FT_Int)args[0];
       pCrec->Cur_Restart  = def->start;
+      pCrec->Cur_End      = def->end;
 
       CUR.callTop++;
 
@@ -5050,8 +5059,8 @@
   /* Opcode range: 0x46-0x47                                               */
   /* Stack:        uint32 --> f26.6                                        */
   /*                                                                       */
-  /* BULLSHIT: Measures from the original glyph must be taken along the    */
-  /*           dual projection vector!                                     */
+  /* XXX: UNDOCUMENTED: Measures from the original glyph must be taken     */
+  /*      along the dual projection vector!                                */
   /*                                                                       */
   static void
   Ins_GC( INS_ARG )
@@ -5123,14 +5132,14 @@
   /* Opcode range: 0x49-0x4A                                               */
   /* Stack:        uint32 uint32 --> f26.6                                 */
   /*                                                                       */
-  /* BULLSHIT: Measure taken in the original glyph must be along the dual  */
-  /*           projection vector.                                          */
+  /* XXX: UNDOCUMENTED: Measure taken in the original glyph must be along  */
+  /*                    the dual projection vector.                        */
   /*                                                                       */
-  /* Second BULLSHIT: Flag attributes are inverted!                        */
-  /*                  0 => measure distance in original outline            */
-  /*                  1 => measure distance in grid-fitted outline         */
+  /* XXX: UNDOCUMENTED: Flag attributes are inverted!                      */
+  /*                      0 => measure distance in original outline        */
+  /*                      1 => measure distance in grid-fitted outline     */
   /*                                                                       */
-  /* Third one: `zp0 - zp1', and not `zp2 - zp1!                           */
+  /* XXX: UNDOCUMENTED: `zp0 - zp1', and not `zp2 - zp1!                   */
   /*                                                                       */
   static void
   Ins_MD( INS_ARG )
@@ -5761,21 +5770,25 @@
   /* Opcode range: 0x34-35                                                 */
   /* Stack:        uint32 -->                                              */
   /*                                                                       */
+  /* UNDOCUMENTED: According to Greg Hitchcock, there is one (virtual)     */
+  /*               contour in the twilight zone, namely contour number     */
+  /*               zero.                                                   */
+  /*                                                                       */
   static void
   Ins_SHC( INS_ARG )
   {
-    TT_GlyphZoneRec zp;
-    FT_UShort       refp;
-    FT_F26Dot6      dx,
-                    dy;
+    TT_GlyphZoneRec  zp;
+    FT_UShort        refp;
+    FT_F26Dot6       dx, dy;
 
-    FT_Short        contour;
-    FT_UShort       first_point, last_point, i;
+    FT_Short         contour, bounds;
+    FT_UShort        start, limit, i;
 
 
     contour = (FT_UShort)args[0];
+    bounds  = ( CUR.GS.gep2 == 0 ) ? 1 : CUR.zp2.n_contours;
 
-    if ( BOUNDS( contour, CUR.pts.n_contours ) )
+    if ( BOUNDS( contour, bounds ) )
     {
       if ( CUR.pedantic_hinting )
         CUR.error = TT_Err_Invalid_Reference;
@@ -5786,25 +5799,19 @@
       return;
 
     if ( contour == 0 )
-      first_point = 0;
+      start = 0;
     else
-      first_point = (FT_UShort)( CUR.pts.contours[contour - 1] + 1 -
-                                 CUR.pts.first_point );
+      start = (FT_UShort)( CUR.zp2.contours[contour - 1] + 1 -
+                           CUR.zp2.first_point );
 
-    last_point = (FT_UShort)( CUR.pts.contours[contour] -
-                              CUR.pts.first_point );
-
-    /* XXX: this is probably wrong... at least it prevents memory */
-    /*      corruption when zp2 is the twilight zone              */
-    if ( BOUNDS( last_point, CUR.zp2.n_points ) )
-    {
-      if ( CUR.zp2.n_points > 0 )
-        last_point = (FT_UShort)(CUR.zp2.n_points - 1);
-      else
-        last_point = 0;
-    }
+    /* we use the number of points if in the twilight zone */
+    if ( CUR.GS.gep2 == 0 )
+      limit = CUR.zp2.n_points;
+    else
+      limit = (FT_UShort)( CUR.zp2.contours[contour] -
+                           CUR.zp2.first_point + 1 );
 
-    for ( i = first_point; i <= last_point; i++ )
+    for ( i = start; i < limit; i++ )
     {
       if ( zp.cur != CUR.zp2.cur || refp != i )
         MOVE_Zp2_Point( i, dx, dy, TRUE );
@@ -5826,7 +5833,7 @@
     FT_F26Dot6       dx,
                      dy;
 
-    FT_UShort        last_point, i;
+    FT_UShort        limit, i;
 
 
     if ( BOUNDS( args[0], 2 ) )
@@ -5839,28 +5846,19 @@
     if ( COMPUTE_Point_Displacement( &dx, &dy, &zp, &refp ) )
       return;
 
-    /* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points.  */
-    /*      Twilight zone has no contours, so use `n_points'.   */
-    /*      Normal zone's `n_points' includes phantoms, so must */
-    /*      use end of last contour.                            */
-    if ( CUR.GS.gep2 == 0 && CUR.zp2.n_points > 0 )
-      last_point = (FT_UShort)( CUR.zp2.n_points - 1 );
+    /* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points.     */
+    /*      Twilight zone has no real contours, so use `n_points'. */
+    /*      Normal zone's `n_points' includes phantoms, so must    */
+    /*      use end of last contour.                               */
+    if ( CUR.GS.gep2 == 0 )
+      limit = (FT_UShort)CUR.zp2.n_points;
     else if ( CUR.GS.gep2 == 1 && CUR.zp2.n_contours > 0 )
-    {
-      last_point = (FT_UShort)( CUR.zp2.contours[CUR.zp2.n_contours - 1] );
-
-      if ( BOUNDS( last_point, CUR.zp2.n_points ) )
-      {
-        if ( CUR.pedantic_hinting )
-          CUR.error = TT_Err_Invalid_Reference;
-        return;
-      }
-    }
+      limit = (FT_UShort)( CUR.zp2.contours[CUR.zp2.n_contours - 1] + 1 );
     else
-      last_point = 0;
+      limit = 0;
 
     /* XXX: UNDOCUMENTED! SHZ doesn't touch the points */
-    for ( i = 0; i <= last_point; i++ )
+    for ( i = 0; i < limit; i++ )
     {
       if ( zp.cur != CUR.zp2.cur || refp != i )
         MOVE_Zp2_Point( i, dx, dy, FALSE );
@@ -6266,7 +6264,7 @@
       CUR.zp1.org[point].y = CUR.zp0.org[CUR.GS.rp0].y +
                              TT_MulFix14( (FT_UInt32)cvt_dist,
                                           CUR.GS.freeVector.y );
-      CUR.zp1.cur[point]   = CUR.zp0.cur[point];
+      CUR.zp1.cur[point]   = CUR.zp1.org[point];
     }
 
     org_dist = CUR_Func_dualproj( &CUR.zp1.org[point],
@@ -6575,9 +6573,21 @@
       if ( twilight )
         old_range = CUR_Func_dualproj( &CUR.zp1.org[CUR.GS.rp2],
                                        orus_base );
-      else
+      else if ( CUR.metrics.x_scale == CUR.metrics.y_scale )
         old_range = CUR_Func_dualproj( &CUR.zp1.orus[CUR.GS.rp2],
                                        orus_base );
+      else
+      {
+        FT_Vector  vec;
+
+
+        vec.x = TT_MULFIX( CUR.zp1.orus[CUR.GS.rp2].x - orus_base->x,
+                           CUR.metrics.x_scale );
+        vec.y = TT_MULFIX( CUR.zp1.orus[CUR.GS.rp2].y - orus_base->y,
+                           CUR.metrics.y_scale );
+
+        old_range = CUR_fast_dualproj( &vec );
+      }
 
       cur_range = CUR_Func_project ( &CUR.zp1.cur[CUR.GS.rp2], cur_base );
     }
@@ -6601,8 +6611,20 @@
 
       if ( twilight )
         org_dist = CUR_Func_dualproj( &CUR.zp2.org[point], orus_base );
-      else
+      else if ( CUR.metrics.x_scale == CUR.metrics.y_scale )
         org_dist = CUR_Func_dualproj( &CUR.zp2.orus[point], orus_base );
+      else
+      {
+        FT_Vector  vec;
+
+
+        vec.x = TT_MULFIX( CUR.zp2.orus[point].x - orus_base->x,
+                           CUR.metrics.x_scale );
+        vec.y = TT_MULFIX( CUR.zp2.orus[point].y - orus_base->y,
+                           CUR.metrics.y_scale );
+
+        org_dist = CUR_fast_dualproj( &vec );
+      }
 
       cur_dist = CUR_Func_project ( &CUR.zp2.cur[point], cur_base );
 
@@ -7149,6 +7171,7 @@
         call->Caller_IP    = CUR.IP + 1;
         call->Cur_Count    = 1;
         call->Cur_Restart  = def->start;
+        call->Cur_End      = def->end;
 
         INS_Goto_CodeRange( def->range, def->start );
 
@@ -7521,7 +7544,7 @@
 
       if ( ( CUR.length = opcode_length[CUR.opcode] ) < 0 )
       {
-        if ( CUR.IP + 1 > CUR.codeSize )
+        if ( CUR.IP + 1 >= CUR.codeSize )
           goto LErrorCodeOverflow_;
 
         CUR.length = 2 - CUR.length * CUR.code[CUR.IP + 1];
@@ -8157,6 +8180,7 @@
                 callrec->Caller_IP    = CUR.IP + 1;
                 callrec->Cur_Count    = 1;
                 callrec->Cur_Restart  = def->start;
+                callrec->Cur_End      = def->end;
 
                 if ( INS_Goto_CodeRange( def->range, def->start ) == FAILURE )
                   goto LErrorLabel_;
@@ -8230,7 +8254,7 @@
     if ( CUR.error && !CUR.instruction_trap )
     {
       FT_TRACE1(( "  The interpreter returned error 0x%x\n", CUR.error ));
-      exc->size->cvt_ready      = FALSE;  
+      exc->size->cvt_ready      = FALSE;
     }
 
     return CUR.error;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttinterp.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttinterp.h
index c480dfa506e..6d0fc03d68c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttinterp.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttinterp.h
@@ -102,6 +102,7 @@ FT_BEGIN_HEADER
     FT_Long  Caller_IP;
     FT_Long  Cur_Count;
     FT_Long  Cur_Restart;
+    FT_Long  Cur_End;
 
   } TT_CallRec, *TT_CallStack;
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttobjs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttobjs.c
index d77c3c42107..814c713aaf1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttobjs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttobjs.c
@@ -328,7 +328,7 @@
 
 
     FT_MEM_SET( num_matched_ids, 0,
-                sizeof( int ) * TRICK_SFNT_IDS_NUM_FACES );
+                sizeof ( int ) * TRICK_SFNT_IDS_NUM_FACES );
     has_cvt  = FALSE;
     has_fpgm = FALSE;
     has_prep = FALSE;
@@ -493,10 +493,17 @@
     TT_Face       face = (TT_Face)ttface;
 
 
+    FT_TRACE2(( "TTF driver\n" ));
+
     library = ttface->driver->root.library;
-    sfnt    = (SFNT_Service)FT_Get_Module_Interface( library, "sfnt" );
+
+    sfnt = (SFNT_Service)FT_Get_Module_Interface( library, "sfnt" );
     if ( !sfnt )
-      goto Bad_Format;
+    {
+      FT_ERROR(( "tt_face_init: cannot access `sfnt' module\n" ));
+      error = TT_Err_Missing_Module;
+      goto Exit;
+    }
 
     /* create input stream from resource */
     if ( FT_STREAM_SEEK( 0 ) )
@@ -514,7 +521,7 @@
          face->format_tag != 0x00020000L &&    /* CJK fonts for Win 3.1 */
          face->format_tag != TTAG_true   )     /* Mac fonts */
     {
-      FT_TRACE2(( "[not a valid TTF font]\n" ));
+      FT_TRACE2(( "  not a TTF font\n" ));
       goto Bad_Format;
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttobjs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttobjs.h
index 087b3c2e1b9..47e41291073 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttobjs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Objects manager (specification).                                     */
 /*                                                                         */
-/*  Copyright 1996-2009, 2011 by                                           */
+/*  Copyright 1996-2009, 2011-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -175,6 +175,7 @@ FT_BEGIN_HEADER
   {
     FT_Int   range;      /* in which code range is it located? */
     FT_Long  start;      /* where does it start?               */
+    FT_Long  end;        /* where does it end?                 */
     FT_UInt  opc;        /* function #, or instruction code    */
     FT_Bool  active;     /* is it active?                      */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpic.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpic.c
index 5d725742c78..65ca845aaf7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpic.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpic.c
@@ -20,25 +20,41 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "ttpic.h"
+#include "tterrors.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from ttdriver.c */
-  FT_Error FT_Create_Class_tt_services( FT_Library, FT_ServiceDescRec**);
-  void FT_Destroy_Class_tt_services( FT_Library, FT_ServiceDescRec*);
-  void FT_Init_Class_tt_service_gx_multi_masters(FT_Service_MultiMastersRec*);
-  void FT_Init_Class_tt_service_truetype_glyf(FT_Service_TTGlyfRec*);
+  FT_Error
+  FT_Create_Class_tt_services( FT_Library           library,
+                               FT_ServiceDescRec**  output_class );
+
+  void
+  FT_Destroy_Class_tt_services( FT_Library          library,
+                                FT_ServiceDescRec*  clazz );
+
+  void
+  FT_Init_Class_tt_service_gx_multi_masters(
+    FT_Service_MultiMastersRec*  sv_mm );
+
+  void
+  FT_Init_Class_tt_service_truetype_glyf(
+    FT_Service_TTGlyfRec*  sv_ttglyf );
 
   void
-  tt_driver_class_pic_free(  FT_Library library )
+  tt_driver_class_pic_free( FT_Library  library )
   {
-    FT_PIC_Container* pic_container = &library->pic_container;
-    FT_Memory memory = library->memory;
+    FT_PIC_Container*  pic_container = &library->pic_container;
+    FT_Memory  memory = library->memory;
+
+
     if ( pic_container->truetype )
     {
-      TTModulePIC* container = (TTModulePIC*)pic_container->truetype;
-      if(container->tt_services)
-        FT_Destroy_Class_tt_services(library, container->tt_services);
+      TTModulePIC*  container = (TTModulePIC*)pic_container->truetype;
+
+
+      if ( container->tt_services )
+        FT_Destroy_Class_tt_services( library, container->tt_services );
       container->tt_services = NULL;
       FT_FREE( container );
       pic_container->truetype = NULL;
@@ -58,20 +74,23 @@
     /* allocate pointer, clear and set global container pointer */
     if ( FT_ALLOC ( container, sizeof ( *container ) ) )
       return error;
-    FT_MEM_SET( container, 0, sizeof(*container) );
+    FT_MEM_SET( container, 0, sizeof ( *container ) );
     pic_container->truetype = container;
 
     /* initialize pointer table - this is how the module usually expects this data */
-    error = FT_Create_Class_tt_services(library, &container->tt_services);
-    if(error) 
+    error = FT_Create_Class_tt_services( library,
+                                         &container->tt_services );
+    if ( error )
       goto Exit;
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-    FT_Init_Class_tt_service_gx_multi_masters(&container->tt_service_gx_multi_masters);
+    FT_Init_Class_tt_service_gx_multi_masters(
+      &container->tt_service_gx_multi_masters );
 #endif
-    FT_Init_Class_tt_service_truetype_glyf(&container->tt_service_truetype_glyf);
+    FT_Init_Class_tt_service_truetype_glyf(
+      &container->tt_service_truetype_glyf );
 Exit:
-    if(error)
-      tt_driver_class_pic_free(library);
+    if ( error )
+      tt_driver_class_pic_free( library );
     return error;
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpic.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpic.h
index 84de0fee9e3..48f43a5f927 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpic.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpic.h
@@ -19,7 +19,7 @@
 #ifndef __TTPIC_H__
 #define __TTPIC_H__
 
-  
+
 FT_BEGIN_HEADER
 
 #ifndef FT_CONFIG_OPTION_PIC
@@ -47,6 +47,13 @@ FT_BEGIN_HEADER
 #define FT_TT_SERVICE_GX_MULTI_MASTERS_GET   (GET_PIC(library)->tt_service_gx_multi_masters)
 #define FT_TT_SERVICE_TRUETYPE_GLYF_GET      (GET_PIC(library)->tt_service_truetype_glyf)
 
+  /* see ttpic.c for the implementation */
+  void
+  tt_driver_class_pic_free( FT_Library  library );
+
+  FT_Error
+  tt_driver_class_pic_init( FT_Library  library );
+
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpload.c
index 818b29d2638..bb6005d45ea 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpload.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    TrueType-specific tables loader (body).                              */
 /*                                                                         */
-/*  Copyright 1996-2002, 2004-2011 by                                      */
+/*  Copyright 1996-2002, 2004-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -211,22 +211,22 @@
     }
 
     /* Check broken location data */
-    if ( pos1 >= face->glyf_len )
+    if ( pos1 > face->glyf_len )
     {
       FT_TRACE1(( "tt_face_get_location:"
-                 " too large offset=0x%08lx found for gid=0x%04lx,"
-                 " exceeding the end of glyf table (0x%08lx)\n",
-                 pos1, gindex, face->glyf_len ));
+                  " too large offset=0x%08lx found for gid=0x%04lx,"
+                  " exceeding the end of glyf table (0x%08lx)\n",
+                  pos1, gindex, face->glyf_len ));
       *asize = 0;
       return 0;
     }
 
-    if ( pos2 >= face->glyf_len )
+    if ( pos2 > face->glyf_len )
     {
       FT_TRACE1(( "tt_face_get_location:"
-                 " too large offset=0x%08lx found for gid=0x%04lx,"
-                 " truncate at the end of glyf table (0x%08lx)\n",
-                 pos2, gindex + 1, face->glyf_len ));
+                  " too large offset=0x%08lx found for gid=0x%04lx,"
+                  " truncate at the end of glyf table (0x%08lx)\n",
+                  pos2, gindex + 1, face->glyf_len ));
       pos2 = face->glyf_len;
     }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpload.h
index f61ac079ce0..f61ac079ce0 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/truetype/ttpload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/truetype/ttpload.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/Jamfile
index 8e366baae51..8e366baae51 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/module.mk
index ade0210d76c..ade0210d76c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/rules.mk
index 15087b03044..15087b03044 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1afm.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1afm.c
index 780ab33bf7e..1fff15d73ed 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1afm.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1afm.c
@@ -4,8 +4,7 @@
 /*                                                                         */
 /*    AFM support for Type 1 fonts (body).                                 */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
-/*            2010 by                                                      */
+/*  Copyright 1996-2011 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -252,7 +251,7 @@
     fi->Descender = t1_font->font_bbox.yMin;
 
     psaux = (PSAux_Service)( (T1_Face)t1_face )->psaux;
-    if ( psaux && psaux->afm_parser_funcs )
+    if ( psaux->afm_parser_funcs )
     {
       error = psaux->afm_parser_funcs->init( &parser,
                                              stream->memory,
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1afm.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1afm.h
index 8eb1764de70..8eb1764de70 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1afm.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1afm.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1driver.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1driver.c
index 79516aa3e88..e35d7b11d0b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1driver.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1driver.c
@@ -195,7 +195,7 @@
       if ( idx < sizeof ( type1->font_matrix ) /
                    sizeof ( type1->font_matrix.xx ) )
       {
-        FT_Fixed  val;
+        FT_Fixed  val = 0;
 
 
         retval = sizeof ( val );
@@ -225,7 +225,7 @@
       if ( idx < sizeof ( type1->font_bbox ) /
                    sizeof ( type1->font_bbox.xMin ) )
       {
-        FT_Fixed val;
+        FT_Fixed val = 0;
 
 
         retval = sizeof ( val );
@@ -607,11 +607,11 @@
   };
 
 
-  static FT_Module_Interface
-  Get_Interface( FT_Driver         driver,
+  FT_CALLBACK_DEF( FT_Module_Interface )
+  Get_Interface( FT_Module         module,
                  const FT_String*  t1_interface )
   {
-    FT_UNUSED( driver );
+    FT_UNUSED( module );
 
     return ft_service_list_lookup( t1_services, t1_interface );
   }
@@ -652,11 +652,14 @@
   /*    They can be implemented by format-specific interfaces.             */
   /*                                                                       */
   static FT_Error
-  Get_Kerning( T1_Face     face,
+  Get_Kerning( FT_Face     t1face,        /* T1_Face */
                FT_UInt     left_glyph,
                FT_UInt     right_glyph,
                FT_Vector*  kerning )
   {
+    T1_Face  face = (T1_Face)t1face;
+
+
     kerning->x = 0;
     kerning->y = 0;
 
@@ -681,7 +684,7 @@
       FT_MODULE_DRIVER_SCALABLE   |
       FT_MODULE_DRIVER_HAS_HINTER,
 
-      sizeof( FT_DriverRec ),
+      sizeof ( FT_DriverRec ),
 
       "type1",
       0x10000L,
@@ -689,38 +692,38 @@
 
       0,   /* format interface */
 
-      (FT_Module_Constructor)T1_Driver_Init,
-      (FT_Module_Destructor) T1_Driver_Done,
-      (FT_Module_Requester)  Get_Interface,
+      T1_Driver_Init,
+      T1_Driver_Done,
+      Get_Interface,
     },
 
-    sizeof( T1_FaceRec ),
-    sizeof( T1_SizeRec ),
-    sizeof( T1_GlyphSlotRec ),
+    sizeof ( T1_FaceRec ),
+    sizeof ( T1_SizeRec ),
+    sizeof ( T1_GlyphSlotRec ),
 
-    (FT_Face_InitFunc)        T1_Face_Init,
-    (FT_Face_DoneFunc)        T1_Face_Done,
-    (FT_Size_InitFunc)        T1_Size_Init,
-    (FT_Size_DoneFunc)        T1_Size_Done,
-    (FT_Slot_InitFunc)        T1_GlyphSlot_Init,
-    (FT_Slot_DoneFunc)        T1_GlyphSlot_Done,
+    T1_Face_Init,
+    T1_Face_Done,
+    T1_Size_Init,
+    T1_Size_Done,
+    T1_GlyphSlot_Init,
+    T1_GlyphSlot_Done,
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     ft_stub_set_char_sizes,
     ft_stub_set_pixel_sizes,
 #endif
-    (FT_Slot_LoadFunc)        T1_Load_Glyph,
+    T1_Load_Glyph,
 
 #ifdef T1_CONFIG_OPTION_NO_AFM
-    (FT_Face_GetKerningFunc)  0,
-    (FT_Face_AttachFunc)      0,
+    0,                     /* FT_Face_GetKerningFunc */
+    0,                     /* FT_Face_AttachFunc     */
 #else
-    (FT_Face_GetKerningFunc)  Get_Kerning,
-    (FT_Face_AttachFunc)      T1_Read_Metrics,
+    Get_Kerning,
+    T1_Read_Metrics,
 #endif
-    (FT_Face_GetAdvancesFunc) T1_Get_Advances,
-    (FT_Size_RequestFunc)     T1_Size_Request,
-    (FT_Size_SelectFunc)      0
+    T1_Get_Advances,
+    T1_Size_Request,
+    0                      /* FT_Size_SelectFunc     */
   };
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1driver.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1driver.h
index 9fecbeb0f8f..639cd4a7ad9 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1driver.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1driver.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Driver_ClassRec )  t1_driver_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1errors.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1errors.h
index 81221c343d1..8740530eef7 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1errors.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1errors.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 error codes (specification only).                             */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  T1_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Type1
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1gload.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1gload.c
index f3fad4f5df7..80e54533108 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1gload.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1gload.c
@@ -208,12 +208,13 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T1_Get_Advances( T1_Face    face,
+  T1_Get_Advances( FT_Face    t1face,        /* T1_Face */
                    FT_UInt    first,
                    FT_UInt    count,
-                   FT_ULong   load_flags,
+                   FT_Int32   load_flags,
                    FT_Fixed*  advances )
   {
+    T1_Face        face  = (T1_Face)t1face;
     T1_DecoderRec  decoder;
     T1_Font        type1 = &face->type1;
     PSAux_Service  psaux = (PSAux_Service)face->psaux;
@@ -265,14 +266,15 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T1_Load_Glyph( T1_GlyphSlot  glyph,
-                 T1_Size       size,
+  T1_Load_Glyph( FT_GlyphSlot  t1glyph,          /* T1_GlyphSlot */
+                 FT_Size       t1size,           /* T1_Size      */
                  FT_UInt       glyph_index,
                  FT_Int32      load_flags )
   {
+    T1_GlyphSlot            glyph = (T1_GlyphSlot)t1glyph;
     FT_Error                error;
     T1_DecoderRec           decoder;
-    T1_Face                 face = (T1_Face)glyph->root.face;
+    T1_Face                 face = (T1_Face)t1glyph->face;
     FT_Bool                 hinting;
     T1_Font                 type1         = &face->type1;
     PSAux_Service           psaux         = (PSAux_Service)face->psaux;
@@ -303,10 +305,10 @@
     if ( load_flags & FT_LOAD_NO_RECURSE )
       load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
 
-    if ( size )
+    if ( t1size )
     {
-      glyph->x_scale = size->root.metrics.x_scale;
-      glyph->y_scale = size->root.metrics.y_scale;
+      glyph->x_scale = t1size->metrics.x_scale;
+      glyph->y_scale = t1size->metrics.y_scale;
     }
     else
     {
@@ -314,18 +316,18 @@
       glyph->y_scale = 0x10000L;
     }
 
-    glyph->root.outline.n_points   = 0;
-    glyph->root.outline.n_contours = 0;
+    t1glyph->outline.n_points   = 0;
+    t1glyph->outline.n_contours = 0;
 
     hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE   ) == 0 &&
                        ( load_flags & FT_LOAD_NO_HINTING ) == 0 );
 
-    glyph->root.format = FT_GLYPH_FORMAT_OUTLINE;
+    t1glyph->format = FT_GLYPH_FORMAT_OUTLINE;
 
     error = decoder_funcs->init( &decoder,
-                                 (FT_Face)face,
-                                 (FT_Size)size,
-                                 (FT_GlyphSlot)glyph,
+                                 t1glyph->face,
+                                 t1size,
+                                 t1glyph,
                                  (FT_Byte**)type1->glyph_names,
                                  face->blend,
                                  FT_BOOL( hinting ),
@@ -368,19 +370,19 @@
     /* bearing the yMax                                    */
     if ( !error )
     {
-      glyph->root.outline.flags &= FT_OUTLINE_OWNER;
-      glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
+      t1glyph->outline.flags &= FT_OUTLINE_OWNER;
+      t1glyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
 
       /* for composite glyphs, return only left side bearing and */
       /* advance width                                           */
       if ( load_flags & FT_LOAD_NO_RECURSE )
       {
-        FT_Slot_Internal  internal = glyph->root.internal;
+        FT_Slot_Internal  internal = t1glyph->internal;
 
 
-        glyph->root.metrics.horiBearingX =
+        t1glyph->metrics.horiBearingX =
           FIXED_TO_INT( decoder.builder.left_bearing.x );
-        glyph->root.metrics.horiAdvance  =
+        t1glyph->metrics.horiAdvance  =
           FIXED_TO_INT( decoder.builder.advance.x );
 
         internal->glyph_matrix      = font_matrix;
@@ -390,45 +392,45 @@
       else
       {
         FT_BBox            cbox;
-        FT_Glyph_Metrics*  metrics = &glyph->root.metrics;
+        FT_Glyph_Metrics*  metrics = &t1glyph->metrics;
         FT_Vector          advance;
 
 
         /* copy the _unscaled_ advance width */
         metrics->horiAdvance =
           FIXED_TO_INT( decoder.builder.advance.x );
-        glyph->root.linearHoriAdvance =
+        t1glyph->linearHoriAdvance =
           FIXED_TO_INT( decoder.builder.advance.x );
-        glyph->root.internal->glyph_transformed = 0;
+        t1glyph->internal->glyph_transformed = 0;
 
-        if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) 
+        if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
         {
           /* make up vertical ones */
           metrics->vertAdvance = ( face->type1.font_bbox.yMax -
                                    face->type1.font_bbox.yMin ) >> 16;
-          glyph->root.linearVertAdvance = metrics->vertAdvance;
+          t1glyph->linearVertAdvance = metrics->vertAdvance;
         }
         else
         {
           metrics->vertAdvance =
             FIXED_TO_INT( decoder.builder.advance.y );
-          glyph->root.linearVertAdvance =
+          t1glyph->linearVertAdvance =
             FIXED_TO_INT( decoder.builder.advance.y );
         }
 
-        glyph->root.format = FT_GLYPH_FORMAT_OUTLINE;
+        t1glyph->format = FT_GLYPH_FORMAT_OUTLINE;
 
-        if ( size && size->root.metrics.y_ppem < 24 )
-          glyph->root.outline.flags |= FT_OUTLINE_HIGH_PRECISION;
+        if ( t1size && t1size->metrics.y_ppem < 24 )
+          t1glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
 
 #if 1
         /* apply the font matrix, if any */
         if ( font_matrix.xx != 0x10000L || font_matrix.yy != font_matrix.xx ||
              font_matrix.xy != 0        || font_matrix.yx != 0              )
-          FT_Outline_Transform( &glyph->root.outline, &font_matrix );
+          FT_Outline_Transform( &t1glyph->outline, &font_matrix );
 
         if ( font_offset.x || font_offset.y )
-          FT_Outline_Translate( &glyph->root.outline,
+          FT_Outline_Translate( &t1glyph->outline,
                                 font_offset.x,
                                 font_offset.y );
 
@@ -466,7 +468,7 @@
         }
 
         /* compute the other metrics */
-        FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
+        FT_Outline_Get_CBox( &t1glyph->outline, &cbox );
 
         metrics->width  = cbox.xMax - cbox.xMin;
         metrics->height = cbox.yMax - cbox.yMin;
@@ -474,7 +476,7 @@
         metrics->horiBearingX = cbox.xMin;
         metrics->horiBearingY = cbox.yMax;
 
-        if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) 
+        if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
         {
           /* make up vertical ones */
           ft_synthesize_vertical_metrics( metrics,
@@ -484,8 +486,8 @@
 
       /* Set control data to the glyph charstrings.  Note that this is */
       /* _not_ zero-terminated.                                        */
-      glyph->root.control_data = (FT_Byte*)glyph_data.pointer;
-      glyph->root.control_len  = glyph_data.length;
+      t1glyph->control_data = (FT_Byte*)glyph_data.pointer;
+      t1glyph->control_len  = glyph_data.length;
     }
 
 
@@ -500,8 +502,8 @@
 
       /* Set the control data to null - it is no longer available if   */
       /* loaded incrementally.                                         */
-      glyph->root.control_data = 0;
-      glyph->root.control_len  = 0;
+      t1glyph->control_data = 0;
+      t1glyph->control_len  = 0;
     }
 #endif
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1gload.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1gload.h
index 100df06e8e3..0bdea3a8d5b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1gload.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1gload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 Glyph Loader (specification).                                 */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2008 by                               */
+/*  Copyright 1996-2001, 2002, 2003, 2008, 2011 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -32,15 +32,15 @@ FT_BEGIN_HEADER
                           FT_Pos*  max_advance );
 
   FT_LOCAL( FT_Error )
-  T1_Get_Advances( T1_Face    face,
+  T1_Get_Advances( FT_Face    face,
                    FT_UInt    first,
                    FT_UInt    count,
-                   FT_ULong   load_flags,
+                   FT_Int32   load_flags,
                    FT_Fixed*  advances );
 
   FT_LOCAL( FT_Error )
-  T1_Load_Glyph( T1_GlyphSlot  glyph,
-                 T1_Size       size,
+  T1_Load_Glyph( FT_GlyphSlot  glyph,
+                 FT_Size       size,
                  FT_UInt       glyph_index,
                  FT_Int32      load_flags );
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1load.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1load.c
index 1451fe5876d..a0adfd49033 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1load.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1load.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 font loader (body).                                           */
 /*                                                                         */
-/*  Copyright 1996-2011 by                                                 */
+/*  Copyright 1996-2012 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1075,8 +1075,8 @@
   /* and `/CharStrings' dictionaries.                                */
 
   static void
-  parse_font_matrix( T1_Face    face,
-                     T1_Loader  loader )
+  t1_parse_font_matrix( T1_Face    face,
+                        T1_Loader  loader )
   {
     T1_Parser   parser = &loader->parser;
     FT_Matrix*  matrix = &face->type1.font_matrix;
@@ -1099,7 +1099,7 @@
 
     if ( temp_scale == 0 )
     {
-      FT_ERROR(( "parse_font_matrix: invalid font matrix\n" ));
+      FT_ERROR(( "t1_parse_font_matrix: invalid font matrix\n" ));
       parser->root.error = T1_Err_Invalid_File_Format;
       return;
     }
@@ -1388,7 +1388,8 @@
 
 
       /* If the next token isn't `dup' we are done. */
-      if ( ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
+      if ( parser->root.cursor + 4 < parser->root.limit            &&
+           ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
         break;
 
       T1_Skip_PS_Token( parser );       /* `dup' */
@@ -1407,7 +1408,8 @@
         return;
       T1_Skip_Spaces  ( parser );
 
-      if ( ft_strncmp( (char*)parser->root.cursor, "put", 3 ) == 0 )
+      if ( parser->root.cursor + 4 < parser->root.limit            &&
+           ft_strncmp( (char*)parser->root.cursor, "put", 3 ) == 0 )
       {
         T1_Skip_PS_Token( parser ); /* skip `put' */
         T1_Skip_Spaces  ( parser );
@@ -1772,7 +1774,7 @@
 #include "t1tokens.h"
 
     /* now add the special functions... */
-    T1_FIELD_CALLBACK( "FontMatrix",           parse_font_matrix,
+    T1_FIELD_CALLBACK( "FontMatrix",           t1_parse_font_matrix,
                        T1_FIELD_DICT_FONTDICT )
     T1_FIELD_CALLBACK( "Encoding",             parse_encoding,
                        T1_FIELD_DICT_FONTDICT )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1load.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1load.h
index 546fc33530b..546fc33530b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1load.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1load.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1objs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1objs.c
index 58632109c74..b685f2f1bf3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1objs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1objs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 objects manager (body).                                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
+/*  Copyright 1996-2009, 2011 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -72,8 +72,11 @@
 
 
   FT_LOCAL_DEF( void )
-  T1_Size_Done( T1_Size  size )
+  T1_Size_Done( FT_Size  t1size )          /* T1_Size */
   {
+    T1_Size  size = (T1_Size)t1size;
+
+
     if ( size->root.internal )
     {
       PSH_Globals_Funcs  funcs;
@@ -89,8 +92,9 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T1_Size_Init( T1_Size  size )
+  T1_Size_Init( FT_Size  t1size )      /* T1_Size */
   {
+    T1_Size            size  = (T1_Size)t1size;
     FT_Error           error = T1_Err_Ok;
     PSH_Globals_Funcs  funcs = T1_Size_Get_Globals_Funcs( size );
 
@@ -112,9 +116,10 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T1_Size_Request( T1_Size          size,
+  T1_Size_Request( FT_Size          t1size,     /* T1_Size */
                    FT_Size_Request  req )
   {
+    T1_Size            size  = (T1_Size)t1size;
     PSH_Globals_Funcs  funcs = T1_Size_Get_Globals_Funcs( size );
 
 
@@ -137,20 +142,20 @@
   /*************************************************************************/
 
   FT_LOCAL_DEF( void )
-  T1_GlyphSlot_Done( T1_GlyphSlot  slot )
+  T1_GlyphSlot_Done( FT_GlyphSlot  slot )
   {
-    slot->root.internal->glyph_hints = 0;
+    slot->internal->glyph_hints = 0;
   }
 
 
   FT_LOCAL_DEF( FT_Error )
-  T1_GlyphSlot_Init( T1_GlyphSlot  slot )
+  T1_GlyphSlot_Init( FT_GlyphSlot  slot )
   {
     T1_Face           face;
     PSHinter_Service  pshinter;
 
 
-    face     = (T1_Face)slot->root.face;
+    face     = (T1_Face)slot->face;
     pshinter = (PSHinter_Service)face->pshinter;
 
     if ( pshinter )
@@ -158,15 +163,18 @@
       FT_Module  module;
 
 
-      module = FT_Get_Module( slot->root.face->driver->root.library, "pshinter" );
-      if (module)
+      module = FT_Get_Module( slot->face->driver->root.library,
+                              "pshinter" );
+      if ( module )
       {
         T1_Hints_Funcs  funcs;
 
+
         funcs = pshinter->get_t1_funcs( module );
-        slot->root.internal->glyph_hints = (void*)funcs;
+        slot->internal->glyph_hints = (void*)funcs;
       }
     }
+
     return 0;
   }
 
@@ -190,8 +198,9 @@
   /*    face :: A typeless pointer to the face object to destroy.          */
   /*                                                                       */
   FT_LOCAL_DEF( void )
-  T1_Face_Done( T1_Face  face )
+  T1_Face_Done( FT_Face  t1face )         /* T1_Face */
   {
+    T1_Face    face = (T1_Face)t1face;
     FT_Memory  memory;
     T1_Font    type1;
 
@@ -289,11 +298,12 @@
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
   T1_Face_Init( FT_Stream      stream,
-                T1_Face        face,
+                FT_Face        t1face,          /* T1_Face */
                 FT_Int         face_index,
                 FT_Int         num_params,
                 FT_Parameter*  params )
   {
+    T1_Face             face = (T1_Face)t1face;
     FT_Error            error;
     FT_Service_PsCMaps  psnames;
     PSAux_Service       psaux;
@@ -313,10 +323,18 @@
     face->psaux = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
                                            "psaux" );
     psaux = (PSAux_Service)face->psaux;
+    if ( !psaux )
+    {
+      FT_ERROR(( "T1_Face_Init: cannot access `psaux' module\n" ));
+      error = T1_Err_Missing_Module;
+      goto Exit;
+    }
 
     face->pshinter = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
                                               "pshinter" );
 
+    FT_TRACE2(( "Type 1 driver\n" ));
+
     /* open the tokenizer; this will also check the font format */
     error = T1_Open_Face( face );
     if ( error )
@@ -447,7 +465,7 @@
       root->bbox.xMax = ( type1->font_bbox.xMax + 0xFFFF ) >> 16;
       root->bbox.yMax = ( type1->font_bbox.yMax + 0xFFFF ) >> 16;
 
-      /* Set units_per_EM if we didn't set it in parse_font_matrix. */
+      /* Set units_per_EM if we didn't set it in t1_parse_font_matrix. */
       if ( !root->units_per_EM )
         root->units_per_EM = 1000;
 
@@ -484,7 +502,7 @@
       FT_Face  root = &face->root;
 
 
-      if ( psnames && psaux )
+      if ( psnames )
       {
         FT_CharMapRec    charmap;
         T1_CMap_Classes  cmap_classes = psaux->t1_cmap_classes;
@@ -568,7 +586,7 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
-  T1_Driver_Init( T1_Driver  driver )
+  T1_Driver_Init( FT_Module  driver )
   {
     FT_UNUSED( driver );
 
@@ -588,7 +606,7 @@
   /*    driver :: A handle to the target Type 1 driver.                    */
   /*                                                                       */
   FT_LOCAL_DEF( void )
-  T1_Driver_Done( T1_Driver  driver )
+  T1_Driver_Done( FT_Module  driver )
   {
     FT_UNUSED( driver );
   }
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1objs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1objs.h
index e5e90293d7e..54ccbb996a1 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1objs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1objs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 objects manager (specification).                              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2006 by                                     */
+/*  Copyright 1996-2001, 2002, 2006, 2011 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -37,17 +37,6 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Type>                                                                */
-  /*    T1_Driver                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a Type 1 driver object.                                */
-  /*                                                                       */
-  typedef struct T1_DriverRec_   *T1_Driver;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
   /*    T1_Size                                                            */
   /*                                                                       */
   /* <Description>                                                         */
@@ -106,14 +95,14 @@ FT_BEGIN_HEADER
 
 
   FT_LOCAL( void )
-  T1_Size_Done( T1_Size  size );
+  T1_Size_Done( FT_Size  size );
 
   FT_LOCAL( FT_Error )
-  T1_Size_Request( T1_Size          size,
+  T1_Size_Request( FT_Size          size,
                    FT_Size_Request  req );
 
   FT_LOCAL( FT_Error )
-  T1_Size_Init( T1_Size  size );
+  T1_Size_Init( FT_Size  size );
 
 
   /*************************************************************************/
@@ -142,25 +131,25 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( FT_Error )
   T1_Face_Init( FT_Stream      stream,
-                T1_Face        face,
+                FT_Face        face,
                 FT_Int         face_index,
                 FT_Int         num_params,
                 FT_Parameter*  params );
 
   FT_LOCAL( void )
-  T1_Face_Done( T1_Face  face );
+  T1_Face_Done( FT_Face  face );
 
   FT_LOCAL( FT_Error )
-  T1_GlyphSlot_Init( T1_GlyphSlot  slot );
+  T1_GlyphSlot_Init( FT_GlyphSlot  slot );
 
   FT_LOCAL( void )
-  T1_GlyphSlot_Done( T1_GlyphSlot  slot );
+  T1_GlyphSlot_Done( FT_GlyphSlot  slot );
 
   FT_LOCAL( FT_Error )
-  T1_Driver_Init( T1_Driver  driver );
+  T1_Driver_Init( FT_Module  driver );
 
   FT_LOCAL( void )
-  T1_Driver_Done( T1_Driver  driver );
+  T1_Driver_Done( FT_Module  driver );
 
 
 FT_END_HEADER
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1parse.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1parse.c
index 2a762279fd3..495527962e8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1parse.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1parse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 parser (body).                                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2008, 2009 by             */
+/*  Copyright 1996-2005, 2008, 2009, 2012 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -164,7 +164,7 @@
       error = check_type1_format( stream, "%!FontType", 10 );
       if ( error )
       {
-        FT_TRACE2(( "[not a Type1 font]\n" ));
+        FT_TRACE2(( "  not a Type 1 font\n" ));
         goto Exit;
       }
     }
@@ -404,7 +404,7 @@
       /* characters...  So skip now all whitespace character codes.      */
       while ( cur < limit       &&
               ( *cur == ' '  ||
-                *cur == '\t' || 
+                *cur == '\t' ||
                 *cur == '\r' ||
                 *cur == '\n' ) )
         ++cur;
@@ -467,6 +467,14 @@
     /* we now decrypt the encoded binary private dictionary */
     psaux->t1_decrypt( parser->private_dict, parser->private_len, 55665U );
 
+    if ( parser->private_len < 4 )
+    {
+      FT_ERROR(( "T1_Get_Private_Dict:"
+                 " invalid private dictionary section\n" ));
+      error = T1_Err_Invalid_File_Format;
+      goto Fail;
+    }
+
     /* replace the four random bytes at the beginning with whitespace */
     parser->private_dict[0] = ' ';
     parser->private_dict[1] = ' ';
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1parse.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1parse.h
index fb1c8a88308..fb1c8a88308 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1parse.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1tokens.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1tokens.h
index 2d692f0e619..e37276b9083 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/t1tokens.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/t1tokens.h
@@ -96,7 +96,7 @@
                        T1_FIELD_DICT_PRIVATE )
   T1_FIELD_BOOL      ( "ForceBold",        force_bold,
                        T1_FIELD_DICT_PRIVATE )
-                         
+
 
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  T1_FontRec
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/type1.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/type1.c
index ccc12be1038..ccc12be1038 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type1/type1.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type1/type1.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/Jamfile
index 00371d54f32..00371d54f32 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/module.mk
index b3f10a8d3c8..b3f10a8d3c8 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/rules.mk
index eac1081eb1f..eac1081eb1f 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42drivr.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42drivr.c
index f56d6e773c0..9b93209ad1e 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42drivr.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42drivr.c
@@ -184,11 +184,11 @@
   };
 
 
-  static FT_Module_Interface
-  T42_Get_Interface( FT_Driver         driver,
+  FT_CALLBACK_DEF( FT_Module_Interface )
+  T42_Get_Interface( FT_Module         module,
                      const FT_String*  t42_interface )
   {
-    FT_UNUSED( driver );
+    FT_UNUSED( module );
 
     return ft_service_list_lookup( t42_services, t42_interface );
   }
@@ -213,34 +213,34 @@
 
       0,    /* format interface */
 
-      (FT_Module_Constructor)T42_Driver_Init,
-      (FT_Module_Destructor) T42_Driver_Done,
-      (FT_Module_Requester)  T42_Get_Interface,
+      T42_Driver_Init,
+      T42_Driver_Done,
+      T42_Get_Interface,
     },
 
     sizeof ( T42_FaceRec ),
     sizeof ( T42_SizeRec ),
     sizeof ( T42_GlyphSlotRec ),
 
-    (FT_Face_InitFunc)        T42_Face_Init,
-    (FT_Face_DoneFunc)        T42_Face_Done,
-    (FT_Size_InitFunc)        T42_Size_Init,
-    (FT_Size_DoneFunc)        T42_Size_Done,
-    (FT_Slot_InitFunc)        T42_GlyphSlot_Init,
-    (FT_Slot_DoneFunc)        T42_GlyphSlot_Done,
+    T42_Face_Init,
+    T42_Face_Done,
+    T42_Size_Init,
+    T42_Size_Done,
+    T42_GlyphSlot_Init,
+    T42_GlyphSlot_Done,
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     ft_stub_set_char_sizes,
     ft_stub_set_pixel_sizes,
 #endif
-    (FT_Slot_LoadFunc)        T42_GlyphSlot_Load,
+    T42_GlyphSlot_Load,
 
-    (FT_Face_GetKerningFunc)  0,
-    (FT_Face_AttachFunc)      0,
+    0,                 /* FT_Face_GetKerningFunc  */
+    0,                 /* FT_Face_AttachFunc      */
 
-    (FT_Face_GetAdvancesFunc) 0,
-    (FT_Size_RequestFunc)     T42_Size_Request,
-    (FT_Size_SelectFunc)      T42_Size_Select
+    0,                 /* FT_Face_GetAdvancesFunc */
+    T42_Size_Request,
+    T42_Size_Select
   };
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42drivr.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42drivr.h
index 4717e4613f3..9a1e97e30e3 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42drivr.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42drivr.h
@@ -27,7 +27,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
 
   FT_EXPORT_VAR( const FT_Driver_ClassRec )  t42_driver_class;
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42error.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42error.h
index b230910012f..217ae8bd529 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42error.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42error.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 error codes (specification only).                            */
 /*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
+/*  Copyright 2002, 2003, 2012 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -29,6 +29,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  T42_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Type42
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42objs.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42objs.c
index a5e0ee5e81f..c6053afed24 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42objs.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42objs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 objects manager (body).                                      */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009               */
+/*  Copyright 2002-2009, 2011                                              */
 /*  by Roberto Alameda.                                                    */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -21,7 +21,7 @@
 #include "t42error.h"
 #include FT_INTERNAL_DEBUG_H
 #include FT_LIST_H
-#include FT_TRUETYPE_IDS_H 
+#include FT_TRUETYPE_IDS_H
 
 
 #undef  FT_COMPONENT
@@ -61,6 +61,8 @@
 
     if ( type1->font_type != 42 )
     {
+      FT_ERROR(( "T42_Open_Face: cannot handle FontType %d\n",
+                 type1->font_type ));
       error = T42_Err_Unknown_File_Format;
       goto Exit;
     }
@@ -152,11 +154,12 @@
 
   FT_LOCAL_DEF( FT_Error )
   T42_Face_Init( FT_Stream      stream,
-                 T42_Face       face,
+                 FT_Face        t42face,       /* T42_Face */
                  FT_Int         face_index,
                  FT_Int         num_params,
                  FT_Parameter*  params )
   {
+    T42_Face            face  = (T42_Face)t42face;
     FT_Error            error;
     FT_Service_PsCMaps  psnames;
     PSAux_Service       psaux;
@@ -179,6 +182,14 @@
     face->psaux = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
                                            "psaux" );
     psaux = (PSAux_Service)face->psaux;
+    if ( !psaux )
+    {
+      FT_ERROR(( "T42_Face_Init: cannot access `psaux' module\n" ));
+      error = T42_Err_Missing_Module;
+      goto Exit;
+    }
+
+    FT_TRACE2(( "Type 42 driver\n" ));
 
     /* open the tokenizer, this will also check the font format */
     error = T42_Open_Face( face );
@@ -321,7 +332,7 @@
       root->face_flags |= FT_FACE_FLAG_VERTICAL;
 
     {
-      if ( psnames && psaux )
+      if ( psnames )
       {
         FT_CharMapRec    charmap;
         T1_CMap_Classes  cmap_classes = psaux->t1_cmap_classes;
@@ -390,8 +401,9 @@
 
 
   FT_LOCAL_DEF( void )
-  T42_Face_Done( T42_Face  face )
+  T42_Face_Done( FT_Face  t42face )
   {
+    T42_Face     face = (T42_Face)t42face;
     T1_Font      type1;
     PS_FontInfo  info;
     FT_Memory    memory;
@@ -459,12 +471,19 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   FT_LOCAL_DEF( FT_Error )
-  T42_Driver_Init( T42_Driver  driver )
+  T42_Driver_Init( FT_Module  module )        /* T42_Driver */
   {
-    FT_Module  ttmodule;
+    T42_Driver  driver = (T42_Driver)module;
+    FT_Module   ttmodule;
 
 
-    ttmodule = FT_Get_Module( FT_MODULE(driver)->library, "truetype" );
+    ttmodule = FT_Get_Module( module->library, "truetype" );
+    if ( !ttmodule )
+    {
+      FT_ERROR(( "T42_Driver_Init: cannot access `truetype' module\n" ));
+      return T42_Err_Missing_Module;
+    }
+
     driver->ttclazz = (FT_Driver_Class)ttmodule->clazz;
 
     return T42_Err_Ok;
@@ -472,23 +491,24 @@
 
 
   FT_LOCAL_DEF( void )
-  T42_Driver_Done( T42_Driver  driver )
+  T42_Driver_Done( FT_Module  module )
   {
-    FT_UNUSED( driver );
+    FT_UNUSED( module );
   }
 
 
   FT_LOCAL_DEF( FT_Error )
-  T42_Size_Init( T42_Size  size )
+  T42_Size_Init( FT_Size  size )         /* T42_Size */
   {
-    FT_Face   face = size->root.face;
+    T42_Size  t42size = (T42_Size)size;
+    FT_Face   face    = size->face;
     T42_Face  t42face = (T42_Face)face;
     FT_Size   ttsize;
     FT_Error  error   = T42_Err_Ok;
 
 
     error = FT_New_Size( t42face->ttf_face, &ttsize );
-    size->ttsize = ttsize;
+    t42size->ttsize = ttsize;
 
     FT_Activate_Size( ttsize );
 
@@ -497,10 +517,11 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T42_Size_Request( T42_Size         size,
+  T42_Size_Request( FT_Size          t42size,      /* T42_Size */
                     FT_Size_Request  req )
   {
-    T42_Face  face = (T42_Face)size->root.face;
+    T42_Size  size = (T42_Size)t42size;
+    T42_Face  face = (T42_Face)t42size->face;
     FT_Error  error;
 
 
@@ -508,17 +529,18 @@
 
     error = FT_Request_Size( face->ttf_face, req );
     if ( !error )
-      ( (FT_Size)size )->metrics = face->ttf_face->size->metrics;
+      t42size->metrics = face->ttf_face->size->metrics;
 
     return error;
   }
 
 
   FT_LOCAL_DEF( FT_Error )
-  T42_Size_Select( T42_Size  size,
+  T42_Size_Select( FT_Size   t42size,         /* T42_Size */
                    FT_ULong  strike_index )
   {
-    T42_Face  face = (T42_Face)size->root.face;
+    T42_Size  size = (T42_Size)t42size;
+    T42_Face  face = (T42_Face)t42size->face;
     FT_Error  error;
 
 
@@ -526,7 +548,7 @@
 
     error = FT_Select_Size( face->ttf_face, (FT_Int)strike_index );
     if ( !error )
-      ( (FT_Size)size )->metrics = face->ttf_face->size->metrics;
+      t42size->metrics = face->ttf_face->size->metrics;
 
     return error;
 
@@ -534,9 +556,10 @@
 
 
   FT_LOCAL_DEF( void )
-  T42_Size_Done( T42_Size  size )
+  T42_Size_Done( FT_Size  t42size )             /* T42_Size */
   {
-    FT_Face      face    = size->root.face;
+    T42_Size     size    = (T42_Size)t42size;
+    FT_Face      face    = t42size->face;
     T42_Face     t42face = (T42_Face)face;
     FT_ListNode  node;
 
@@ -551,12 +574,13 @@
 
 
   FT_LOCAL_DEF( FT_Error )
-  T42_GlyphSlot_Init( T42_GlyphSlot  slot )
+  T42_GlyphSlot_Init( FT_GlyphSlot  t42slot )        /* T42_GlyphSlot */
   {
-    FT_Face       face    = slot->root.face;
-    T42_Face      t42face = (T42_Face)face;
-    FT_GlyphSlot  ttslot;
-    FT_Error      error   = T42_Err_Ok;
+    T42_GlyphSlot  slot    = (T42_GlyphSlot)t42slot;
+    FT_Face        face    = t42slot->face;
+    T42_Face       t42face = (T42_Face)face;
+    FT_GlyphSlot   ttslot;
+    FT_Error       error   = T42_Err_Ok;
 
 
     if ( face->glyph == NULL )
@@ -575,8 +599,11 @@
 
 
   FT_LOCAL_DEF( void )
-  T42_GlyphSlot_Done( T42_GlyphSlot slot )
+  T42_GlyphSlot_Done( FT_GlyphSlot  t42slot )       /* T42_GlyphSlot */
   {
+    T42_GlyphSlot  slot = (T42_GlyphSlot)t42slot;
+
+
     FT_Done_GlyphSlot( slot->ttslot );
   }
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42objs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42objs.h
index 289dedcc69b..02d13259bed 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42objs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42objs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 objects manager (specification).                             */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007 by Roberto Alameda.                   */
+/*  Copyright 2002, 2003, 2006, 2007, 2011 by Roberto Alameda.             */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -65,36 +65,36 @@ FT_BEGIN_HEADER
 
   FT_LOCAL( FT_Error )
   T42_Face_Init( FT_Stream      stream,
-                 T42_Face       face,
+                 FT_Face        face,
                  FT_Int         face_index,
                  FT_Int         num_params,
                  FT_Parameter*  params );
 
 
   FT_LOCAL( void )
-  T42_Face_Done( T42_Face  face );
+  T42_Face_Done( FT_Face  face );
 
 
   FT_LOCAL( FT_Error )
-  T42_Size_Init( T42_Size  size );
+  T42_Size_Init( FT_Size  size );
 
 
   FT_LOCAL( FT_Error )
-  T42_Size_Request( T42_Size         size,
+  T42_Size_Request( FT_Size          size,
                     FT_Size_Request  req );
 
 
   FT_LOCAL( FT_Error )
-  T42_Size_Select( T42_Size  size,
+  T42_Size_Select( FT_Size   size,
                    FT_ULong  strike_index );
 
 
   FT_LOCAL( void )
-  T42_Size_Done( T42_Size  size );
+  T42_Size_Done( FT_Size  size );
 
 
   FT_LOCAL( FT_Error )
-  T42_GlyphSlot_Init( T42_GlyphSlot  slot );
+  T42_GlyphSlot_Init( FT_GlyphSlot  slot );
 
 
   FT_LOCAL( FT_Error )
@@ -104,14 +104,14 @@ FT_BEGIN_HEADER
                       FT_Int32      load_flags );
 
   FT_LOCAL( void )
-  T42_GlyphSlot_Done( T42_GlyphSlot slot );
+  T42_GlyphSlot_Done( FT_GlyphSlot  slot );
 
 
   FT_LOCAL( FT_Error )
-  T42_Driver_Init( T42_Driver  driver );
+  T42_Driver_Init( FT_Module  module );
 
   FT_LOCAL( void )
-  T42_Driver_Done( T42_Driver  driver );
+  T42_Driver_Done( FT_Module  module );
 
  /* */
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42parse.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42parse.c
index 577426917bb..468b4633449 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42parse.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42parse.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 42 font parser (body).                                          */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by      */
+/*  Copyright 2002-2012 by                                                 */
 /*  Roberto Alameda.                                                       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -175,7 +175,7 @@
 
     if ( ft_memcmp( stream->cursor, "%!PS-TrueTypeFont", 17 ) != 0 )
     {
-      FT_TRACE2(( "not a Type42 font\n" ));
+      FT_TRACE2(( "  not a Type42 font\n" ));
       error = T42_Err_Unknown_File_Format;
     }
 
@@ -607,8 +607,9 @@
         goto Fail;
       }
 
-      /* A string can have a trailing zero byte for padding.  Ignore it. */
-      if ( string_buf[string_size - 1] == 0 && ( string_size % 2 == 1 ) )
+      /* A string can have a trailing zero (odd) byte for padding. */
+      /* Ignore it.                                                */
+      if ( ( string_size & 1 ) && string_buf[string_size - 1] == 0 )
         string_size--;
 
       if ( !string_size )
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42parse.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42parse.h
index f77ec4af4f4..f77ec4af4f4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42parse.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42parse.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42types.h b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42types.h
index c7c2db490df..c7c2db490df 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/t42types.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/t42types.h
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/type42.c b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/type42.c
index d13df56b10c..d13df56b10c 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/type42/type42.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/type42/type42.c
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/Jamfile b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/Jamfile
index 71cf5678e8b..71cf5678e8b 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/Jamfile
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/Jamfile
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/fnterrs.h b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/fnterrs.h
index ea80909715d..463ba77ee24 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/fnterrs.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/fnterrs.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Win FNT/FON error codes (specification only).                        */
 /*                                                                         */
-/*  Copyright 2001 by                                                      */
+/*  Copyright 2001, 2012 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -30,6 +30,7 @@
 
 #undef __FTERRORS_H__
 
+#undef  FT_ERR_PREFIX
 #define FT_ERR_PREFIX  FNT_Err_
 #define FT_ERR_BASE    FT_Mod_Err_Winfonts
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/module.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/module.mk
index b44d7f0570a..b44d7f0570a 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/module.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/module.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/rules.mk b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/rules.mk
index 71a7df2d8ab..71a7df2d8ab 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/rules.mk
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/rules.mk
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/winfnt.c b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/winfnt.c
index ee17d16659b..a551896644d 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/winfnt.c
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/winfnt.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType font driver for Windows FNT/FON files                       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010 by */
+/*  Copyright 1996-2004, 2006-2012 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*  Copyright 2003 Huw D M Davies for Codeweavers                          */
 /*  Copyright 2007 Dmitry Timoshkov for Codeweavers                        */
@@ -23,7 +23,7 @@
 #include FT_INTERNAL_DEBUG_H
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_OBJECTS_H
-#include FT_TRUETYPE_IDS_H 
+#include FT_TRUETYPE_IDS_H
 
 #include "winfnt.h"
 #include "fnterrs.h"
@@ -224,7 +224,7 @@
     if ( header->version != 0x200 &&
          header->version != 0x300 )
     {
-      FT_TRACE2(( "[not a valid FNT file]\n" ));
+      FT_TRACE2(( "  not a Windows FNT file\n" ));
       error = FNT_Err_Unknown_File_Format;
       goto Exit;
     }
@@ -234,7 +234,7 @@
 
     if ( header->file_size < size )
     {
-      FT_TRACE2(( "[not a valid FNT file]\n" ));
+      FT_TRACE2(( "  not a Windows FNT file\n" ));
       error = FNT_Err_Unknown_File_Format;
       goto Exit;
     }
@@ -665,8 +665,9 @@
 
 
   static void
-  FNT_Face_Done( FNT_Face  face )
+  FNT_Face_Done( FT_Face  fntface )       /* FNT_Face */
   {
+    FNT_Face   face = (FNT_Face)fntface;
     FT_Memory  memory;
 
 
@@ -677,18 +678,19 @@
 
     fnt_font_done( face );
 
-    FT_FREE( face->root.available_sizes );
-    face->root.num_fixed_sizes = 0;
+    FT_FREE( fntface->available_sizes );
+    fntface->num_fixed_sizes = 0;
   }
 
 
   static FT_Error
   FNT_Face_Init( FT_Stream      stream,
-                 FNT_Face       face,
+                 FT_Face        fntface,        /* FNT_Face */
                  FT_Int         face_index,
                  FT_Int         num_params,
                  FT_Parameter*  params )
   {
+    FNT_Face   face   = (FNT_Face)fntface;
     FT_Error   error;
     FT_Memory  memory = FT_FACE_MEMORY( face );
 
@@ -696,6 +698,8 @@
     FT_UNUSED( params );
 
 
+    FT_TRACE2(( "Windows FNT driver\n" ));
+
     /* try to load font from a DLL */
     error = fnt_face_get_dll_font( face, face_index );
     if ( !error && face_index < 0 )
@@ -709,7 +713,7 @@
       if ( FT_NEW( face->font ) )
         goto Exit;
 
-      face->root.num_faces = 1;
+      fntface->num_faces = 1;
 
       font           = face->font;
       font->offset   = 0;
@@ -827,7 +831,14 @@
           root->charmap = root->charmaps[0];
       }
 
-      /* setup remaining flags */
+      /* set up remaining flags */
+
+      if ( font->header.last_char < font->header.first_char )
+      {
+        FT_TRACE2(( "invalid number of glyphs\n" ));
+        error = FNT_Err_Invalid_File_Format;
+        goto Fail;
+      }
 
       /* reserve one slot for the .notdef glyph at index 0 */
       root->num_glyphs = font->header.last_char -
@@ -874,7 +885,7 @@
     goto Exit;
 
   Fail:
-    FNT_Face_Done( face );
+    FNT_Face_Done( fntface );
 
   Exit:
     return error;
@@ -882,11 +893,14 @@
 
 
   static FT_Error
-  FNT_Size_Select( FT_Size  size )
+  FNT_Size_Select( FT_Size   size,
+                   FT_ULong  strike_index )
   {
     FNT_Face          face   = (FNT_Face)size->face;
     FT_WinFNT_Header  header = &face->font->header;
 
+    FT_UNUSED( strike_index );
+
 
     FT_Select_Metrics( size->face, 0 );
 
@@ -933,7 +947,7 @@
     if ( error )
       return error;
     else
-      return FNT_Size_Select( size );
+      return FNT_Size_Select( size, 0 );
   }
 
 
@@ -1086,10 +1100,10 @@
 
 
   static FT_Module_Interface
-  winfnt_get_service( FT_Driver         driver,
+  winfnt_get_service( FT_Module         module,
                       const FT_String*  service_id )
   {
-    FT_UNUSED( driver );
+    FT_UNUSED( module );
 
     return ft_service_list_lookup( winfnt_services, service_id );
   }
@@ -1111,34 +1125,34 @@
 
       0,
 
-      (FT_Module_Constructor)0,
-      (FT_Module_Destructor) 0,
-      (FT_Module_Requester)  winfnt_get_service
+      0,                  /* FT_Module_Constructor */
+      0,                  /* FT_Module_Destructor  */
+      winfnt_get_service
     },
 
-    sizeof( FNT_FaceRec ),
-    sizeof( FT_SizeRec ),
-    sizeof( FT_GlyphSlotRec ),
+    sizeof ( FNT_FaceRec ),
+    sizeof ( FT_SizeRec ),
+    sizeof ( FT_GlyphSlotRec ),
 
-    (FT_Face_InitFunc)        FNT_Face_Init,
-    (FT_Face_DoneFunc)        FNT_Face_Done,
-    (FT_Size_InitFunc)        0,
-    (FT_Size_DoneFunc)        0,
-    (FT_Slot_InitFunc)        0,
-    (FT_Slot_DoneFunc)        0,
+    FNT_Face_Init,
+    FNT_Face_Done,
+    0,                    /* FT_Size_InitFunc */
+    0,                    /* FT_Size_DoneFunc */
+    0,                    /* FT_Slot_InitFunc */
+    0,                    /* FT_Slot_DoneFunc */
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     ft_stub_set_char_sizes,
     ft_stub_set_pixel_sizes,
 #endif
-    (FT_Slot_LoadFunc)        FNT_Load_Glyph,
+    FNT_Load_Glyph,
 
-    (FT_Face_GetKerningFunc)  0,
-    (FT_Face_AttachFunc)      0,
-    (FT_Face_GetAdvancesFunc) 0,
+    0,                    /* FT_Face_GetKerningFunc  */
+    0,                    /* FT_Face_AttachFunc      */
+    0,                    /* FT_Face_GetAdvancesFunc */
 
-    (FT_Size_RequestFunc)     FNT_Size_Request,
-    (FT_Size_SelectFunc)      FNT_Size_Select
+    FNT_Size_Request,
+    FNT_Size_Select
   };
 
 
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/winfnt.h b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/winfnt.h
index 70a90861abf..b7a80736d83 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/src/winfonts/winfnt.h
+++ b/Build/source/libs/freetype2/freetype-2.4.9/src/winfonts/winfnt.h
@@ -30,7 +30,7 @@ FT_BEGIN_HEADER
 
 #ifdef FT_CONFIG_OPTION_PIC
 #error "this module does not support PIC yet"
-#endif 
+#endif
 
   typedef struct  WinMZ_HeaderRec_
   {
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/version.sed b/Build/source/libs/freetype2/freetype-2.4.9/version.sed
index c281ff506b4..c281ff506b4 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/version.sed
+++ b/Build/source/libs/freetype2/freetype-2.4.9/version.sed
diff --git a/Build/source/libs/freetype2/freetype-2.4.8/vms_make.com b/Build/source/libs/freetype2/freetype-2.4.9/vms_make.com
index 1aa83e7e304..1aa83e7e304 100644
--- a/Build/source/libs/freetype2/freetype-2.4.8/vms_make.com
+++ b/Build/source/libs/freetype2/freetype-2.4.9/vms_make.com
diff --git a/Build/source/libs/freetype2/version.ac b/Build/source/libs/freetype2/version.ac
index bd13157d991..1ebe71592a2 100644
--- a/Build/source/libs/freetype2/version.ac
+++ b/Build/source/libs/freetype2/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current freetype version
-m4_define([freetype_version], [2.4.8])
+m4_define([freetype_version], [2.4.9])