summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog12
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/TL-Changes26
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-01-Khaled106
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc143
4 files changed, 0 insertions, 287 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog
deleted file mode 100644
index 962d172e968..00000000000
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2012-12-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
- * patch-02-oldmsvc (new): #error is not recognized by old msvcs.
-
-2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-01-Khaled (new): Partial update from git, from Khaled.
-
-2012-11-29 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- Imported harfbuzz-0.9.7 source tree from:
- http://cgit.freedesktop.org/harfbuzz/
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/TL-Changes
deleted file mode 100644
index 88a60c1e204..00000000000
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/TL-Changes
+++ /dev/null
@@ -1,26 +0,0 @@
-Changes applied to the harfbuzz-0.9.7/ tree as obtained from:
- http://cgit.freedesktop.org/harfbuzz/
-
-Removed:
- COPYING
- INSTALL
- compile
- config.guess
- config.sub
- depcomp
- install-sh
- ltmain.sh
- missing
- Makefile.in
- aclocal.m4
- configure
- src/Makefile.in
-
-Removed unused dirs:
- m4
- test
- util
- src/hb-icu-le
- src/hb-old
- src/hb-ucdn
-
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-01-Khaled b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-01-Khaled
deleted file mode 100644
index c595141ede6..00000000000
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-01-Khaled
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ur harfbuzz-0.9.7.orig/src/hb-ot-layout-common-private.hh harfbuzz-0.9.7/src/hb-ot-layout-common-private.hh
---- harfbuzz-0.9.7.orig/src/hb-ot-layout-common-private.hh 2012-11-17 03:44:32.000000000 +0100
-+++ harfbuzz-0.9.7/src/hb-ot-layout-common-private.hh 2012-11-30 14:23:03.000000000 +0100
-@@ -248,6 +248,33 @@
-
- typedef RecordListOf<Script> ScriptList;
-
-+struct FeatureParamsSize
-+{
-+ inline bool sanitize (hb_sanitize_context_t *c) {
-+ TRACE_SANITIZE ();
-+ return TRACE_RETURN (c->check_struct (this));
-+ }
-+
-+ USHORT params[5];
-+ public:
-+ DEFINE_SIZE_STATIC (10);
-+};
-+
-+struct FeatureParams
-+{
-+ /* Note: currently the only feature with params is 'size', so we hardcode
-+ * the length of the table to that of the FeatureParamsSize. */
-+
-+ inline bool sanitize (hb_sanitize_context_t *c) {
-+ TRACE_SANITIZE ();
-+ return TRACE_RETURN (c->check_struct (this));
-+ }
-+
-+ union {
-+ FeatureParamsSize size;
-+ } u;
-+ DEFINE_SIZE_STATIC (10);
-+};
-
- struct Feature
- {
-@@ -260,12 +287,17 @@
- unsigned int *lookup_tags /* OUT */) const
- { return lookupIndex.get_indexes (start_index, lookup_count, lookup_tags); }
-
-+ inline const FeatureParams &get_feature_params (void) const
-+ { return this+featureParams; }
-+
- inline bool sanitize (hb_sanitize_context_t *c) {
- TRACE_SANITIZE ();
-- return TRACE_RETURN (c->check_struct (this) && lookupIndex.sanitize (c));
-+ return TRACE_RETURN (c->check_struct (this) && lookupIndex.sanitize (c) &&
-+ featureParams.sanitize (c, this));
- }
-
-- Offset featureParams; /* Offset to Feature Parameters table (if one
-+ OffsetTo<FeatureParams>
-+ featureParams; /* Offset to Feature Parameters table (if one
- * has been defined for the feature), relative
- * to the beginning of the Feature Table; = Null
- * if not required */
-diff -ur harfbuzz-0.9.7.orig/src/hb-ot-layout.cc harfbuzz-0.9.7/src/hb-ot-layout.cc
---- harfbuzz-0.9.7.orig/src/hb-ot-layout.cc 2012-11-17 04:06:56.000000000 +0100
-+++ harfbuzz-0.9.7/src/hb-ot-layout.cc 2012-11-30 14:23:03.000000000 +0100
-@@ -539,3 +539,30 @@
- {
- OT::GPOS::position_finish (font, buffer, zero_width_attached_marks);
- }
-+
-+hb_bool_t
-+hb_ot_layout_position_get_size (hb_face_t *face,
-+ uint16_t *data /* OUT, 5 items */)
-+{
-+ const OT::GPOS &gpos = _get_gpos (face);
-+
-+ unsigned int num_features = gpos.get_feature_count ();
-+ for (unsigned int i = 0; i < num_features; i++) {
-+
-+ if (HB_TAG ('s','i','z','e') == gpos.get_feature_tag (i))
-+ {
-+ const OT::Feature &f = gpos.get_feature (i);
-+ const OT::FeatureParams &params = f.get_feature_params ();
-+
-+ for (unsigned int i = 0; i < 5; i++)
-+ data[i] = params.u.size.params[i];
-+
-+ return true;
-+ }
-+ }
-+
-+ for (unsigned int i = 0; i < 5; i++)
-+ data[i] = 0;
-+
-+ return false;
-+}
-diff -ur harfbuzz-0.9.7.orig/src/hb-ot-layout.h harfbuzz-0.9.7/src/hb-ot-layout.h
---- harfbuzz-0.9.7.orig/src/hb-ot-layout.h 2012-11-17 03:50:38.000000000 +0100
-+++ harfbuzz-0.9.7/src/hb-ot-layout.h 2012-11-30 14:23:03.000000000 +0100
-@@ -279,6 +279,11 @@
- hb_glyph_position_t *positions /* IN / OUT */);
- #endif
-
-+/* Optical 'size' feature info. Returns true if found. */
-+hb_bool_t
-+hb_ot_layout_position_get_size (hb_face_t *face,
-+ uint16_t *data /* OUT, 5 items */);
-+
-
- HB_END_DECLS
-
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc b/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc
deleted file mode 100644
index 5a125d74da4..00000000000
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.7-PATCHES/patch-02-oldmsvc
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -u src-orig/hb-blob.h src/hb-blob.h
---- src-orig/hb-blob.h Fri Nov 30 19:42:46 2012
-+++ src/hb-blob.h Sun Dec 02 11:39:40 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_BLOB_H
-diff -u src-orig/hb-buffer.h src/hb-buffer.h
---- src-orig/hb-buffer.h Fri Nov 30 19:42:46 2012
-+++ src/hb-buffer.h Sun Dec 02 11:40:00 2012
-@@ -28,7 +28,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_BUFFER_H
-diff -u src-orig/hb-common.h src/hb-common.h
---- src-orig/hb-common.h Fri Nov 30 19:42:46 2012
-+++ src/hb-common.h Sun Dec 02 11:40:26 2012
-@@ -27,7 +27,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_COMMON_H
-diff -u src-orig/hb-font.h src/hb-font.h
---- src-orig/hb-font.h Fri Nov 30 19:42:46 2012
-+++ src/hb-font.h Sun Dec 02 11:40:42 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_FONT_H
-diff -u src-orig/hb-ot-layout.h src/hb-ot-layout.h
---- src-orig/hb-ot-layout.h Fri Nov 30 22:29:00 2012
-+++ src/hb-ot-layout.h Sun Dec 02 11:40:58 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_OT_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb-ot.h> instead."
-+#endif
- #endif
-
- #ifndef HB_OT_LAYOUT_H
-diff -u src-orig/hb-ot-tag.h src/hb-ot-tag.h
---- src-orig/hb-ot-tag.h Fri Nov 30 19:42:46 2012
-+++ src/hb-ot-tag.h Sun Dec 02 11:41:15 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_OT_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb-ot.h> instead."
-+#endif
- #endif
-
- #ifndef HB_OT_TAG_H
-diff -u src-orig/hb-set.h src/hb-set.h
---- src-orig/hb-set.h Fri Nov 30 19:42:46 2012
-+++ src/hb-set.h Sun Dec 02 11:41:31 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_SET_H
-diff -u src-orig/hb-shape-plan.h src/hb-shape-plan.h
---- src-orig/hb-shape-plan.h Fri Nov 30 19:42:46 2012
-+++ src/hb-shape-plan.h Sun Dec 02 11:41:49 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_SHAPE_PLAN_H
-diff -u src-orig/hb-shape.h src/hb-shape.h
---- src-orig/hb-shape.h Fri Nov 30 19:42:46 2012
-+++ src/hb-shape.h Sun Dec 02 11:42:04 2012
-@@ -27,7 +27,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_SHAPE_H
-diff -u src-orig/hb-unicode.h src/hb-unicode.h
---- src-orig/hb-unicode.h Fri Nov 30 19:42:46 2012
-+++ src/hb-unicode.h Sun Dec 02 11:42:16 2012
-@@ -29,7 +29,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_UNICODE_H
-diff -u src-orig/hb-version.h.in src/hb-version.h.in
---- src-orig/hb-version.h.in Fri Nov 30 19:42:46 2012
-+++ src/hb-version.h.in Sun Dec 02 11:42:40 2012
-@@ -25,7 +25,9 @@
- */
-
- #ifndef HB_H_IN
-+#ifndef _MSC_VER
- #error "Include <hb.h> instead."
-+#endif
- #endif
-
- #ifndef HB_VERSION_H