minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

sfnt: Cast a character code to FT_UInt32 for LP64 system.

This commit is contained in:
suzuki toshiya 2009-08-01 00:32:14 +09:00
parent 3f0182afb2
commit c9c6438840
2 changed files with 28 additions and 15 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>
sfnt: Cast a character code to FT_UInt32 for LP64 system.
* src/sfnt/ttcmap.c (tt_cmap14_char_map_nondef_binary,
tt_cmap14_variants, tt_cmap14_char_variants,
tt_cmap14_def_char_count, tt_cmap14_get_def_chars,
tt_cmap14_get_nondef_chars, tt_cmap14_variant_chars)
Insert casts when FT_UInt32 variable is loaded by
TT_NEXT_{UINT24|ULONG}. Because most of them are
compared with FT_UInt32 values in public API, replacing
FT_UFast is not recommended.
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
sfnt: Cast a character code to FT_UInt32 for LP64 system.

30
src/sfnt/ttcmap.c
View File

@ -2912,7 +2912,7 @@
{
FT_UInt32 mid = ( min + max ) >> 1;
FT_Byte* p = base + 5 * mid;
FT_UInt32 uni = TT_NEXT_UINT24( p );
FT_UInt32 uni = (FT_UInt32)TT_NEXT_UINT24( p );
if ( char_code < uni )
@ -3039,7 +3039,7 @@
result = cmap14->results;
for ( i = 0; i < count; ++i )
{
result[i] = TT_NEXT_UINT24( p );
result[i] = (FT_UInt32)TT_NEXT_UINT24( p );
p += 8;
}
result[i] = 0;
@ -3089,7 +3089,7 @@
static FT_UInt
tt_cmap14_def_char_count( FT_Byte *p )
{
FT_UInt32 numRanges = TT_NEXT_ULONG( p );
FT_UInt32 numRanges = (FT_UInt32)TT_NEXT_ULONG( p );
FT_UInt tot = 0;
@ -3116,14 +3116,14 @@
cnt = tt_cmap14_def_char_count( p );
numRanges = TT_NEXT_ULONG( p );
numRanges = (FT_UInt32)TT_NEXT_ULONG( p );
if ( tt_cmap14_ensure( cmap14, ( cnt + 1 ), memory ) )
return NULL;
for ( q = cmap14->results; numRanges > 0; --numRanges )
{
FT_UInt32 uni = TT_NEXT_UINT24( p );
FT_UInt32 uni = (FT_UInt32)TT_NEXT_UINT24( p );
cnt = FT_NEXT_BYTE( p ) + 1;
@ -3151,7 +3151,7 @@
FT_UInt32 *ret;
numMappings = TT_NEXT_ULONG( p );
numMappings = (FT_UInt32)TT_NEXT_ULONG( p );
if ( tt_cmap14_ensure( cmap14, ( numMappings + 1 ), memory ) )
return NULL;
@ -3159,7 +3159,7 @@
ret = cmap14->results;
for ( i = 0; i < numMappings; ++i )
{
ret[i] = TT_NEXT_UINT24( p );
ret[i] = (FT_UInt32)TT_NEXT_UINT24( p );
p += 2;
}
ret[i] = 0;
@ -3213,9 +3213,9 @@
p = cmap->data + nondefOff;
dp = cmap->data + defOff;
numMappings = TT_NEXT_ULONG( p );
numMappings = (FT_UInt32)TT_NEXT_ULONG( p );
dcnt = tt_cmap14_def_char_count( dp );
numRanges = TT_NEXT_ULONG( dp );
numRanges = (FT_UInt32)TT_NEXT_ULONG( dp );
if ( numMappings == 0 )
return tt_cmap14_get_def_chars( cmap, cmap->data + defOff,
@ -3228,10 +3228,10 @@
return NULL;
ret = cmap14->results;
duni = TT_NEXT_UINT24( dp );
duni = (FT_UInt32)TT_NEXT_UINT24( dp );
dcnt = FT_NEXT_BYTE( dp );
di = 1;
nuni = TT_NEXT_UINT24( p );
nuni = (FT_UInt32)TT_NEXT_UINT24( p );
p += 2;
ni = 1;
i = 0;
@ -3248,7 +3248,7 @@
if ( di > numRanges )
break;
duni = TT_NEXT_UINT24( dp );
duni = (FT_UInt32)TT_NEXT_UINT24( dp );
dcnt = FT_NEXT_BYTE( dp );
}
else
@ -3261,7 +3261,7 @@
if ( ni > numMappings )
break;
nuni = TT_NEXT_UINT24( p );
nuni = (FT_UInt32)TT_NEXT_UINT24( p );
p += 2;
}
}
@ -3274,7 +3274,7 @@
ret[i++] = nuni;
while ( ni < numMappings )
{
ret[i++] = TT_NEXT_UINT24( p );
ret[i++] = (FT_UInt32)TT_NEXT_UINT24( p );
p += 2;
++ni;
}
@ -3289,7 +3289,7 @@
while ( di < numRanges )
{
duni = TT_NEXT_UINT24( dp );
duni = (FT_UInt32)TT_NEXT_UINT24( dp );
dcnt = FT_NEXT_BYTE( dp );
for ( k = 0; k <= dcnt; ++k )