ref: f7c6b11691261590933408c343283faa540be223
parent: ed1d359025f4fe1b2d1b152fe72ffcd570b9d856
author: suzuki toshiya <[email protected]>
date: Fri Jul 31 20:32:10 EDT 2009
cache: Insert explict casts for LP64 systems.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2009-07-31 suzuki toshiya <[email protected]>
+ cache: Insert explict casts for LP64 systems.
+
+ * src/cache/ftcbasic.c (FTC_ImageCache_Lookup,
+ FTC_SBitCache_Lookup): The type of FTC_ImageType->width
+ is FT_Int, so the cast to unsigned larger type FT_ULong
+ is introduced for the comparisons with 0x10000L for
+ LP64 platform.
+
+2009-07-31 suzuki toshiya <[email protected]>
+
cache: Fix some data types mismatching with their sources.
* src/cache/ftccache.h: The type of return value
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -334,7 +334,7 @@
* This one is a major hack used to detect whether we are passed a
* regular FTC_ImageType handle, or a legacy FTC_OldImageDesc one.
*/
- if ( type->width >= 0x10000 )
+ if ( (FT_ULong)type->width >= 0x10000L )
{
FTC_OldImageDesc desc = (FTC_OldImageDesc)type;
@@ -656,7 +656,7 @@
/* This one is a major hack used to detect whether we are passed a
* regular FTC_ImageType handle, or a legacy FTC_OldImageDesc one.
*/
- if ( type->width >= 0x10000 )
+ if ( (FT_ULong)type->width >= 0x10000L )
{
FTC_OldImageDesc desc = (FTC_OldImageDesc)type;