Update freetype to 2.5.4.

third_party/freetype/include/ftincrem.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftincrem.h                                                             */
 /*                                                                         */
 /*    FreeType incremental loading (specification).                        */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007, 2008, 2010 by                        */
+/*  Copyright 2002, 2003, 2006-2008, 2010, 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 __FTINCREM_H__
 #define __FTINCREM_H__
 
-#include "../ft2build.h"
-#include "freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #ifdef FREETYPE_H
 #error "freetype.h of FreeType 1 has been loaded!"
 #error "Please fix the directory search order for header files"
 #error "so that freetype.h of FreeType 2 is found first."
 #endif
 
 
 FT_BEGIN_HEADER
 
   /***************************************************************************
    *
    * @section:
    *    incremental
    *
    * @title:
    *    Incremental Loading
    *
    * @abstract:
    *    Custom Glyph Loading.
    *
    * @description:
    *   This section contains various functions used to perform so-called
    *   `incremental' glyph loading.  This is a mode where all glyphs loaded
-   *   from a given @FT_Face are provided by the client application,
+   *   from a given @FT_Face are provided by the client application.
    *
    *   Apart from that, all other tables are loaded normally from the font
    *   file.  This mode is useful when FreeType is used within another
    *   engine, e.g., a PostScript Imaging Processor.
    *
    *   To enable this mode, you must use @FT_Open_Face, passing an
    *   @FT_Parameter with the @FT_PARAM_TAG_INCREMENTAL tag and an
    *   @FT_Incremental_Interface value.  See the comments for
    *   @FT_Incremental_InterfaceRec for an example.
    *
@@ skipping 279 matching lines @@
    *
    * @description:
    *   A constant used as the tag of @FT_Parameter structures to indicate
    *   an incremental loading object to be used by FreeType.
    *
    */
 #define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
 
   /* */
 
+
 FT_END_HEADER
 
 #endif /* __FTINCREM_H__ */
 
 
 /* END */