minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

In function T2_Parse_CharStrings, modified glyph width assignment code 

to be more robust.  The code now takes into account glyphs that

   1. have the width given as it is, rather than as a difference against
      `nominal_width', and

   2. have the width operand specified before one of the h/r/vmoveto
      commands or the endchar command.
This commit is contained in:
Tom Kacvinsky 2000-11-27 00:57:13 +00:00
parent 6dd303db0d
commit 6037f08474
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cff/t2gload.c
View File

@ -136,11 +136,11 @@
1 | T2_COUNT_CHECK_WIDTH | T2_COUNT_EXACT,
1 | T2_COUNT_CHECK_WIDTH | T2_COUNT_EXACT,
0 | T2_COUNT_CLEAR_STACK, /* rlineto */
0 | T2_COUNT_CLEAR_STACK, /* rlineto */
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK, /* rrcurveto */
0 | T2_COUNT_CLEAR_STACK, /* rrcurveto */
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
0 | T2_COUNT_CLEAR_STACK,
@ -153,7 +153,7 @@
9,
11,
0, /* endchar */
0 | T2_COUNT_CHECK_WIDTH, /* endchar */
2 | T2_COUNT_CHECK_WIDTH, /* hstem */
2 | T2_COUNT_CHECK_WIDTH,
@ -849,13 +849,25 @@
if ( req_args & T2_COUNT_CHECK_WIDTH )
{
args = stack;
if ( num_args & 1 && decoder->read_width )
/* If there is a number here, it is either a difference against */
/* `nominal_width', or it is a width itself. */
if ( num_args > 0 && decoder->read_width )
{
decoder->glyph_width = decoder->nominal_width +
( stack[0] >> 16 );
/* If `nominal_width' is non-zero, the number is really a */
/* difference against `nominal_width'. */
if ( decoder->nominal_width )
decoder->glyph_width = decoder->nominal_width +
( stack[0] >> 16 );
/* Else, the number here is truly a width, not a difference. */
else
decoder->glyph_width = stack[0] >> 16;
num_args--;
args++;
}
decoder->read_width = 0;
req_args = 0;
}