summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-06-14 07:51:00 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-06-14 07:51:00 +0000
commit7b77dfee2b1a731dab41883ba0d8fd7faa21fa10 (patch)
tree9e2650faf00a2f5d46305abdfd5ce2ae67816512 /Build
parentb7517ff8f754b5f217163c1c74d32f0df8897181 (diff)
lcdf-typetools: portability patch from Vladimir
git-svn-id: svn://tug.org/texlive/trunk@22969 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-f3_mark_out_glyphs-is-void24
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfgsub.cc2
4 files changed, 31 insertions, 2 deletions
diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh b/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
index c91aabcf443..98a2e0f945a 100644
--- a/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
+++ b/Build/source/texk/lcdf-typetools/include/efont/otfgsub.hh
@@ -99,7 +99,7 @@ class GsubContext { public:
enum { F3_HSIZE = 6, SUBRECSIZE = 4 };
private:
Data _d;
- static bool f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap);
+ static void f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap);
static bool f3_unparse(const Data &data,
int nglyph, int glyphtab_offset, const Coverage &limit,
int nsub, int subtab_offset,
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog
index cacdea33566..bb2823bfdab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-f3_mark_out_glyphs-is-void (new): Patch from
+ Vladimir Volovich <vvv@vsu.ru>.
+
2011-06-06 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.90.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-f3_mark_out_glyphs-is-void b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-f3_mark_out_glyphs-is-void
new file mode 100644
index 00000000000..c3960ee83da
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-f3_mark_out_glyphs-is-void
@@ -0,0 +1,24 @@
+diff -ur lcdf-typetools-2.90.orig/include/efont/otfgsub.hh lcdf-typetools-2.90/include/efont/otfgsub.hh
+--- lcdf-typetools-2.90.orig/include/efont/otfgsub.hh 2011-06-02 08:42:13.000000000 +0200
++++ lcdf-typetools-2.90/include/efont/otfgsub.hh 2011-06-14 09:38:45.000000000 +0200
+@@ -99,7 +99,7 @@
+ enum { F3_HSIZE = 6, SUBRECSIZE = 4 };
+ private:
+ Data _d;
+- static bool f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap);
++ static void f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap);
+ static bool f3_unparse(const Data &data,
+ int nglyph, int glyphtab_offset, const Coverage &limit,
+ int nsub, int subtab_offset,
+diff -ur lcdf-typetools-2.90.orig/libefont/otfgsub.cc lcdf-typetools-2.90/libefont/otfgsub.cc
+--- lcdf-typetools-2.90.orig/libefont/otfgsub.cc 2011-06-02 08:57:48.000000000 +0200
++++ lcdf-typetools-2.90/libefont/otfgsub.cc 2011-06-14 09:38:54.000000000 +0200
+@@ -1070,7 +1070,7 @@
+ return Coverage();
+ }
+
+-bool
++void
+ GsubContext::f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap)
+ {
+ for (int j = 0; j < nsub; ++j) {
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
index 7d90818d25b..f4d82134310 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
@@ -1070,7 +1070,7 @@ GsubContext::coverage() const throw ()
return Coverage();
}
-bool
+void
GsubContext::f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap)
{
for (int j = 0; j < nsub; ++j) {