| Index: third_party/freetype/include/ftgxval.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftgxval.h b/third_party/freetype/include/ftgxval.h
|
| similarity index 91%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftgxval.h
|
| rename to third_party/freetype/include/ftgxval.h
|
| index 763652a0121ad96384c23c89e06ed9a83ab88399..88c3d937503613b86d40927f67e8435fa855d287 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftgxval.h
|
| +++ b/third_party/freetype/include/ftgxval.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* FreeType API for validating TrueTypeGX/AAT tables (specification). */
|
| /* */
|
| -/* Copyright 2004, 2005, 2006 by */
|
| +/* Copyright 2004-2006, 2013 by */
|
| /* Masatake YAMATO, Redhat K.K, */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| @@ -28,8 +28,8 @@
|
| #ifndef __FTGXVAL_H__
|
| #define __FTGXVAL_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!"
|
| @@ -57,9 +57,19 @@ FT_BEGIN_HEADER
|
| /* some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd, */
|
| /* trak, prop, lcar). */
|
| /* */
|
| + /* <Order> */
|
| + /* FT_TrueTypeGX_Validate */
|
| + /* FT_TrueTypeGX_Free */
|
| + /* */
|
| + /* FT_ClassicKern_Validate */
|
| + /* FT_ClassicKern_Free */
|
| + /* */
|
| + /* FT_VALIDATE_GX_LENGTH */
|
| + /* FT_VALIDATE_GXXXX */
|
| + /* FT_VALIDATE_CKERNXXX */
|
| + /* */
|
| /*************************************************************************/
|
|
|
| -
|
| /*************************************************************************/
|
| /* */
|
| /* */
|
| @@ -171,8 +181,6 @@ FT_BEGIN_HEADER
|
| FT_VALIDATE_lcar )
|
|
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -180,7 +188,7 @@ FT_BEGIN_HEADER
|
| *
|
| * @description:
|
| * Validate various TrueTypeGX tables to assure that all offsets and
|
| - * indices are valid. The idea is that a higher-level library which
|
| + * indices are valid. The idea is that a higher-level library that
|
| * actually does the text layout can access those tables without
|
| * error checking (which can be quite time consuming).
|
| *
|
| @@ -189,7 +197,7 @@ FT_BEGIN_HEADER
|
| * A handle to the input face.
|
| *
|
| * validation_flags ::
|
| - * A bit field which specifies the tables to be validated. See
|
| + * A bit field that specifies the tables to be validated. See
|
| * @FT_VALIDATE_GXXXX for possible values.
|
| *
|
| * table_length ::
|
| @@ -221,8 +229,6 @@ FT_BEGIN_HEADER
|
| FT_UInt table_length );
|
|
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -248,8 +254,6 @@ FT_BEGIN_HEADER
|
| FT_Bytes table );
|
|
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @enum:
|
| @@ -277,8 +281,6 @@ FT_BEGIN_HEADER
|
| #define FT_VALIDATE_CKERN ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
|
|
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -286,7 +288,7 @@ FT_BEGIN_HEADER
|
| *
|
| * @description:
|
| * Validate classic (16-bit format) kern table to assure that the offsets
|
| - * and indices are valid. The idea is that a higher-level library which
|
| + * and indices are valid. The idea is that a higher-level library that
|
| * actually does the text layout can access those tables without error
|
| * checking (which can be quite time consuming).
|
| *
|
| @@ -299,7 +301,7 @@ FT_BEGIN_HEADER
|
| * A handle to the input face.
|
| *
|
| * validation_flags ::
|
| - * A bit field which specifies the dialect to be validated. See
|
| + * A bit field that specifies the dialect to be validated. See
|
| * @FT_VALIDATE_CKERNXXX for possible values.
|
| *
|
| * @output:
|
| @@ -320,8 +322,6 @@ FT_BEGIN_HEADER
|
| FT_Bytes *ckern_table );
|
|
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -346,8 +346,7 @@ FT_BEGIN_HEADER
|
| FT_ClassicKern_Free( FT_Face face,
|
| FT_Bytes table );
|
|
|
| -
|
| - /* */
|
| + /* */
|
|
|
|
|
| FT_END_HEADER
|
|
|