summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c b/Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c
index 060554ae46a..e60a0a5141f 100644
--- a/Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c
+++ b/Build/source/libs/freetype2/freetype-src/src/pcf/pcfread.c
@@ -238,7 +238,7 @@ THE SOFTWARE.
{
for ( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] );
j++ )
- if ( tables[i].type == (FT_UInt)( 1 << j ) )
+ if ( tables[i].type == 1UL << j )
name = tableNames[j];
FT_TRACE4(( " %d: type=%s, format=0x%lX,"
@@ -613,7 +613,8 @@ THE SOFTWARE.
strings[string_size] = '\0';
- if ( FT_QNEW_ARRAY( properties, nprops ) )
+ /* zero out in case of failure */
+ if ( FT_NEW_ARRAY( properties, nprops ) )
goto Bail;
face->properties = properties;
@@ -1612,7 +1613,7 @@ THE SOFTWARE.
else
{
/* this is a heuristical value */
- bsize->width = (FT_Short)FT_MulDiv( bsize->height, 2, 3 );
+ bsize->width = ( bsize->height * 2 + 1 ) / 3;
}
prop = pcf_find_property( face, "POINT_SIZE" );