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

truetype: Truncate the deltas of composite glyph at 16-bit values.

This commit is contained in:
suzuki toshiya 2009-08-01 00:32:17 +09:00
parent 1b6f1d20b5
commit 9206eba291
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
truetype: Truncate the deltas of composite glyph at 16-bit values.
* src/truetype/ttgload.c (load_truetype_glyph):
Insert cast from FT_Long (deltas[i].{x,y}) to
FT_Int16 in the summation of deltas[] for composite
glyphs. Because deltas[i] is typed as FT_Pos,
its component x, y are typed as FT_Long, but
their sources are always FT_Int16 when they are
loaded by ft_var_readpackeddeltas(). However,
the limitation about the summed deltas is unclear.
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
truetype: Truncate the instructions upto 16-bit per a glyph.

7
src/truetype/ttgload.c
View File

@ -1400,8 +1400,11 @@
{
if ( subglyph->flags & ARGS_ARE_XY_VALUES )
{
subglyph->arg1 += deltas[i].x;
subglyph->arg2 += deltas[i].y;
/* XXX: overflow check for subglyph->{arg1,arg2}. */
/* deltas[i].{x,y} must be within signed 16-bit, */
/* but the restriction of summed delta is not clear */
subglyph->arg1 += (FT_Int16)deltas[i].x;
subglyph->arg2 += (FT_Int16)deltas[i].y;
}
}