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

T2_Parse_CharStrings: Added more logic to glyph width setting code to 

take into account even/odd argument counts.
This commit is contained in:
Tom Kacvinsky 2000-11-27 08:22:23 +00:00
parent 19aeac97a4
commit 2c7b3c7385
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/cff/t2gload.c
View File

@ -857,13 +857,40 @@
{
/* If `nominal_width' is non-zero, the number is really a difference */
/* against `nominal_width'. Else, the number here is truly a width, */
/* not a difference. If the font does not set `nominal_width', then */
/* `nominal_width' defaults to zero, and so we can set 'glyph_width' */
/* to `nominal_width' plus number on the stack -- for either case. */
/* not a difference against `nominal_width'. If the font does not */
/* set `nominal_width', then `nominal_width' defaults to zero, and */
/* so we can set 'glyph_width' to `nominal_width' plus number on the */
/* stack -- for either case. */
decoder->glyph_width = decoder->nominal_width + ( stack[0] >> 16 );
num_args--;
args++;
FT_Int set_width_ok;
switch ( op )
{
case t2_op_hmoveto:
case t2_op_vmoveto:
set_width_ok = num_args & 2;
break;
case t2_op_hstem:
case t2_op_vstem:
case t2_op_hstemhm:
case t2_op_vstemhm:
case t2_op_endchar:
case t2_op_rmoveto:
set_width_ok = num_args & 1;
break;
default:
set_width_ok = 0;
break;
}
if ( set_width_ok )
{
decoder->glyph_width = decoder->nominal_width + ( stack[0] >> 16 );
num_args--;
args++;
}
}
decoder->read_width = 0;