diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-16 03:58:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-16 03:58:17 +0000 |
| commit | 7b05778821db2911af17eaafb848a616eb773c37 (patch) | |
| tree | 5f1e96c414756a969ebf20704a198138e04d2236 /pango | |
| parent | 9a667ca47559ab501b33b9bc52052594735316e5 (diff) | |
| download | pango-7b05778821db2911af17eaafb848a616eb773c37.tar.gz | |
When loading in Load_Chain{Sub,Pos}ClassRule, the limit we have only
Tue Apr 15 11:49:39 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxg{sub/pos}.c: When loading
in Load_Chain{Sub,Pos}ClassRule, the limit we
have only applies to the input ClassDef table.
Fixes problem with Arial Unicode. Much help from
Noah Levitt in tracing this down.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/opentype/ftxgpos.c | 7 | ||||
| -rw-r--r-- | pango/opentype/ftxgsub.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 124898f9..8a730ec2 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -4827,13 +4827,14 @@ lookahead_offset = GET_UShort(); /* `ChainPosClassSetCount' is the upper limit for input class values, - thus we read it now to make an additional safety check. */ + thus we read it now to make an additional safety check. No limit + is known or needed for the other two class definitions */ count = ccpf2->ChainPosClassSetCount = GET_UShort(); FORGET_Frame(); - if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->BacktrackClassDef, count, + if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->BacktrackClassDef, 65535, backtrack_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail5; @@ -4841,7 +4842,7 @@ input_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail4; - if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->LookaheadClassDef, count, + if ( ( error = Load_EmptyOrClassDefinition( &ccpf2->LookaheadClassDef, 65535, lookahead_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail3; diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 43a0181b..837bfe10 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -2994,13 +2994,14 @@ lookahead_offset = GET_UShort(); /* `ChainSubClassSetCount' is the upper limit for input class values, - thus we read it now to make an additional safety check. */ + thus we read it now to make an additional safety check. No limit + is known or needed for the other two class definitions */ count = ccsf2->ChainSubClassSetCount = GET_UShort(); FORGET_Frame(); - if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->BacktrackClassDef, count, + if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->BacktrackClassDef, 65535, backtrack_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail5; @@ -3009,7 +3010,7 @@ input_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail4; - if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->LookaheadClassDef, count, + if ( ( error = Load_EmptyOrClassDefinition( &ccsf2->LookaheadClassDef, 65535, lookahead_offset, base_offset, stream ) ) != TT_Err_Ok ) goto Fail3; |