Update freetype to 2.5.4.

third_party/freetype/include/ftcache.h

Index: third_party/freetype/include/ftcache.h
diff --git a/core/include/thirdparties/freetype/freetype/ftcache.h b/third_party/freetype/include/ftcache.h
similarity index 99%
rename from core/include/thirdparties/freetype/freetype/ftcache.h
rename to third_party/freetype/include/ftcache.h
index 404b0faf8e7d7303ca4fedf1391c0ef78c28a0c6..a30e925cc5689606dfa5675e1552bfc3c85810c0 100644
--- a/core/include/thirdparties/freetype/freetype/ftcache.h
+++ b/third_party/freetype/include/ftcache.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Cache subsystem (specification).                            */
 /*                                                                         */
-/*  Copyright 1996-2008, 2010, 2013 by                                     */
+/*  Copyright 1996-2008, 2010, 2013, 2014 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,8 +20,8 @@
 #define __FTCACHE_H__
 
 
-#include "../ft2build.h"
-#include "ftglyph.h"
+#include <ft2build.h>
+#include FT_GLYPH_H
 
 
 FT_BEGIN_HEADER
@@ -156,7 +156,7 @@ FT_BEGIN_HEADER
    * @note:
    *   Never use NULL as a valid @FTC_FaceID.
    *
-   *   Face IDs are passed by the client to the cache manager, which calls,
+   *   Face IDs are passed by the client to the cache manager that calls,
    *   when needed, the @FTC_Face_Requester to translate them into new
    *   @FT_Face objects.
    *
@@ -209,10 +209,10 @@ FT_BEGIN_HEADER
   typedef FT_Error
   (*FTC_Face_Requester)( FTC_FaceID  face_id,
                          FT_Library  library,
-                         FT_Pointer  request_data,
+                         FT_Pointer  req_data,
                          FT_Face*    aface );
 
- /* */
+  /* */
 
 
   /*************************************************************************/
@@ -1046,8 +1046,8 @@ FT_BEGIN_HEADER
                               FTC_SBit      *sbit,
                               FTC_Node      *anode );
 
+  /* */
 
- /* */
 
 FT_END_HEADER