Update freetype to 2.5.4.

third_party/freetype/include/ftmodapi.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftmodapi.h                                                             */
 /*                                                                         */
 /*    FreeType modules public interface (specification).                   */
 /*                                                                         */
 /*  Copyright 1996-2003, 2006, 2008-2010, 2012, 2013 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 __FTMODAPI_H__
 #define __FTMODAPI_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 33 matching lines @@
   /*      smooth, smooth-lcd, smooth-lcdv                                  */
   /*      truetype                                                         */
   /*      type1                                                            */
   /*      type42                                                           */
   /*      t1cid                                                            */
   /*      winfonts                                                         */
   /*    }                                                                  */
   /*                                                                       */
   /*    Note that the FreeType Cache sub-system is not a FreeType module.  */
   /*                                                                       */
+  /* <Order>                                                               */
+  /*    FT_Module                                                          */
+  /*    FT_Module_Constructor                                              */
+  /*    FT_Module_Destructor                                               */
+  /*    FT_Module_Requester                                                */
+  /*    FT_Module_Class                                                    */
+  /*                                                                       */
+  /*    FT_Add_Module                                                      */
+  /*    FT_Get_Module                                                      */
+  /*    FT_Remove_Module                                                   */
+  /*    FT_Add_Default_Modules                                             */
+  /*                                                                       */
+  /*    FT_Property_Set                                                    */
+  /*    FT_Property_Get                                                    */
+  /*                                                                       */
+  /*    FT_New_Library                                                     */
+  /*    FT_Done_Library                                                    */
+  /*    FT_Reference_Library                                               */
+  /*                                                                       */
+  /*    FT_Renderer                                                        */
+  /*    FT_Renderer_Class                                                  */
+  /*                                                                       */
+  /*    FT_Get_Renderer                                                    */
+  /*    FT_Set_Renderer                                                    */
+  /*                                                                       */
+  /*    FT_Set_Debug_Hook                                                  */
+  /*                                                                       */
   /*************************************************************************/
 
 
   /* module bit flags */
 #define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
 #define FT_MODULE_RENDERER            2  /* this module is a renderer     */
 #define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
 #define FT_MODULE_STYLER              8  /* this module is a styler       */
 
 #define FT_MODULE_DRIVER_SCALABLE     0x100   /* the driver supports      */
@@ skipping 203 matching lines @@
    *    module_name ::
    *       The module name.
    *
    *    property_name ::
    *       The property name.  Properties are described in the `Synopsis'
    *       subsection of the module's documentation.
    *
    *       Note that only a few modules have properties.
    *
    *    value ::
-   *       A generic pointer to a variable or structure which gives the new
+   *       A generic pointer to a variable or structure that gives the new
    *       value of the property.  The exact definition of `value' is
    *       dependent on the property; see the `Synopsis' subsection of the
    *       module's documentation.
    *
    * @return:
    *   FreeType error code.  0~means success.
    *
    * @note:
    *    If `module_name' isn't a valid module name, or `property_name'
    *    doesn't specify a valid property, or if `value' doesn't represent a
@@ skipping 45 matching lines @@
    *
    *    module_name ::
    *       The module name.
    *
    *    property_name ::
    *       The property name.  Properties are described in the `Synopsis'
    *       subsection of the module's documentation.
    *
    * @inout:
    *    value ::
-   *       A generic pointer to a variable or structure which gives the
+   *       A generic pointer to a variable or structure that gives the
    *       value of the property.  The exact definition of `value' is
    *       dependent on the property; see the `Synopsis' subsection of the
    *       module's documentation.
    *
    * @return:
    *   FreeType error code.  0~means success.
    *
    * @note:
    *    If `module_name' isn't a valid module name, or `property_name'
    *    doesn't specify a valid property, or if `value' doesn't represent a
@@ skipping 33 matching lines @@
   /*                                                                       */
   /* <Function>                                                            */
   /*    FT_Reference_Library                                               */
   /*                                                                       */
   /* <Description>                                                         */
   /*    A counter gets initialized to~1 at the time an @FT_Library         */
   /*    structure is created.  This function increments the counter.       */
   /*    @FT_Done_Library then only destroys a library if the counter is~1, */
   /*    otherwise it simply decrements the counter.                        */
   /*                                                                       */
-  /*    This function helps in managing life-cycles of structures which    */
+  /*    This function helps in managing life-cycles of structures that     */
   /*    reference @FT_Library objects.                                     */
   /*                                                                       */
   /* <Input>                                                               */
   /*    library :: A handle to a target library object.                    */
   /*                                                                       */
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
   /*                                                                       */
   /* <Since>                                                               */
   /*    2.4.2                                                              */
@@ skipping 52 matching lines @@
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
   /*                                                                       */
   /* <Note>                                                                */
   /*    See the discussion of reference counters in the description of     */
   /*    @FT_Reference_Library.                                             */
   /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Done_Library( FT_Library  library );
 
-/* */
+  /* */
 
   typedef void
   (*FT_DebugHook_Func)( void*  arg );
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
   /*    FT_Set_Debug_Hook                                                  */
   /*                                                                       */
@@ skipping 72 matching lines @@
    *     by the @FT_Get_TrueType_Engine_Type function.
    *
    *  @values:
    *     FT_TRUETYPE_ENGINE_TYPE_NONE ::
    *       The library doesn't implement any kind of bytecode interpreter.
    *
    *     FT_TRUETYPE_ENGINE_TYPE_UNPATENTED ::
    *       The library implements a bytecode interpreter that doesn't
    *       support the patented operations of the TrueType virtual machine.
    *
-   *       Its main use is to load certain Asian fonts which position and
+   *       Its main use is to load certain Asian fonts that position and
    *       scale glyph components with bytecode instructions.  It produces
    *       bad output for most other fonts.
    *
    *     FT_TRUETYPE_ENGINE_TYPE_PATENTED ::
    *       The library implements a bytecode interpreter that covers
    *       the full instruction set of the TrueType virtual machine (this
    *       was governed by patents until May 2010, hence the name).
    *
    *  @since:
    *     2.2
@@ skipping 24 matching lines @@
    *  @return:
    *     A value indicating which level is supported.
    *
    *  @since:
    *     2.2
    *
    */
   FT_EXPORT( FT_TrueTypeEngineType )
   FT_Get_TrueType_Engine_Type( FT_Library  library );
 
-
   /* */
 
 
 FT_END_HEADER
 
 #endif /* __FTMODAPI_H__ */
 
 
 /* END */