summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-04 13:33:55 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-04 13:33:55 +0000
commit7814890a8e7b65ad8f6c46b01626af1523c06bfb (patch)
tree0039e0cdb6167610ea4fcfd13087357b36d90862
parent4df64d32d4610ccbd0b7b14bf91ed6011e15da84 (diff)
harfbuzz: backport from upstream
git-svn-id: svn://tug.org/texlive/trunk@28728 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const39
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh8
3 files changed, 47 insertions, 4 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog
index a81eff6bede..f83bde030e3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-const (new): Backport from upstream.
+
2013-01-03 Khaled Hosny <khaledhosny@eglug.org>
Imported harfbuzz-0.9.10 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const b/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const
new file mode 100644
index 00000000000..98eabbd22ec
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.10-PATCHES/patch-01-const
@@ -0,0 +1,39 @@
+diff -ur harfbuzz-0.9.10.orig/src/hb-ot-layout-gsubgpos-private.hh harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
+--- harfbuzz-0.9.10.orig/src/hb-ot-layout-gsubgpos-private.hh 2013-01-03 07:14:24.000000000 +0100
++++ harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh 2013-01-04 13:31:51.000000000 +0100
+@@ -62,7 +62,7 @@
+ template <typename T>
+ inline return_t process (const T &obj) { obj.closure (this); return HB_VOID; }
+ static return_t default_return_value (void) { return HB_VOID; }
+- bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
++ bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
+ return_t recurse (unsigned int lookup_index)
+ {
+ if (unlikely (nesting_level_left == 0 || !recurse_func))
+@@ -111,7 +111,7 @@
+ template <typename T>
+ inline return_t process (const T &obj) { return obj.would_apply (this); }
+ static return_t default_return_value (void) { return false; }
+- bool stop_sublookup_iteration (const return_t r) const { return r; }
++ bool stop_sublookup_iteration (return_t r) const { return r; }
+
+ hb_face_t *face;
+ const hb_codepoint_t *glyphs;
+@@ -150,7 +150,7 @@
+ template <typename T>
+ inline return_t process (const T &obj) { obj.collect_glyphs (this); return HB_VOID; }
+ static return_t default_return_value (void) { return HB_VOID; }
+- bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
++ bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
+ return_t recurse (unsigned int lookup_index)
+ {
+ if (unlikely (nesting_level_left == 0 || !recurse_func))
+@@ -243,7 +243,7 @@
+ template <typename T>
+ inline return_t process (const T &obj) { return obj.apply (this); }
+ static return_t default_return_value (void) { return false; }
+- bool stop_sublookup_iteration (const return_t r) const { return r; }
++ bool stop_sublookup_iteration (return_t r) const { return r; }
+ return_t recurse (unsigned int lookup_index)
+ {
+ if (unlikely (nesting_level_left == 0 || !recurse_func))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
index 40be861f39c..0b000051f74 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.10/src/hb-ot-layout-gsubgpos-private.hh
@@ -62,7 +62,7 @@ struct hb_closure_context_t
template <typename T>
inline return_t process (const T &obj) { obj.closure (this); return HB_VOID; }
static return_t default_return_value (void) { return HB_VOID; }
- bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
+ bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
return_t recurse (unsigned int lookup_index)
{
if (unlikely (nesting_level_left == 0 || !recurse_func))
@@ -111,7 +111,7 @@ struct hb_would_apply_context_t
template <typename T>
inline return_t process (const T &obj) { return obj.would_apply (this); }
static return_t default_return_value (void) { return false; }
- bool stop_sublookup_iteration (const return_t r) const { return r; }
+ bool stop_sublookup_iteration (return_t r) const { return r; }
hb_face_t *face;
const hb_codepoint_t *glyphs;
@@ -150,7 +150,7 @@ struct hb_collect_glyphs_context_t
template <typename T>
inline return_t process (const T &obj) { obj.collect_glyphs (this); return HB_VOID; }
static return_t default_return_value (void) { return HB_VOID; }
- bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; }
+ bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; }
return_t recurse (unsigned int lookup_index)
{
if (unlikely (nesting_level_left == 0 || !recurse_func))
@@ -243,7 +243,7 @@ struct hb_apply_context_t
template <typename T>
inline return_t process (const T &obj) { return obj.apply (this); }
static return_t default_return_value (void) { return false; }
- bool stop_sublookup_iteration (const return_t r) const { return r; }
+ bool stop_sublookup_iteration (return_t r) const { return r; }
return_t recurse (unsigned int lookup_index)
{
if (unlikely (nesting_level_left == 0 || !recurse_func))