Update freetype to 2.5.4.

third_party/freetype/include/ftcache.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftcache.h                                                              */
 /*                                                                         */
 /*    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,       */
 /*  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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
 #ifndef __FTCACHE_H__
 #define __FTCACHE_H__
 
 
-#include "../ft2build.h"
-#include "ftglyph.h"
+#include <ft2build.h>
+#include FT_GLYPH_H
 
 
 FT_BEGIN_HEADER
 
 
   /*************************************************************************
    *
    * <Section>
    *    cache_subsystem
    *
@@ skipping 114 matching lines @@
    * @description:
    *   An opaque pointer type that is used to identity face objects.  The
    *   contents of such objects is application-dependent.
    *
    *   These pointers are typically used to point to a user-defined
    *   structure containing a font file path, and face index.
    *
    * @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.
    *
    *   If the content of a given face ID changes at runtime, or if the value
    *   becomes invalid (e.g., when uninstalling a font), you should
    *   immediately call @FTC_Manager_RemoveFaceID before any other cache
    *   function.
    *
    *   Failure to do so will result in incorrect behaviour or even
    *   memory leaks and crashes.
@@ skipping 32 matching lines @@
    *   The third parameter `req_data' is the same as the one passed by the
    *   client when @FTC_Manager_New is called.
    *
    *   The face requester should not perform funny things on the returned
    *   face object, like creating a new @FT_Size for it, or setting a
    *   transformation through @FT_Set_Transform!
    */
   typedef FT_Error
   (*FTC_Face_Requester)( FTC_FaceID  face_id,
                          FT_Library  library,
-                         FT_Pointer  request_data,
+                         FT_Pointer  req_data,
                          FT_Face*    aface );
 
- /* */
+  /* */
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
   /*****                      CACHE MANAGER OBJECT                     *****/
   /*****                                                               *****/
   /*************************************************************************/
   /*************************************************************************/
@@ skipping 813 matching lines @@
   /*    is persistent!                                                     */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
                               FTC_Scaler     scaler,
                               FT_ULong       load_flags,
                               FT_UInt        gindex,
                               FTC_SBit      *sbit,
                               FTC_Node      *anode );
 
+  /* */
 
- /* */
 
 FT_END_HEADER
 
 #endif /* __FTCACHE_H__ */
 
 
 /* END */