Update freetype to 2.5.4.

third_party/freetype/src/sfnt/ttmtx.h

Index: third_party/freetype/src/sfnt/ttmtx.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttmtx.h b/third_party/freetype/src/sfnt/ttmtx.h
similarity index 88%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttmtx.h
rename to third_party/freetype/src/sfnt/ttmtx.h
index 78c0f06a7ad014af1dd43f69fdbdf277baf9be51..fb040394c08c467f00dfdcf6e8d69b441a5e3a97 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttmtx.h
+++ b/third_party/freetype/src/sfnt/ttmtx.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Load the metrics tables common to TTF and OTF fonts (specification). */
 /*                                                                         */
-/*  Copyright 2006 by                                                      */
+/*  Copyright 2006, 2014 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,9 +20,9 @@
 #define __TTMTX_H__
 
 
-#include "../../include/ft2build.h"
-#include "../../include/freetype/internal/ftstream.h"
-#include "../../include/freetype/internal/tttypes.h"
+#include <ft2build.h>
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_TRUETYPE_TYPES_H
 
 
 FT_BEGIN_HEADER
@@ -40,7 +40,7 @@ FT_BEGIN_HEADER
                      FT_Bool    vertical );
 
 
-  FT_LOCAL( FT_Error )
+  FT_LOCAL( void )
   tt_face_get_metrics( TT_Face     face,
                        FT_Bool     vertical,
                        FT_UInt     gindex,