summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-04 23:11:20 +0000
committerKarl Berry <karl@freefriends.org>2010-06-04 23:11:20 +0000
commitc3a1d17a9ded47951c6be127d60ba32374f13384 (patch)
tree5f9322c92b63ecf9554a7bce2ff2e5556a972a03 /Build/source/texk/dvisvgm
parentd9b212ab00e73962e7318f24c9ed4099c2deabfe (diff)
declare glyphIndex variables as FT_UInt in the first place, instead of casting
git-svn-id: svn://tug.org/texlive/trunk@18742 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint3245
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp18
3 files changed, 36 insertions, 34 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
index 2fd51d15ec7..91e2dd7fffa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
@@ -1,6 +1,11 @@
+2010-06-05 Karl Berry <karl@tug.org>
+
+ * patch-07-libdvisvgm-uint32: declare glyphIndex as FT_UInt in the
+ first place, instead of casting. From vvv, confirmed for his AIX.
+
2010-05-31 Karl Berry <karl@tug.org>
- * Added patch-07-libdvisvgm-uint32.
+ Added patch-07-libdvisvgm-uint32.
* src/FontEngine.cpp: must cast &glyphindex to (FT_Uint *)
for AIX compiler (tlbuild 28 May 2010 15:23:25).
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);
}
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 be9bddb7fbc..e6d712c0907 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
@@ -58,16 +58,12 @@ void FontEngine::setDeviceResolution (int x, int y) {
* @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;
- /* 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,
- (FT_UInt *) &glyphIndex);
+ charcode = FT_Get_Next_Char(face, charcode, &glyphIndex);
}
}
@@ -115,13 +111,11 @@ void FontEngine::buildTranslationMap (map<UInt32, UInt32> &translationMap) const
build_reverse_map(_currentFace, reverseMap);
FT_Set_Charmap(_currentFace, unicodeMap);
- 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,
- (FT_UInt *) &glyphIndex);
+ charcode = FT_Get_Next_Char(_currentFace, charcode, &glyphIndex);
}
FT_Set_Charmap(_currentFace, customMap);
}