summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp
index 38acd1e73bb..be9bddb7fbc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp
@@ -59,11 +59,15 @@ void FontEngine::setDeviceResolution (int x, int y) {
* @param[out] reverseMap the resulting map */
static void build_reverse_map (FT_Face face, map<UInt32, UInt32> &reverseMap) {
UInt32 glyphIndex;
- UInt32 charcode = FT_Get_First_Char(face, &glyphIndex);
+ /* The explicit cast is necessary with the AIX compiler,
+ which considers the dvisvgm definition signed,
+ and incompatible with the freetype definition. */
+ UInt32 charcode = FT_Get_First_Char(face, (FT_UInt *) &glyphIndex);
while (glyphIndex) {
// if (reverseMap.find(glyphIndex) == reverseMap.end())
reverseMap[glyphIndex] = charcode;
- charcode = FT_Get_Next_Char(face, charcode, &glyphIndex);
+ charcode = FT_Get_Next_Char(face, charcode,
+ (FT_UInt *) &glyphIndex);
}
}
@@ -112,10 +116,12 @@ void FontEngine::buildTranslationMap (map<UInt32, UInt32> &translationMap) const
FT_Set_Charmap(_currentFace, unicodeMap);
UInt32 glyphIndex;
- UInt32 charcode = FT_Get_First_Char(_currentFace, &glyphIndex);
+ UInt32 charcode = FT_Get_First_Char(_currentFace,
+ (FT_UInt *) &glyphIndex);
while (glyphIndex) {
translationMap[reverseMap[glyphIndex]] = charcode;
- charcode = FT_Get_Next_Char(_currentFace, charcode, &glyphIndex);
+ charcode = FT_Get_Next_Char(_currentFace, charcode,
+ (FT_UInt *) &glyphIndex);
}
FT_Set_Charmap(_currentFace, customMap);
}