rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[psaux] Fix PostScript interpreter rewinding in Type 1 mode. (#52251) 

The interpreter in Type 1 mode rewinds the charstring after collecting
all hints for building the initial hintmap (commit d52dd7f). However,
some charstrings use `endchar' in a final subroutine call, rewinding to
the start of that subroutine, and only a small section of the actual
glyph is drawn.

* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdENDCHAR>:
Ensure we are on the top level charstring before rewinding.
This commit is contained in:
Ewald Hew 2017-10-21 16:36:49 +08:00
parent 77b34e01ed
commit cdab9cfae9
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2017-11-03 Ewald Hew <ewaldhew@gmail.com>
[psaux] Fix PostScript interpreter rewinding in Type 1 mode. (#52251)
The interpreter in Type 1 mode rewinds the charstring after collecting
all hints for building the initial hintmap (commit d52dd7f). However,
some charstrings use `endchar' in a final subroutine call, rewinding to
the start of that subroutine, and only a small section of the actual
glyph is drawn.
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdENDCHAR>:
Ensure we are on the top level charstring before rewinding.
2017-11-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
[truetype] Add more tricky fonts.

13
src/psaux/psintrp.c
View File

@ -2462,6 +2462,19 @@
hintMask.isNew = TRUE;
/* rewind charstring */
/* some charstrings use endchar from a final subroutine call */
/* without returning, detect these and exit to the top level */
/* charstring */
while ( charstringIndex > 0 )
{
FT_TRACE4(( " return (leaving level %d)\n", charstringIndex ));
/* restore position in previous charstring */
charstring = (CF2_Buffer)
cf2_arrstack_getPointer(
&subrStack,
(CF2_UInt)--charstringIndex );
}
charstring->ptr = charstring->start;
break;