Commit 1a4c18f7cb70a2ae4fa209bb75a6c6c5b6ace0f2
2023-04-10T15:30:43
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199
diff --git a/include/freetype/internal/services/svpscmap.h b/include/freetype/internal/services/svpscmap.h
index fd99d85..6e599f3 100644
--- a/include/freetype/internal/services/svpscmap.h
+++ b/include/freetype/internal/services/svpscmap.h
@@ -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 );
diff --git a/src/cff/cffcmap.c b/src/cff/cffcmap.c
index 6ed3143..4988d79 100644
--- a/src/cff/cffcmap.c
+++ b/src/cff/cffcmap.c
@@ -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 )
{
diff --git a/src/pfr/pfrcmap.c b/src/pfr/pfrcmap.c
index 312a9ff..b498736 100644
--- a/src/pfr/pfrcmap.c
+++ b/src/pfr/pfrcmap.c
@@ -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 )
{
diff --git a/src/psaux/t1cmap.c b/src/psaux/t1cmap.c
index bf0a393..f94b544 100644
--- a/src/psaux/t1cmap.c
+++ b/src/psaux/t1cmap.c
@@ -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 )
{
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index db454e5..d8a2cc7 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -453,7 +453,7 @@
}
- static FT_UInt32
+ static FT_UInt
ps_unicodes_char_next( PS_Unicodes table,
FT_UInt32 *unicode )
{
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 809d4b5..e5ea6f1 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -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 )
{
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index fa73ae4..261540f 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -656,7 +656,7 @@
}
- static FT_UInt32
+ static FT_UInt
fnt_cmap_char_next( FNT_CMap cmap,
FT_UInt32 *pchar_code )
{