summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-07 13:31:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-07 13:31:38 +0000
commit4b95faa41faf7c73b185f375dd734390e5f5639a (patch)
treedf5ef9a22d9bb69a7e6363615f0feffa2bddacff /Build/source
parent938ed9f0b25fd7f28fe8a6f359eb2d960efcf86f (diff)
lcdf-typetools build fix
git-svn-id: svn://tug.org/texlive/trunk@18800 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint3232
-rw-r--r--Build/source/texk/lcdf-typetools/config.h.in2
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.83-PATCHES/ChangeLog5
4 files changed, 12 insertions, 29 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 c323205b181..bc5753faf39 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,39 +1,21 @@
---- 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 @@
+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-06-05 01:11:20.000000000 +0200
+@@ -58,7 +58,7 @@
* @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);
+ 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 @@
+@@ -111,7 +111,7 @@
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);
+ 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);
- }
diff --git a/Build/source/texk/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in
index dd6df364f01..4c8fff69c80 100644
--- a/Build/source/texk/lcdf-typetools/config.h.in
+++ b/Build/source/texk/lcdf-typetools/config.h.in
@@ -319,8 +319,6 @@ double good_strtod(const char *nptr, char **endptr);
#ifdef __cplusplus
}
-/* Get rid of a possible inline macro under C++. */
-# define inline inline
#endif
#endif /* LCDF_TYPETOOLS_CONFIG_H */
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index 37c2465cfa5..a6442b5b9b4 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -347,8 +347,6 @@ double good_strtod(const char *nptr, char **endptr);
#ifdef __cplusplus
}
-/* Get rid of a possible inline macro under C++. */
-# define inline inline
#endif
#endif /* LCDF_TYPETOOLS_CONFIG_H */])
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.83-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.83-PATCHES/ChangeLog
index d028f0ce4b9..718657de925 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.83-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.83-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Using AC_C_INLINE, there is no need to get rid
+ of a possible inline macro under C++.
+
2010-04-26 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.83.