diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-03-30 21:07:17 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-03-30 21:07:17 +0200 |
| commit | c8c6763988ebc4ce1c93c099ae2401b677035c60 (patch) | |
| tree | 815bceee85d8ee56b75123eeb9a8b61510d9ec95 | |
| parent | da38be831d2c8ea5443c73d01ecfbc750bba7045 (diff) | |
| download | freetype2-c8c6763988ebc4ce1c93c099ae2401b677035c60.tar.gz | |
* src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also.
Requested by Dave Arnold.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/cff/cffparse.h | 10 |
2 files changed, 15 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2017-03-30 Werner Lemberg <wl@gnu.org> + * src/cff/cffparse.h (CFF2_DEFAULT_STACK): Set to 513 also. + + Requested by Dave Arnold. + +2017-03-30 Werner Lemberg <wl@gnu.org> + [truetype] Fix HVAR and VVAR handling (#50678). * src/truetype/ttgxvar.c (tt_hvadvance_adjust): Handle diff --git a/src/cff/cffparse.h b/src/cff/cffparse.h index 9976d42b1..83d1bba45 100644 --- a/src/cff/cffparse.h +++ b/src/cff/cffparse.h @@ -31,8 +31,16 @@ FT_BEGIN_HEADER /* CFF uses constant parser stack size; */ /* CFF2 can increase from default 193 */ #define CFF_MAX_STACK_DEPTH 96 + + /* + * There are plans to remove the `maxstack' operator in a forthcoming + * revision of the CFF2 specification, increasing the (then static) stack + * size to 513. By making the default stack size equal to the maximum + * stack size, the operator is essentially disabled, which has the + * desired effect in FreeType. + */ #define CFF2_MAX_STACK 513 -#define CFF2_DEFAULT_STACK 193 +#define CFF2_DEFAULT_STACK 513 #define CFF_CODE_TOPDICT 0x1000 #define CFF_CODE_PRIVATE 0x2000 |