summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:39 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:39 +0900
commit3fa528c45d69774150ac8bd2ea625fe9fb3fdda1 (patch)
treed1d5e92d893c7b3f477b772c77d8488f39bb35c5
parent3114e3cb188811fd86318fe27eade6fc4e2875b2 (diff)
downloadfreetype2-3fa528c45d69774150ac8bd2ea625fe9fb3fdda1.tar.gz
sfnt: Insert explicit cast for LP64 system.
-rw-r--r--ChangeLog7
-rw-r--r--src/sfnt/ttkern.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d12a3881..8a592676c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ sfnt: Insert explicit cast for LP64 system.
+
+ * src/sfnt/ttkern.c (tt_face_load_kern): Insert
+ cast from unsigned long to FT_UInt32.
+
+2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
gxvalid: Guarantee `just' table size upto 32-bit.
* src/gxvalid/gxvjust.c (gxv_just_validate):
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index 0744b3fb1..e0d2ed825 100644
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -87,7 +87,7 @@
{
FT_UInt num_pairs, length, coverage;
FT_Byte* p_next;
- FT_UInt32 mask = 1UL << nn;
+ FT_UInt32 mask = (FT_UInt32)1UL << nn;
if ( p + 6 > p_limit )