| Index: third_party/freetype/include/ftttdrv.h
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftttdrv.h b/third_party/freetype/include/ftttdrv.h
|
| similarity index 84%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftttdrv.h
|
| rename to third_party/freetype/include/ftttdrv.h
|
| index 01b25a4808bcd9ca5680351bcbe3fde238cc425c..358841397cac9ab20bfe6c75c67795b496bb46ae 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/ftttdrv.h
|
| +++ b/third_party/freetype/include/ftttdrv.h
|
| @@ -20,8 +20,8 @@
|
| #ifndef __FTTTDRV_H__
|
| #define __FTTTDRV_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!"
|
| @@ -61,7 +61,7 @@ FT_BEGIN_HEADER
|
| * interpreter-version
|
| *
|
| * @description:
|
| - * Currently, two versions are available which represent the bytecode
|
| + * Currently, two versions are available, representing the bytecode
|
| * interpreter with and without subpixel hinting support,
|
| * respectively. The default is subpixel support if
|
| * TT_CONFIG_OPTION_SUBPIXEL_HINTING is defined, and no subpixel
|
| @@ -134,13 +134,33 @@ FT_BEGIN_HEADER
|
| * FT_CONFIG_OPTION_SUBPIXEL_HINTING, selecting version~38 causes an
|
| * `FT_Err_Unimplemented_Feature' error.
|
| *
|
| + * Depending on the graphics framework, Microsoft uses different
|
| + * bytecode engines. As a consequence, the version numbers returned by
|
| + * a call to the `GETINFO[1]' bytecode instruction are more convoluted
|
| + * than desired.
|
| + *
|
| + * {
|
| + * framework Windows version result of GETINFO[1]
|
| + * ----------------------------------------------------
|
| + * GDI before XP 35
|
| + * GDI XP and later 37
|
| + * GDI+ old before Vista 37
|
| + * GDI+ old Vista, 7 38
|
| + * GDI+ after 7 40
|
| + * DWrite before 8 39
|
| + * DWrite 8 and later 40
|
| + * }
|
| + *
|
| + * Since FreeType doesn't provide all capabilities of DWrite ClearType,
|
| + * using version~38 seems justified.
|
| + *
|
| */
|
| #define TT_INTERPRETER_VERSION_35 35
|
| #define TT_INTERPRETER_VERSION_38 38
|
|
|
| -
|
| /* */
|
|
|
| +
|
| FT_END_HEADER
|
|
|
|
|
|
|