[truetype] Minor.
This commit is contained in:
parent
0a6b6ff7c6
commit
790b8dfbff
|
@ -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>
|
2015-05-17 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[truetype] Fix loading of composite glyphs.
|
[truetype] Fix loading of composite glyphs.
|
||||||
|
|
|
@ -1930,7 +1930,7 @@
|
||||||
val = 0;
|
val = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2273,7 +2273,7 @@
|
||||||
/* */
|
/* */
|
||||||
static void
|
static void
|
||||||
SetSuperRound( TT_ExecContext exc,
|
SetSuperRound( TT_ExecContext exc,
|
||||||
FT_F26Dot6 GridPeriod,
|
FT_F2Dot14 GridPeriod,
|
||||||
FT_Long selector )
|
FT_Long selector )
|
||||||
{
|
{
|
||||||
switch ( (FT_Int)( selector & 0xC0 ) )
|
switch ( (FT_Int)( selector & 0xC0 ) )
|
||||||
|
@ -2291,7 +2291,6 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* This opcode is reserved, but... */
|
/* This opcode is reserved, but... */
|
||||||
|
|
||||||
case 0xC0:
|
case 0xC0:
|
||||||
exc->period = GridPeriod;
|
exc->period = GridPeriod;
|
||||||
break;
|
break;
|
||||||
|
@ -2321,9 +2320,10 @@
|
||||||
else
|
else
|
||||||
exc->threshold = ( (FT_Int)( selector & 0x0F ) - 4 ) * exc->period / 8;
|
exc->threshold = ( (FT_Int)( selector & 0x0F ) - 4 ) * exc->period / 8;
|
||||||
|
|
||||||
exc->period /= 256;
|
/* convert to F26Dot6 format */
|
||||||
exc->phase /= 256;
|
exc->period >>= 8;
|
||||||
exc->threshold /= 256;
|
exc->phase >>= 8;
|
||||||
|
exc->threshold >>= 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue