sfnt: Cast a charcode to 32-bit in cmap format 14 parser.
This commit is contained in:
parent
7a726cb2b9
commit
22769f6645
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
sfnt: Cast a charcode to 32-bit in cmap format 14 parser.
|
||||||
|
|
||||||
|
* src/sfnt/ttcmap.c (tt_cmap14_char_var_index,
|
||||||
|
tt_cmap14_char_var_isdefault, tt_cmap14_char_variants,
|
||||||
|
tt_cmap14_variant_chars): Correct mismatches from
|
||||||
|
FT_CMap_CharVarIndexFunc prototype, FT_ULong arguments
|
||||||
|
are replaced by FT_UInt32 arguments.
|
||||||
|
|
||||||
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
sfnt: Cast a charcode to 32-bit in cmap format 12 parser.
|
sfnt: Cast a charcode to 32-bit in cmap format 12 parser.
|
||||||
|
|
|
@ -2964,10 +2964,10 @@
|
||||||
|
|
||||||
|
|
||||||
FT_CALLBACK_DEF( FT_UInt )
|
FT_CALLBACK_DEF( FT_UInt )
|
||||||
tt_cmap14_char_var_index( TT_CMap cmap,
|
tt_cmap14_char_var_index( TT_CMap cmap,
|
||||||
TT_CMap ucmap,
|
TT_CMap ucmap,
|
||||||
FT_ULong charcode,
|
FT_UInt32 charcode,
|
||||||
FT_ULong variantSelector)
|
FT_UInt32 variantSelector)
|
||||||
{
|
{
|
||||||
FT_Byte* p = tt_cmap14_find_variant( cmap->data + 6, variantSelector );
|
FT_Byte* p = tt_cmap14_find_variant( cmap->data + 6, variantSelector );
|
||||||
FT_ULong defOff;
|
FT_ULong defOff;
|
||||||
|
@ -2997,9 +2997,9 @@
|
||||||
|
|
||||||
|
|
||||||
FT_CALLBACK_DEF( FT_Int )
|
FT_CALLBACK_DEF( FT_Int )
|
||||||
tt_cmap14_char_var_isdefault( TT_CMap cmap,
|
tt_cmap14_char_var_isdefault( TT_CMap cmap,
|
||||||
FT_ULong charcode,
|
FT_UInt32 charcode,
|
||||||
FT_ULong variantSelector )
|
FT_UInt32 variantSelector )
|
||||||
{
|
{
|
||||||
FT_Byte* p = tt_cmap14_find_variant( cmap->data + 6, variantSelector );
|
FT_Byte* p = tt_cmap14_find_variant( cmap->data + 6, variantSelector );
|
||||||
FT_ULong defOff;
|
FT_ULong defOff;
|
||||||
|
@ -3054,7 +3054,7 @@
|
||||||
FT_CALLBACK_DEF( FT_UInt32 * )
|
FT_CALLBACK_DEF( FT_UInt32 * )
|
||||||
tt_cmap14_char_variants( TT_CMap cmap,
|
tt_cmap14_char_variants( TT_CMap cmap,
|
||||||
FT_Memory memory,
|
FT_Memory memory,
|
||||||
FT_ULong charCode )
|
FT_UInt32 charCode )
|
||||||
{
|
{
|
||||||
TT_CMap14 cmap14 = (TT_CMap14) cmap;
|
TT_CMap14 cmap14 = (TT_CMap14) cmap;
|
||||||
FT_UInt32 count = cmap14->num_selectors;
|
FT_UInt32 count = cmap14->num_selectors;
|
||||||
|
@ -3174,7 +3174,7 @@
|
||||||
FT_CALLBACK_DEF( FT_UInt32 * )
|
FT_CALLBACK_DEF( FT_UInt32 * )
|
||||||
tt_cmap14_variant_chars( TT_CMap cmap,
|
tt_cmap14_variant_chars( TT_CMap cmap,
|
||||||
FT_Memory memory,
|
FT_Memory memory,
|
||||||
FT_ULong variantSelector )
|
FT_UInt32 variantSelector )
|
||||||
{
|
{
|
||||||
FT_Byte *p = tt_cmap14_find_variant( cmap->data + 6,
|
FT_Byte *p = tt_cmap14_find_variant( cmap->data + 6,
|
||||||
variantSelector );
|
variantSelector );
|
||||||
|
|
Loading…
Reference in New Issue