Update freetype to 2.5.4.

third_party/freetype/src/base/ftfstype.c

Index: third_party/freetype/src/base/ftfstype.c
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftfstype.c b/third_party/freetype/src/base/ftfstype.c
similarity index 84%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftfstype.c
rename to third_party/freetype/src/base/ftfstype.c
index 948263a64f1c9c528726045b799fd6996e2d109c..6b49ef837185a3037a3c3f3c4e82b7b04b90370a 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/ftfstype.c
+++ b/third_party/freetype/src/base/ftfstype.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType utility file to access FSType data (body).                  */
 /*                                                                         */
-/*  Copyright 2008, 2009 by                                                */
+/*  Copyright 2008, 2009, 2014 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -15,11 +15,11 @@
 /*                                                                         */
 /***************************************************************************/
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/t1tables.h"
-#include "../../include/freetype/tttables.h"
-#include "../../include/freetype/internal/ftserv.h"
-#include "../../include/freetype/internal/services/svpsinfo.h"
+#include <ft2build.h>
+#include FT_TYPE1_TABLES_H
+#include FT_TRUETYPE_TABLES_H
+#include FT_INTERNAL_SERVICE_H
+#include FT_SERVICE_POSTSCRIPT_INFO_H
 
 
   /* documentation is in freetype.h */
@@ -51,7 +51,7 @@
 
     /* look at FSType before fsType for Type42 */
 
-    if ( ( os2 = (TT_OS2*)FT_Get_Sfnt_Table( face, ft_sfnt_os2 ) ) != NULL &&
+    if ( ( os2 = (TT_OS2*)FT_Get_Sfnt_Table( face, FT_SFNT_OS2 ) ) != NULL &&
          os2->version != 0xFFFFU                                           )
       return os2->fsType;