mirrors
/
freetype
mirror of https://github.com/freetype/freetype
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[truetype] Minor.

This commit is contained in:
Werner Lemberg 2015-05-20 12:33:40 +02:00
parent 0a6b6ff7c6
commit 790b8dfbff
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-05-20 Werner Lemberg <wl@gnu.org>
[truetype] Minor.
* src/truetype/ttinterp.h (SetSuperRound): Fix type of `GridPeriod'
argument.
2015-05-17 Werner Lemberg <wl@gnu.org>
[truetype] Fix loading of composite glyphs.

12
src/truetype/ttinterp.c
View File

@ -1930,7 +1930,7 @@
val = 0;
}
return val;
return val;
}
@ -2273,7 +2273,7 @@
/* */
static void
SetSuperRound( TT_ExecContext exc,
FT_F26Dot6 GridPeriod,
FT_F2Dot14 GridPeriod,
FT_Long selector )
{
switch ( (FT_Int)( selector & 0xC0 ) )
@ -2291,7 +2291,6 @@
break;
/* This opcode is reserved, but... */
case 0xC0:
exc->period = GridPeriod;
break;
@ -2321,9 +2320,10 @@
else
exc->threshold = ( (FT_Int)( selector & 0x0F ) - 4 ) * exc->period / 8;
exc->period /= 256;
exc->phase /= 256;
exc->threshold /= 256;
/* convert to F26Dot6 format */
exc->period >>= 8;
exc->phase >>= 8;
exc->threshold >>= 8;
}