diff options
author | Werner Lemberg <wl@gnu.org> | 2010-08-04 15:21:20 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2010-08-04 15:21:20 +0200 |
commit | 32dc43a5cc7b24ba2cdf78991fc49b1c6aeb720d (patch) | |
tree | 07c83dd9752dd2986f091b236d13697d7714a205 /devel | |
parent | 11d65e8a1f1f14e56148fd991965424d9bd1cdbc (diff) | |
download | freetype2-32dc43a5cc7b24ba2cdf78991fc49b1c6aeb720d.tar.gz |
`make devel' fails if FT_CONFIG_OPTION_OLD_INTERNALS is set.
* devel/ftoption.h: Synchronize with
include/freetype/config/ftoption.h.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ftoption.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/devel/ftoption.h b/devel/ftoption.h index 058601e4c..4f12373d2 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -317,7 +317,7 @@ FT_BEGIN_HEADER /* supply font data incrementally as the document is parsed, such */ /* as the Ghostscript interpreter for the PostScript language. */ /* */ -#define FT_CONFIG_OPTION_INCREMENTAL +/* #define FT_CONFIG_OPTION_INCREMENTAL */ /*************************************************************************/ @@ -689,7 +689,28 @@ FT_BEGIN_HEADER * is recommended to disable the macro since it reduces the library's code * size and activates a few memory-saving optimizations as well. */ -/* #define FT_CONFIG_OPTION_OLD_INTERNALS */ +#define FT_CONFIG_OPTION_OLD_INTERNALS + + + /* + * To detect legacy cache-lookup call from a rogue client (<= 2.1.7), + * we restrict the number of charmaps in a font. The current API of + * FTC_CMapCache_Lookup() takes cmap_index & charcode, but old API + * takes charcode only. To determine the passed value is for cmap_index + * or charcode, the possible cmap_index is restricted not to exceed + * the minimum possible charcode by a rogue client. It is also very + * unlikely that a rogue client is interested in Unicode values 0 to 15. + * + * NOTE: The original threshold was 4 deduced from popular number of + * cmap subtables in UCS-4 TrueType fonts, but now it is not + * irregular for OpenType fonts to have more than 4 subtables, + * because variation selector subtables are available for Apple + * and Microsoft platforms. + */ + +#ifdef FT_CONFIG_OPTION_OLD_INTERNALS +#define FT_MAX_CHARMAP_CACHEABLE 15 +#endif /* |