summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint3245
1 files changed, 24 insertions, 21 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32 b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32
index 16373281d02..c323205b181 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32
@@ -1,36 +1,39 @@
-diff -ur dvisvgm-0.8.7.orig/src/FontEngine.cpp dvisvgm-0.8.7/src/FontEngine.cpp
---- dvisvgm-0.8.7.orig/src/FontEngine.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/FontEngine.cpp 2010-05-31 20:39:11.000000000 +0200
-@@ -59,11 +59,15 @@
+--- texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp (revision 18697)
++++ texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp (working copy)
+@@ -58,16 +58,12 @@
+ * @param[in] face font face to be used
* @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);
+- UInt32 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);
++ FT_UInt glyphIndex;
++ UInt32 charcode = FT_Get_First_Char(face, &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);
+- charcode = FT_Get_Next_Char(face, charcode,
+- (FT_UInt *) &glyphIndex);
++ charcode = FT_Get_Next_Char(face, charcode, &glyphIndex);
}
}
-@@ -112,10 +116,12 @@
+@@ -115,13 +111,11 @@
+ build_reverse_map(_currentFace, reverseMap);
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);
+- UInt32 glyphIndex;
+- UInt32 charcode = FT_Get_First_Char(_currentFace,
+- (FT_UInt *) &glyphIndex);
++ FT_UInt glyphIndex;
++ UInt32 charcode = FT_Get_First_Char(_currentFace, &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);
+- charcode = FT_Get_Next_Char(_currentFace, charcode,
+- (FT_UInt *) &glyphIndex);
++ charcode = FT_Get_Next_Char(_currentFace, charcode, &glyphIndex);
}
FT_Set_Charmap(_currentFace, customMap);
}