Update freetype to 2.5.4.

third_party/freetype/include/ftbdf.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftbdf.h                                                                */
 /*                                                                         */
 /*    FreeType API for accessing BDF-specific strings (specification).     */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2009 by                              */
+/*  Copyright 2002-2004, 2006, 2009, 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 __FTBDF_H__
 #define __FTBDF_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
 
@@ skipping 12 matching lines @@
   /* <Description>                                                         */
   /*    This section contains the declaration of functions specific to BDF */
   /*    and PCF fonts.                                                     */
   /*                                                                       */
   /*************************************************************************/
 
 
   /**********************************************************************
    *
    * @enum:
-   *    FT_PropertyType
+   *    BDF_PropertyType
    *
    * @description:
    *    A list of BDF property types.
    *
    * @values:
    *    BDF_PROPERTY_TYPE_NONE ::
    *      Value~0 is used to indicate a missing property.
    *
    *    BDF_PROPERTY_TYPE_ATOM ::
    *      Property is a string atom.
@@ skipping 32 matching lines @@
   *    BDF_PropertyRec
   *
   * @description:
   *    This structure models a given BDF/PCF property.
   *
   * @fields:
   *    type ::
   *      The property type.
   *
   *    u.atom ::
-  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
+  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.  May be
+  *      NULL, indicating an empty string.
   *
   *    u.integer ::
   *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
   *
   *    u.cardinal ::
   *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
   */
   typedef struct  BDF_PropertyRec_
   {
     BDF_PropertyType  type;
@@ skipping 72 matching lines @@
   *   for BDF fonts only.
   *
   *   In case of error, `aproperty->type' is always set to
   *   @BDF_PROPERTY_TYPE_NONE.
   */
   FT_EXPORT( FT_Error )
   FT_Get_BDF_Property( FT_Face           face,
                        const char*       prop_name,
                        BDF_PropertyRec  *aproperty );
 
- /* */
+  /* */
 
 FT_END_HEADER
 
 #endif /* __FTBDF_H__ */
 
 
 /* END */