Commit 1464bc5ad3591306d911761dba29187e29454475
2008-10-09T05:44:23
* Fix Savannah bug #24468, unexpected conversion between FT_UInt32* and FT_UInt*
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/ChangeLog b/ChangeLog
index c01a93e..f74b2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2008-09-22 John Tytgat <John.Tytgat@esko.com>
+2008-10-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ Fix Savannah bug #24468.
+
+ According to include/freetype/internal/ftobjs.h, the appropriate
+ type to interchange single character codepoint is FT_UInt32. It
+ should be distinguished from FT_UInt which can be 16bit integer.
+
+ * src/sfnt/ttcmap.c (tt_cmap4_char_map_linear): Change the type
+ of the second argument `pcharcode' from FT_UInt* to FT_UInt32*.
+ (tt_cmap4_char_map_binary): Ditto.
+ (tt_cmap14_get_nondef_chars): Change the type of return value
+ from FT_UInt* to FT_UInt32*.
+
+2008-10-08 John Tytgat <John.Tytgat@esko.com>
Fix Savannah bug #24485.
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index f07891d..39d0265 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -973,9 +973,9 @@
static FT_UInt
- tt_cmap4_char_map_linear( TT_CMap cmap,
- FT_UInt* pcharcode,
- FT_Bool next )
+ tt_cmap4_char_map_linear( TT_CMap cmap,
+ FT_UInt32* pcharcode,
+ FT_Bool next )
{
FT_UInt num_segs2, start, end, offset;
FT_Int delta;
@@ -1052,9 +1052,9 @@
static FT_UInt
- tt_cmap4_char_map_binary( TT_CMap cmap,
- FT_UInt* pcharcode,
- FT_Bool next )
+ tt_cmap4_char_map_binary( TT_CMap cmap,
+ FT_UInt32* pcharcode,
+ FT_Bool next )
{
FT_UInt num_segs2, start, end, offset;
FT_Int delta;
@@ -2794,7 +2794,7 @@
}
- static FT_UInt*
+ static FT_UInt32*
tt_cmap14_get_nondef_chars( TT_CMap cmap,
FT_Byte *p,
FT_Memory memory )