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

Align `char_next` return types. 

This is mostly cosmetic because FT_UInt and FT_UInt32 are likely identical.

* src/sfnt/ttcmap.c, src/cff/cffcmap.c, src/psaux/t1cmap.c,
src/psnames/psmodule.c, include/freetype/internal/service/svpcsmap.h,
src/pfr/pfrcmap.c, src/winfonts/winfnt.c (*_char_next): return FT_UInt.
This commit is contained in:
Alexei Podtelezhnikov 2023-04-10 15:30:43 +00:00
parent d25444333c
commit 1a4c18f7cb
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freetype/internal/services/svpscmap.h
View File

@ -97,7 +97,7 @@ FT_BEGIN_HEADER
(*PS_Unicodes_CharIndexFunc)( PS_Unicodes unicodes,
FT_UInt32 unicode );
typedef FT_UInt32
typedef FT_UInt
(*PS_Unicodes_CharNextFunc)( PS_Unicodes unicodes,
FT_UInt32 *unicode );

4
src/cff/cffcmap.c
View File

@ -69,7 +69,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
cff_cmap_encoding_char_next( CFF_CMapStd cmap,
FT_UInt32 *pchar_code )
{
@ -197,7 +197,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
cff_cmap_unicode_char_next( PS_Unicodes unicodes,
FT_UInt32 *pchar_code )
{

2
src/pfr/pfrcmap.c
View File

@ -96,7 +96,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
pfr_cmap_char_next( PFR_CMap cmap,
FT_UInt32 *pchar_code )
{

6
src/psaux/t1cmap.c
View File

@ -95,7 +95,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
t1_cmap_std_char_next( T1_CMapStd cmap,
FT_UInt32 *pchar_code )
{
@ -232,7 +232,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
t1_cmap_custom_char_next( T1_CMapCustom cmap,
FT_UInt32 *pchar_code )
{
@ -341,7 +341,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
t1_cmap_unicode_char_next( PS_Unicodes unicodes,
FT_UInt32 *pchar_code )
{

2
src/psnames/psmodule.c
View File

@ -453,7 +453,7 @@
}
static FT_UInt32
static FT_UInt
ps_unicodes_char_next( PS_Unicodes table,
FT_UInt32 *unicode )
{

20
src/sfnt/ttcmap.c
View File

@ -138,7 +138,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap0_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -491,7 +491,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap2_char_next( TT_CMap cmap,
FT_UInt32 *pcharcode )
{
@ -1481,7 +1481,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap4_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -1640,7 +1640,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap6_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -1911,7 +1911,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap8_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -2109,7 +2109,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap10_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -2458,7 +2458,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap12_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -2768,7 +2768,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap13_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -3101,7 +3101,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap14_char_next( TT_CMap cmap,
FT_UInt32 *pchar_code )
{
@ -3671,7 +3671,7 @@
}
FT_CALLBACK_DEF( FT_UInt32 )
FT_CALLBACK_DEF( FT_UInt )
tt_cmap_unicode_char_next( PS_Unicodes unicodes,
FT_UInt32 *pchar_code )
{

2
src/winfonts/winfnt.c
View File

@ -656,7 +656,7 @@
}
static FT_UInt32
static FT_UInt
fnt_cmap_char_next( FNT_CMap cmap,
FT_UInt32 *pchar_code )
{