| Index: third_party/freetype/include/ftotval.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftotval.h b/third_party/freetype/include/ftotval.h
|
| similarity index 91%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftotval.h
|
| rename to third_party/freetype/include/ftotval.h
|
| index e33e307c15661173e6fe816b4f435fa1db101a6b..75ba03ee8e73338cc250f77949b9179f52abd9e4 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftotval.h
|
| +++ b/third_party/freetype/include/ftotval.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* FreeType API for validating OpenType tables (specification). */
|
| /* */
|
| -/* Copyright 2004, 2005, 2006, 2007 by */
|
| +/* Copyright 2004-2007, 2013, 2014 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -30,8 +30,8 @@
|
| #ifndef __FTOTVAL_H__
|
| #define __FTOTVAL_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!"
|
| @@ -58,6 +58,12 @@ FT_BEGIN_HEADER
|
| /* This section contains the declaration of functions to validate */
|
| /* some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH). */
|
| /* */
|
| + /* <Order> */
|
| + /* FT_OpenType_Validate */
|
| + /* FT_OpenType_Free */
|
| + /* */
|
| + /* FT_VALIDATE_OTXXX */
|
| + /* */
|
| /*************************************************************************/
|
|
|
|
|
| @@ -107,8 +113,6 @@ FT_BEGIN_HEADER
|
| FT_VALIDATE_JSTF | \
|
| FT_VALIDATE_MATH
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -116,7 +120,7 @@ FT_BEGIN_HEADER
|
| *
|
| * @description:
|
| * Validate various OpenType 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).
|
| *
|
| @@ -125,7 +129,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_OTXXX for possible values.
|
| *
|
| * @output:
|
| @@ -165,8 +169,6 @@ FT_BEGIN_HEADER
|
| FT_Bytes *GSUB_table,
|
| FT_Bytes *JSTF_table );
|
|
|
| - /* */
|
| -
|
| /**********************************************************************
|
| *
|
| * @function:
|
| @@ -191,8 +193,7 @@ FT_BEGIN_HEADER
|
| FT_OpenType_Free( FT_Face face,
|
| FT_Bytes table );
|
|
|
| -
|
| - /* */
|
| + /* */
|
|
|
|
|
| FT_END_HEADER
|
|
|