| Index: third_party/freetype/include/ftwinfnt.h
|
| diff --git a/core/include/thirdparties/freetype/freetype/ftwinfnt.h b/third_party/freetype/include/ftwinfnt.h
|
| similarity index 97%
|
| rename from core/include/thirdparties/freetype/freetype/ftwinfnt.h
|
| rename to third_party/freetype/include/ftwinfnt.h
|
| index af4334e200721354ed7170825a7d9d522975fea4..50261581a2127a2b4e6b20eba06d08d332972e96 100644
|
| --- a/core/include/thirdparties/freetype/freetype/ftwinfnt.h
|
| +++ b/third_party/freetype/include/ftwinfnt.h
|
| @@ -19,8 +19,8 @@
|
| #ifndef __FTWINFNT_H__
|
| #define __FTWINFNT_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,9 +58,10 @@ FT_BEGIN_HEADER
|
| * @description:
|
| * A list of valid values for the `charset' byte in
|
| * @FT_WinFNT_HeaderRec. Exact mapping tables for the various cpXXXX
|
| - * encodings (except for cp1361) can be found at ftp://ftp.unicode.org
|
| - * in the MAPPINGS/VENDORS/MICSFT/WINDOWS subdirectory. cp1361 is
|
| - * roughly a superset of MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
|
| + * encodings (except for cp1361) can be found at
|
| + * ftp://ftp.unicode.org/public in the MAPPINGS/VENDORS/MICSFT/WINDOWS
|
| + * subdirectory. cp1361 is roughly a superset of
|
| + * MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT.
|
| *
|
| * @values:
|
| * FT_WinFNT_ID_DEFAULT ::
|
| @@ -258,9 +259,9 @@ FT_BEGIN_HEADER
|
| FT_Get_WinFNT_Header( FT_Face face,
|
| FT_WinFNT_HeaderRec *aheader );
|
|
|
| -
|
| /* */
|
|
|
| +
|
| FT_END_HEADER
|
|
|
| #endif /* __FTWINFNT_H__ */
|
|
|