minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/winfonts/winfnt.c: Signature fixes.

This commit is contained in:
Werner Lemberg 2023-05-07 16:30:21 +02:00
parent 394c4de988
commit 5f7a26fd31
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/winfonts/winfnt.c
View File

@ -624,31 +624,34 @@
static FT_Error static FT_Error
fnt_cmap_init( FNT_CMap cmap, fnt_cmap_init( FT_CMap cmap, /* FNT_CMap */
FT_Pointer pointer ) FT_Pointer pointer )
{ {
FNT_Face face = (FNT_Face)FT_CMAP_FACE( cmap ); FNT_CMap fntcmap = (FNT_CMap)cmap;
FNT_Font font = face->font; FNT_Face face = (FNT_Face)FT_CMAP_FACE( cmap );
FNT_Font font = face->font;
FT_UNUSED( pointer ); FT_UNUSED( pointer );
cmap->first = (FT_UInt32) font->header.first_char; fntcmap->first = (FT_UInt32)font->header.first_char;
cmap->count = (FT_UInt32)( font->header.last_char - cmap->first + 1 ); fntcmap->count = (FT_UInt32)( font->header.last_char -
fntcmap->first + 1 );
return 0; return 0;
} }
static FT_UInt static FT_UInt
fnt_cmap_char_index( FNT_CMap cmap, fnt_cmap_char_index( FT_CMap cmap, /* FNT_CMap */
FT_UInt32 char_code ) FT_UInt32 char_code )
{ {
FT_UInt gindex = 0; FNT_CMap fntcmap = (FNT_CMap)cmap;
FT_UInt gindex = 0;
char_code -= cmap->first; char_code -= fntcmap->first;
if ( char_code < cmap->count ) if ( char_code < fntcmap->count )
/* we artificially increase the glyph index; */ /* we artificially increase the glyph index; */
/* FNT_Load_Glyph reverts to the right one */ /* FNT_Load_Glyph reverts to the right one */
gindex = (FT_UInt)( char_code + 1 ); gindex = (FT_UInt)( char_code + 1 );
@ -657,25 +660,26 @@
static FT_UInt static FT_UInt
fnt_cmap_char_next( FNT_CMap cmap, fnt_cmap_char_next( FT_CMap cmap, /* FNT_CMap */
FT_UInt32 *pchar_code ) FT_UInt32 *pchar_code )
{ {
FT_UInt gindex = 0; FNT_CMap fntcmap = (FNT_CMap)cmap;
FT_UInt32 result = 0; FT_UInt gindex = 0;
FT_UInt32 result = 0;
FT_UInt32 char_code = *pchar_code + 1; FT_UInt32 char_code = *pchar_code + 1;
if ( char_code <= cmap->first ) if ( char_code <= fntcmap->first )
{ {
result = cmap->first; result = fntcmap->first;
gindex = 1; gindex = 1;
} }
else else
{ {
char_code -= cmap->first; char_code -= fntcmap->first;
if ( char_code < cmap->count ) if ( char_code < fntcmap->count )
{ {
result = cmap->first + char_code; result = fntcmap->first + char_code;
gindex = (FT_UInt)( char_code + 1 ); gindex = (FT_UInt)( char_code + 1 );
} }
} }