summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:33 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:33 +0900
commit2abe8d63fc14d7f2ad6511ab7144300369f794b8 (patch)
tree2afe92240a7411b3df8fd1bd25037457a204aa76
parent13cdd027d2cae10cedd068239ea8b0ba5afbc390 (diff)
downloadfreetype2-2abe8d63fc14d7f2ad6511ab7144300369f794b8.tar.gz
sfnt: Cast a character code to FT_UInt32 for LP64 system.
-rw-r--r--ChangeLog8
-rw-r--r--src/sfnt/ttcmap.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 344f6212b..44604dcac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ sfnt: Cast a character code to FT_UInt32 for LP64 system.
+
+ * src/sfnt/ttcmap.c (tt_cmap4_init, tt_cmap4_next):
+ Insert the casts from unsigned long constant to
+ FT_UInt32.
+
+2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
sfnt: Extend TT_BDF->strings_size to FT_ULong for huge BDF.
* include/freetype/internal/tttypes.h: The type
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index a111741c7..c55afe2ba 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -659,7 +659,7 @@
p = table + 6;
cmap->num_ranges = FT_PEEK_USHORT( p ) >> 1;
- cmap->cur_charcode = 0xFFFFFFFFUL;
+ cmap->cur_charcode = (FT_UInt32)0xFFFFFFFFUL;
cmap->cur_gindex = 0;
return SFNT_Err_Ok;
@@ -799,7 +799,7 @@
}
Fail:
- cmap->cur_charcode = 0xFFFFFFFFUL;
+ cmap->cur_charcode = (FT_UInt32)0xFFFFFFFFUL;
cmap->cur_gindex = 0;
}