diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-05-07 16:30:21 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-05-07 16:30:21 +0200 |
| commit | 5f7a26fd319879575c233acea1b8e6f27807f1a5 (patch) | |
| tree | 48610b3ebb8c1d48fbb2c65e2f5f5f5739352126 | |
| parent | 394c4de988aaf0332769db23ec45e0d3e724a60f (diff) | |
| download | freetype2-5f7a26fd319879575c233acea1b8e6f27807f1a5.tar.gz | |
* src/winfonts/winfnt.c: Signature fixes.
| -rw-r--r-- | src/winfonts/winfnt.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 261540f25..1160e4ef3 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -624,31 +624,34 @@ static FT_Error - fnt_cmap_init( FNT_CMap cmap, + fnt_cmap_init( FT_CMap cmap, /* FNT_CMap */ FT_Pointer pointer ) { - FNT_Face face = (FNT_Face)FT_CMAP_FACE( cmap ); - FNT_Font font = face->font; + FNT_CMap fntcmap = (FNT_CMap)cmap; + FNT_Face face = (FNT_Face)FT_CMAP_FACE( cmap ); + FNT_Font font = face->font; FT_UNUSED( pointer ); - cmap->first = (FT_UInt32) font->header.first_char; - cmap->count = (FT_UInt32)( font->header.last_char - cmap->first + 1 ); + fntcmap->first = (FT_UInt32)font->header.first_char; + fntcmap->count = (FT_UInt32)( font->header.last_char - + fntcmap->first + 1 ); return 0; } static FT_UInt - fnt_cmap_char_index( FNT_CMap cmap, + fnt_cmap_char_index( FT_CMap cmap, /* FNT_CMap */ FT_UInt32 char_code ) { - FT_UInt gindex = 0; + FNT_CMap fntcmap = (FNT_CMap)cmap; + FT_UInt gindex = 0; - char_code -= cmap->first; - if ( char_code < cmap->count ) + char_code -= fntcmap->first; + if ( char_code < fntcmap->count ) /* we artificially increase the glyph index; */ /* FNT_Load_Glyph reverts to the right one */ gindex = (FT_UInt)( char_code + 1 ); @@ -657,25 +660,26 @@ static FT_UInt - fnt_cmap_char_next( FNT_CMap cmap, + fnt_cmap_char_next( FT_CMap cmap, /* FNT_CMap */ FT_UInt32 *pchar_code ) { - FT_UInt gindex = 0; - FT_UInt32 result = 0; + FNT_CMap fntcmap = (FNT_CMap)cmap; + FT_UInt gindex = 0; + FT_UInt32 result = 0; 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; } else { - char_code -= cmap->first; - if ( char_code < cmap->count ) + char_code -= fntcmap->first; + if ( char_code < fntcmap->count ) { - result = cmap->first + char_code; + result = fntcmap->first + char_code; gindex = (FT_UInt)( char_code + 1 ); } } |