AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix Savannah bug #24468, unexpected conversion between FT_UInt32* and FT_UInt*

Browse Source
This commit is contained in:
Suzuki, Toshiya (鈴木俊哉) 2008-10-09 05:44:23 +00:00
parent fa9d39940e
commit 1464bc5ad3
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -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.

14
src/sfnt/ttcmap.c
View File

@ -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 )