Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
1a4c18f7
by Alexei Podtelezhnikov at 2023-04-10T15:30:43+00:00
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.
7 changed files:
Changes:
include/freetype/internal/services/svpscmap.h
| ... |
... |
@@ -97,7 +97,7 @@ FT_BEGIN_HEADER |
|
97
|
97
|
(*PS_Unicodes_CharIndexFunc)( PS_Unicodes unicodes,
|
|
98
|
98
|
FT_UInt32 unicode );
|
|
99
|
99
|
|
|
100
|
|
- typedef FT_UInt32
|
|
|
100
|
+ typedef FT_UInt
|
|
101
|
101
|
(*PS_Unicodes_CharNextFunc)( PS_Unicodes unicodes,
|
|
102
|
102
|
FT_UInt32 *unicode );
|
|
103
|
103
|
|
src/cff/cffcmap.c
| ... |
... |
@@ -69,7 +69,7 @@ |
|
69
|
69
|
}
|
|
70
|
70
|
|
|
71
|
71
|
|
|
72
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
72
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
73
|
73
|
cff_cmap_encoding_char_next( CFF_CMapStd cmap,
|
|
74
|
74
|
FT_UInt32 *pchar_code )
|
|
75
|
75
|
{
|
| ... |
... |
@@ -197,7 +197,7 @@ |
|
197
|
197
|
}
|
|
198
|
198
|
|
|
199
|
199
|
|
|
200
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
200
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
201
|
201
|
cff_cmap_unicode_char_next( PS_Unicodes unicodes,
|
|
202
|
202
|
FT_UInt32 *pchar_code )
|
|
203
|
203
|
{
|
src/pfr/pfrcmap.c
| ... |
... |
@@ -96,7 +96,7 @@ |
|
96
|
96
|
}
|
|
97
|
97
|
|
|
98
|
98
|
|
|
99
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
99
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
100
|
100
|
pfr_cmap_char_next( PFR_CMap cmap,
|
|
101
|
101
|
FT_UInt32 *pchar_code )
|
|
102
|
102
|
{
|
src/psaux/t1cmap.c
| ... |
... |
@@ -95,7 +95,7 @@ |
|
95
|
95
|
}
|
|
96
|
96
|
|
|
97
|
97
|
|
|
98
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
98
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
99
|
99
|
t1_cmap_std_char_next( T1_CMapStd cmap,
|
|
100
|
100
|
FT_UInt32 *pchar_code )
|
|
101
|
101
|
{
|
| ... |
... |
@@ -232,7 +232,7 @@ |
|
232
|
232
|
}
|
|
233
|
233
|
|
|
234
|
234
|
|
|
235
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
235
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
236
|
236
|
t1_cmap_custom_char_next( T1_CMapCustom cmap,
|
|
237
|
237
|
FT_UInt32 *pchar_code )
|
|
238
|
238
|
{
|
| ... |
... |
@@ -341,7 +341,7 @@ |
|
341
|
341
|
}
|
|
342
|
342
|
|
|
343
|
343
|
|
|
344
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
344
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
345
|
345
|
t1_cmap_unicode_char_next( PS_Unicodes unicodes,
|
|
346
|
346
|
FT_UInt32 *pchar_code )
|
|
347
|
347
|
{
|
src/psnames/psmodule.c
| ... |
... |
@@ -453,7 +453,7 @@ |
|
453
|
453
|
}
|
|
454
|
454
|
|
|
455
|
455
|
|
|
456
|
|
- static FT_UInt32
|
|
|
456
|
+ static FT_UInt
|
|
457
|
457
|
ps_unicodes_char_next( PS_Unicodes table,
|
|
458
|
458
|
FT_UInt32 *unicode )
|
|
459
|
459
|
{
|
src/sfnt/ttcmap.c
| ... |
... |
@@ -138,7 +138,7 @@ |
|
138
|
138
|
}
|
|
139
|
139
|
|
|
140
|
140
|
|
|
141
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
141
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
142
|
142
|
tt_cmap0_char_next( TT_CMap cmap,
|
|
143
|
143
|
FT_UInt32 *pchar_code )
|
|
144
|
144
|
{
|
| ... |
... |
@@ -491,7 +491,7 @@ |
|
491
|
491
|
}
|
|
492
|
492
|
|
|
493
|
493
|
|
|
494
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
494
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
495
|
495
|
tt_cmap2_char_next( TT_CMap cmap,
|
|
496
|
496
|
FT_UInt32 *pcharcode )
|
|
497
|
497
|
{
|
| ... |
... |
@@ -1481,7 +1481,7 @@ |
|
1481
|
1481
|
}
|
|
1482
|
1482
|
|
|
1483
|
1483
|
|
|
1484
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
1484
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
1485
|
1485
|
tt_cmap4_char_next( TT_CMap cmap,
|
|
1486
|
1486
|
FT_UInt32 *pchar_code )
|
|
1487
|
1487
|
{
|
| ... |
... |
@@ -1640,7 +1640,7 @@ |
|
1640
|
1640
|
}
|
|
1641
|
1641
|
|
|
1642
|
1642
|
|
|
1643
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
1643
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
1644
|
1644
|
tt_cmap6_char_next( TT_CMap cmap,
|
|
1645
|
1645
|
FT_UInt32 *pchar_code )
|
|
1646
|
1646
|
{
|
| ... |
... |
@@ -1911,7 +1911,7 @@ |
|
1911
|
1911
|
}
|
|
1912
|
1912
|
|
|
1913
|
1913
|
|
|
1914
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
1914
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
1915
|
1915
|
tt_cmap8_char_next( TT_CMap cmap,
|
|
1916
|
1916
|
FT_UInt32 *pchar_code )
|
|
1917
|
1917
|
{
|
| ... |
... |
@@ -2109,7 +2109,7 @@ |
|
2109
|
2109
|
}
|
|
2110
|
2110
|
|
|
2111
|
2111
|
|
|
2112
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
2112
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
2113
|
2113
|
tt_cmap10_char_next( TT_CMap cmap,
|
|
2114
|
2114
|
FT_UInt32 *pchar_code )
|
|
2115
|
2115
|
{
|
| ... |
... |
@@ -2458,7 +2458,7 @@ |
|
2458
|
2458
|
}
|
|
2459
|
2459
|
|
|
2460
|
2460
|
|
|
2461
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
2461
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
2462
|
2462
|
tt_cmap12_char_next( TT_CMap cmap,
|
|
2463
|
2463
|
FT_UInt32 *pchar_code )
|
|
2464
|
2464
|
{
|
| ... |
... |
@@ -2768,7 +2768,7 @@ |
|
2768
|
2768
|
}
|
|
2769
|
2769
|
|
|
2770
|
2770
|
|
|
2771
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
2771
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
2772
|
2772
|
tt_cmap13_char_next( TT_CMap cmap,
|
|
2773
|
2773
|
FT_UInt32 *pchar_code )
|
|
2774
|
2774
|
{
|
| ... |
... |
@@ -3101,7 +3101,7 @@ |
|
3101
|
3101
|
}
|
|
3102
|
3102
|
|
|
3103
|
3103
|
|
|
3104
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
3104
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
3105
|
3105
|
tt_cmap14_char_next( TT_CMap cmap,
|
|
3106
|
3106
|
FT_UInt32 *pchar_code )
|
|
3107
|
3107
|
{
|
| ... |
... |
@@ -3671,7 +3671,7 @@ |
|
3671
|
3671
|
}
|
|
3672
|
3672
|
|
|
3673
|
3673
|
|
|
3674
|
|
- FT_CALLBACK_DEF( FT_UInt32 )
|
|
|
3674
|
+ FT_CALLBACK_DEF( FT_UInt )
|
|
3675
|
3675
|
tt_cmap_unicode_char_next( PS_Unicodes unicodes,
|
|
3676
|
3676
|
FT_UInt32 *pchar_code )
|
|
3677
|
3677
|
{
|
src/winfonts/winfnt.c
| ... |
... |
@@ -656,7 +656,7 @@ |
|
656
|
656
|
}
|
|
657
|
657
|
|
|
658
|
658
|
|
|
659
|
|
- static FT_UInt32
|
|
|
659
|
+ static FT_UInt
|
|
660
|
660
|
fnt_cmap_char_next( FNT_CMap cmap,
|
|
661
|
661
|
FT_UInt32 *pchar_code )
|
|
662
|
662
|
{
|
|