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

cpp-conditionalize too large property value check for LP64 systems, 

because it is always false on 16bit & 32bit systems.
This commit is contained in:
suzuki toshiya 2017-09-13 11:04:50 +09:00
parent 70e4141c0d
commit 4e41249fad
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/base/ftobjs.c
View File

@ -3543,11 +3543,14 @@
FT_CMap cmap = FT_CMAP( face->charmap );
/* care for 64bit platforms */
#if (FT_ULONG_MAX > 0xFFFFFFFFUL)
if ( charcode > 0xFFFFFFFFUL )
{
FT_TRACE1(( "FT_Get_Char_Index: too large charcode" ));
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
}
#endif
result = cmap->clazz->char_index( cmap, (FT_UInt32)charcode );
if ( result >= (FT_UInt)face->num_glyphs )
@ -3723,6 +3726,8 @@
FT_CMap vcmap = FT_CMAP( charmap );
/* care for 64bit platforms */
#if (FT_ULONG_MAX > 0xFFFFFFFFUL)
if ( charcode > 0xFFFFFFFFUL )
{
FT_TRACE1(( "FT_Face_GetCharVariantIndex:"
@ -3735,6 +3740,7 @@
" too large variantSelector" ));
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
}
#endif
result = vcmap->clazz->char_var_index( vcmap, ucmap,
(FT_UInt32)charcode,
@ -3766,6 +3772,8 @@
FT_CMap vcmap = FT_CMAP( charmap );
/* care for 64bit platforms */
#if (FT_ULONG_MAX > 0xFFFFFFFFUL)
if ( charcode > 0xFFFFFFFFUL )
{
FT_TRACE1(( "FT_Face_GetCharVariantIsDefault:"
@ -3778,6 +3786,7 @@
" too large variantSelector" ));
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
}
#endif
result = vcmap->clazz->char_var_default( vcmap,
(FT_UInt32)charcode,
@ -3836,11 +3845,14 @@
FT_Memory memory = FT_FACE_MEMORY( face );
/* care for 64bit platforms */
#if (FT_ULONG_MAX > 0xFFFFFFFFUL)
if ( charcode > 0xFFFFFFFFUL )
{
FT_TRACE1(( "FT_Face_GetVariantsOfChar: too large charcode" ));
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
}
#endif
result = vcmap->clazz->charvariant_list( vcmap, memory,
(FT_UInt32)charcode );
@ -3870,11 +3882,14 @@
FT_Memory memory = FT_FACE_MEMORY( face );
/* care for 64bit platforms */
#if (FT_ULONG_MAX > 0xFFFFFFFFUL)
if ( variantSelector > 0xFFFFFFFFUL )
{
FT_TRACE1(( "FT_Get_Char_Index: too large variantSelector" ));
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
}
#endif
result = vcmap->clazz->variantchar_list( vcmap, memory,
(FT_UInt32)variantSelector );