summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-10-01 06:50:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-10-01 06:50:49 +0000
commitfeeecf70afe0bd0657417ace3a1c92844b1ad64c (patch)
treef2f86418991cf527731230fe43fa69fe187698b1 /Build/source/libs
parenta987f670bb1d8224baec77cfa018bb279da9e95a (diff)
harfbuzz 1.0.4
git-svn-id: svn://tug.org/texlive/trunk@38510 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog5
-rw-r--r--Build/source/libs/harfbuzz/Makefile.in4
-rwxr-xr-xBuild/source/libs/harfbuzz/configure32
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/ChangeLog (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/ChangeLog)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/TL-Changes (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/AUTHORS (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/AUTHORS)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/Android.mk (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/Android.mk)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/ChangeLog (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/ChangeLog)135
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/Makefile.am)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/NEWS (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/NEWS)7
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/README (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/README)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/README.python (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/README.python)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/THANKS (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/THANKS)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/TODO (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/TODO)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/autogen.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/autogen.sh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/config.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/config.h.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/configure.ac (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/configure.ac)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/gtk-doc.make (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/gtk-doc.make)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/harfbuzz.doap (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/harfbuzz.doap)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/Makefile.am)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-c-linkage-decls.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-c-linkage-decls.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-defs.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-defs.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-header-guards.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-header-guards.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-includes.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-includes.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-libstdc++.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-libstdc++.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-static-inits.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-static-inits.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-symbols.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-symbols.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-arabic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-arabic-table.py)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-indic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-indic-table.py)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-use-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-use-table.py)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-gobject.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-gobject.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-icu.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-icu.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-atomic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-atomic-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.cc)24
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-serialize.cc)10
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.cc)58
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.h)9
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-cache-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-cache-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.cc)34
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.h)3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.cc)3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-deprecated.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-deprecated.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.cc)22
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-fallback-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-fallback-shape.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.cc)76
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.h)18
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.cc)6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.cc.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.cc.tmpl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.h.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.h.tmpl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.cc)6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-mutex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-mutex-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-object-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-object-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-file-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-file-private.hh)20
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-type-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-type-private.hh)62
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-cmap-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-cmap-table.hh)56
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-glyf-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-glyf-table.hh)4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-head-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-head-table.hh)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hhea-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hhea-table.hh)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hmtx-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hmtx-table.hh)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-common-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-common-private.hh)108
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gdef-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gdef-table.hh)44
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gpos-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gpos-table.hh)252
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsub-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsub-table.hh)304
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsubgpos-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsubgpos-private.hh)205
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-jstf-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-jstf-table.hh)35
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.cc)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-maxp-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-maxp-table.hh)5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-name-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-name-table.hh)14
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-fallback.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-fallback.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-win1256.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-win1256.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-default.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-default.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hangul.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hangul.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hebrew.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hebrew.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-table.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-table.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-thai.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-thai.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-tibetan.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-tibetan.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-table.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-table.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.cc)17
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-private.hh)6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.h)3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.cc)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-impl-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-impl-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-list.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-list.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ucdn.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ucdn.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.cc)18
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.h)10
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-utf-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-utf-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-version.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-version.h.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-warning.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-warning.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb.h (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/main.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/main.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-buffer-serialize.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-size-params.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-size-params.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-would-substitute.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-would-substitute.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test.cc)0
-rw-r--r--Build/source/libs/harfbuzz/version.ac2
158 files changed, 923 insertions, 710 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 17ca8bc1720..54b148897c6 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -24,7 +24,7 @@ gmp 6.0.0 - checked 25mar14
graphite2 1.3.3 - checked 27sep15
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 1.0.3 - checked 2sep15
+harfbuzz 1.0.4 - checked 1oct15
http://www.freedesktop.org/software/harfbuzz/release/
icu 56.1 (rc) - checked 27sep15
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 136ac91e7a9..9c29774aa4b 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import harfbuzz-1.0.4.
+ * version.ac: Adjusted.
+
2015-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
Import harfbuzz-1.0.3.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 67d0ce6c754..2e93cb79cbb 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -461,7 +461,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
$(top_srcdir)/../../build-aux/test-driver \
- $(top_srcdir)/harfbuzz-1.0.3/src/hb-version.h.in \
+ $(top_srcdir)/harfbuzz-1.0.4/src/hb-version.h.in \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -789,7 +789,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-1.0.3/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-1.0.4/src/hb-version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index 034a96ecd8c..647972ab2eb 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.0.3.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.0.4.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='harfbuzz (TeX Live)'
PACKAGE_TARNAME='harfbuzz--tex-live-'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='harfbuzz (TeX Live) 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='harfbuzz (TeX Live) 1.0.4'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="harfbuzz-1.0.3/src/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-1.0.4/src/harfbuzz.pc.in"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures harfbuzz (TeX Live) 1.0.3 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.0.3:";;
+ short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.0.4:";;
esac
cat <<\_ACEOF
@@ -1490,7 +1490,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-harfbuzz (TeX Live) configure 1.0.3
+harfbuzz (TeX Live) configure 1.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2080,7 +2080,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by harfbuzz (TeX Live) $as_me 1.0.3, which was
+It was created by harfbuzz (TeX Live) $as_me 1.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4003,7 +4003,7 @@ fi
# Define the identity of the package.
PACKAGE='harfbuzz--tex-live-'
- VERSION='1.0.3'
+ VERSION='1.0.4'
cat >>confdefs.h <<_ACEOF
@@ -4206,8 +4206,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
HB_VERSION_MAJOR=1
HB_VERSION_MINOR=0
-HB_VERSION_MICRO=3
-HB_VERSION=1.0.3
+HB_VERSION_MICRO=4
+HB_VERSION=1.0.4
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6310,14 +6310,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h
fi
-HARFBUZZ_TREE=harfbuzz-1.0.3
+HARFBUZZ_TREE=harfbuzz-1.0.4
if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then
as_fn_error $? "Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h" "$LINENO" 5
fi
-ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-1.0.3/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-1.0.4/src/hb-version.h.in"
cat >confcache <<\_ACEOF
@@ -6866,7 +6866,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by harfbuzz (TeX Live) $as_me 1.0.3, which was
+This file was extended by harfbuzz (TeX Live) $as_me 1.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6932,7 +6932,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-harfbuzz (TeX Live) config.status 1.0.3
+harfbuzz (TeX Live) config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7065,7 +7065,7 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-1.0.3/src/hb-version.h.in" ;;
+ "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-1.0.4/src/hb-version.h.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/ChangeLog
index 62fff4f77ce..62fff4f77ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/ChangeLog
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/TL-Changes
index 29e430c87e1..032e76e4bfe 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the harfbuzz-1.0.3/ tree as obtained from:
+Changes applied to the harfbuzz-1.0.4/ tree as obtained from:
http://www.freedesktop.org/software/harfbuzz/release/
Removed:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/AUTHORS
index 81cdc4cf37f..81cdc4cf37f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/Android.mk
index 2c266221d85..2c266221d85 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/Android.mk
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/ChangeLog
index dc4b594effc..9d157598a2f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/ChangeLog
@@ -1,3 +1,138 @@
+commit 432ffc47a46d41bea17d839d0d3980e654c6e638
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Sep 30 22:51:16 2015 +0100
+
+ 1.0.4
+
+ NEWS | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+commit b47159011ca518c3b94d782ed16a91ffe9dd2ab2
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Sep 29 14:57:02 2015 +0100
+
+ Define return_trace()
+
+ Not functional change (expected!).
+
+ src/hb-open-file-private.hh | 20 +--
+ src/hb-open-type-private.hh | 62 +++----
+ src/hb-ot-cmap-table.hh | 56 +++----
+ src/hb-ot-glyf-table.hh | 4 +-
+ src/hb-ot-head-table.hh | 2 +-
+ src/hb-ot-hhea-table.hh | 2 +-
+ src/hb-ot-hmtx-table.hh | 2 +-
+ src/hb-ot-layout-common-private.hh | 108 ++++++-------
+ src/hb-ot-layout-gdef-table.hh | 44 ++---
+ src/hb-ot-layout-gpos-table.hh | 252 +++++++++++++++--------------
+ src/hb-ot-layout-gsub-table.hh | 304
+ ++++++++++++++++++-----------------
+ src/hb-ot-layout-gsubgpos-private.hh | 205 +++++++++++------------
+ src/hb-ot-layout-jstf-table.hh | 35 ++--
+ src/hb-ot-maxp-table.hh | 5 +-
+ src/hb-ot-name-table.hh | 14 +-
+ src/hb-private.hh | 6 +-
+ 16 files changed, 575 insertions(+), 546 deletions(-)
+
+commit c917965b9e6fe2b21ed6c51559673288fa3af4b7
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Sep 29 14:45:35 2015 +0100
+
+ Add missing returns
+
+ Fixes possible invalid read of two bytes.
+
+ Reported by Behzad Najjarpour Jabbari, Secunia Research.
+
+ src/hb-ot-layout-gpos-table.hh | 14 +++++++-------
+ src/hb-ot-layout-gsub-table.hh | 12 ++++++------
+ src/hb-ot-layout-gsubgpos-private.hh | 8 ++++----
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+commit f3159ba5141c2ab0e430e64742972df140f91c43
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Sep 29 14:34:56 2015 +0100
+
+ Micro-optimize hb_language_from_string()
+
+ As measured / improved by Benson Limketkai.
+
+ src/hb-common.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit f2ad935e19338a29113492150f0c5a5fd5befd75
+Author: Sascha Brawer <sascha@brawer.ch>
+Date: Sun Jun 28 03:29:47 2015 +0200
+
+ Handle language tags that indicate phonetic IPA transcription
+
+ The BCP-47 registry defines a variant subtag "fonipa" that can be used
+ in combination with arbitrary other language tags. For example,
+ "rm-CH-fonipa-sursilv" indicates the Sursilvan dialect of Romansh
+ as used in Switzerland, transcribed used the International Phonetic
+ Alphabet.
+
+ http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+
+ src/hb-ot-tag.cc | 15 ++++++++++++++-
+ test/api/test-ot-tag.c | 7 +++++++
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+commit b8811429b6810c4f13be087b593a862c17d9d987
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Thu Sep 3 15:53:22 2015 +0430
+
+ Fix Since tags
+
+ Fixes https://github.com/behdad/harfbuzz/issues/103
+
+ src/hb-blob.cc | 24 +++++++++----------
+ src/hb-buffer-serialize.cc | 10 ++++----
+ src/hb-buffer.cc | 58
+ +++++++++++++++++++++++-----------------------
+ src/hb-buffer.h | 9 +++++++
+ src/hb-common.cc | 24 +++++++++----------
+ src/hb-common.h | 3 +++
+ src/hb-coretext.cc | 3 +++
+ src/hb-font.h | 18 +++++++-------
+ src/hb-ft.cc | 6 ++---
+ src/hb-graphite2.cc | 6 +++++
+ src/hb-ot-layout.cc | 2 +-
+ src/hb-ot-tag.cc | 2 +-
+ src/hb-set.h | 3 +++
+ src/hb-shape.cc | 2 +-
+ src/hb-unicode.cc | 18 +++++++-------
+ src/hb-unicode.h | 10 ++++----
+ 16 files changed, 111 insertions(+), 87 deletions(-)
+
+commit 5d74ff02ab01df67808b416af8bb9cefb06f841e
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Thu Sep 3 14:55:59 2015 +0430
+
+ Fix Since: version tags on font and face APIs
+
+ A while back we marked every API as version:1.0. We should fix
+ them all
+ to reflect real version they were introduced. This is a start.
+
+ Patch from Nikolay Sivov.
+
+ src/hb-face.cc | 22 ++++++++---------
+ src/hb-font.cc | 76
+ +++++++++++++++++++++++++++++-----------------------------
+ 2 files changed, 49 insertions(+), 49 deletions(-)
+
+commit 7f5405397406a24c5a001b5ef43dcf4d6926415e
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Sep 1 17:03:50 2015 +0100
+
+ 1.0.3
+
+ NEWS | 11 +++++++++++
+ configure.ac | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
commit 5828c45d7a816ccd0a7f10a665ea3cf8cfd63b05
Author: Behdad Esfahbod <behdad@behdad.org>
Date: Tue Sep 1 16:26:35 2015 +0100
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/Makefile.am
index 47aeb97768e..47aeb97768e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/NEWS b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/NEWS
index 1656488f979..24db6661e95 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/NEWS
@@ -1,3 +1,10 @@
+Overview of changes leading to 1.0.4
+Wednesday, September 30, 2015
+====================================
+
+- Fix minor out-of-bounds read error.
+
+
Overview of changes leading to 1.0.3
Tuesday, September 1, 2015
====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/README b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/README
index dea10688f3f..dea10688f3f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/README.python b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/README.python
index cd312649dbc..cd312649dbc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/README.python
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/README.python
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/THANKS b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/TODO b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/TODO
index e1aa39c4c01..e1aa39c4c01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/autogen.sh
index ff1b0c0c99b..ff1b0c0c99b 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/autogen.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/config.h.in
index 8937bd644d6..8937bd644d6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/config.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/configure.ac
index 45bb689ec6e..15decdc9ff0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([HarfBuzz],
- [1.0.3],
+ [1.0.4],
[http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
[harfbuzz],
[http://harfbuzz.org/])
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/gtk-doc.make
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/gtk-doc.make
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/Makefile.am
index 5699782529c..5699782529c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-c-linkage-decls.sh
index b10310f5384..b10310f5384 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-defs.sh
index 65a24670e48..65a24670e48 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-defs.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-defs.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-header-guards.sh
index 9a3302c7f87..9a3302c7f87 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-includes.sh
index 902f2357e2a..902f2357e2a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-libstdc++.sh
index b541828bcd9..b541828bcd9 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-static-inits.sh
index 1446fa73405..1446fa73405 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-static-inits.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-symbols.sh
index b2bf43fcea5..b2bf43fcea5 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/check-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-arabic-table.py
index 308435f991e..308435f991e 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-indic-table.py
index f5716bda789..f5716bda789 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-use-table.py b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-use-table.py
index be04e4ba4c5..be04e4ba4c5 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/gen-use-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/gen-use-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-gobject.pc.in
index 70083601901..70083601901 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-gobject.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-gobject.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-icu.pc.in
index 949869a3563..949869a3563 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz-icu.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz-icu.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz.pc.in
index b3e124aa8c3..b3e124aa8c3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/harfbuzz.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-atomic-private.hh
index 8179571ad2d..8179571ad2d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-atomic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.cc
index 8759a252a57..a6870dc06e4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.cc
@@ -91,7 +91,7 @@ _hb_blob_destroy_user_data (hb_blob_t *blob)
* Return value: New blob, or the empty blob if something failed or if @length is
* zero. Destroy with hb_blob_destroy().
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_blob_t *
hb_blob_create (const char *data,
@@ -147,7 +147,7 @@ hb_blob_create (const char *data,
* @length is zero or @offset is beyond the end of @parent's data. Destroy
* with hb_blob_destroy().
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_blob_t *
hb_blob_create_sub_blob (hb_blob_t *parent,
@@ -179,7 +179,7 @@ hb_blob_create_sub_blob (hb_blob_t *parent,
*
* Return value: (transfer full): the empty blob.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_blob_t *
hb_blob_get_empty (void)
@@ -210,7 +210,7 @@ hb_blob_get_empty (void)
*
* Return value: @blob.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_blob_t *
hb_blob_reference (hb_blob_t *blob)
@@ -228,7 +228,7 @@ hb_blob_reference (hb_blob_t *blob)
*
* See TODO:link object types for more information.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_blob_destroy (hb_blob_t *blob)
@@ -250,7 +250,7 @@ hb_blob_destroy (hb_blob_t *blob)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_blob_set_user_data (hb_blob_t *blob,
@@ -271,7 +271,7 @@ hb_blob_set_user_data (hb_blob_t *blob,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_blob_get_user_data (hb_blob_t *blob,
@@ -287,7 +287,7 @@ hb_blob_get_user_data (hb_blob_t *blob,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_blob_make_immutable (hb_blob_t *blob)
@@ -306,7 +306,7 @@ hb_blob_make_immutable (hb_blob_t *blob)
*
* Return value: TODO
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_blob_is_immutable (hb_blob_t *blob)
@@ -323,7 +323,7 @@ hb_blob_is_immutable (hb_blob_t *blob)
*
* Return value: the length of blob data in bytes.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
unsigned int
hb_blob_get_length (hb_blob_t *blob)
@@ -340,7 +340,7 @@ hb_blob_get_length (hb_blob_t *blob)
*
* Returns: (transfer none) (array length=length):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char *
hb_blob_get_data (hb_blob_t *blob, unsigned int *length)
@@ -365,7 +365,7 @@ hb_blob_get_data (hb_blob_t *blob, unsigned int *length)
* Returns: (transfer none) (array length=length): Writable blob data,
* or %NULL if failed.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
char *
hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.h
index b2419abfd2a..b2419abfd2a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-blob.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.hh
index 3f626bda40d..3f626bda40d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.rl
index 91b350f5ac0..91b350f5ac0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-json.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-json.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.hh
index d2d8daae7ed..d2d8daae7ed 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.rl
index 8a682f7378a..8a682f7378a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-deserialize-text.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-deserialize-text.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-private.hh
index 7fed7386b0e..7fed7386b0e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-serialize.cc
index 81f75aec338..7839cbc3f06 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer-serialize.cc
@@ -40,7 +40,7 @@ static const char *serialize_formats[] = {
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char **
hb_buffer_serialize_list_formats (void)
@@ -57,7 +57,7 @@ hb_buffer_serialize_list_formats (void)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_buffer_serialize_format_t
hb_buffer_serialize_format_from_string (const char *str, int len)
@@ -74,7 +74,7 @@ hb_buffer_serialize_format_from_string (const char *str, int len)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char *
hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format)
@@ -259,7 +259,7 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
unsigned int
hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
@@ -366,7 +366,7 @@ parse_int (const char *pp, const char *end, int32_t *pv)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.cc
index 420da8203ed..50710dd23e5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.cc
@@ -704,7 +704,7 @@ void hb_buffer_t::deallocate_var_all (void)
*
* Return value: (transfer full)
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_buffer_t *
hb_buffer_create (void)
@@ -726,7 +726,7 @@ hb_buffer_create (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_buffer_t *
hb_buffer_get_empty (void)
@@ -759,7 +759,7 @@ hb_buffer_get_empty (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_buffer_t *
hb_buffer_reference (hb_buffer_t *buffer)
@@ -773,7 +773,7 @@ hb_buffer_reference (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_destroy (hb_buffer_t *buffer)
@@ -800,7 +800,7 @@ hb_buffer_destroy (hb_buffer_t *buffer)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_buffer_set_user_data (hb_buffer_t *buffer,
@@ -821,7 +821,7 @@ hb_buffer_set_user_data (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_buffer_get_user_data (hb_buffer_t *buffer,
@@ -871,7 +871,7 @@ hb_buffer_get_content_type (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_set_unicode_funcs (hb_buffer_t *buffer,
@@ -897,7 +897,7 @@ hb_buffer_set_unicode_funcs (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_unicode_funcs_t *
hb_buffer_get_unicode_funcs (hb_buffer_t *buffer)
@@ -912,7 +912,7 @@ hb_buffer_get_unicode_funcs (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_set_direction (hb_buffer_t *buffer,
@@ -933,7 +933,7 @@ hb_buffer_set_direction (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_direction_t
hb_buffer_get_direction (hb_buffer_t *buffer)
@@ -948,7 +948,7 @@ hb_buffer_get_direction (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_set_script (hb_buffer_t *buffer,
@@ -968,7 +968,7 @@ hb_buffer_set_script (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_script_t
hb_buffer_get_script (hb_buffer_t *buffer)
@@ -983,7 +983,7 @@ hb_buffer_get_script (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_set_language (hb_buffer_t *buffer,
@@ -1003,7 +1003,7 @@ hb_buffer_set_language (hb_buffer_t *buffer,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_language_t
hb_buffer_get_language (hb_buffer_t *buffer)
@@ -1160,7 +1160,7 @@ hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_reset (hb_buffer_t *buffer)
@@ -1191,7 +1191,7 @@ hb_buffer_clear_contents (hb_buffer_t *buffer)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size)
@@ -1207,7 +1207,7 @@ hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_buffer_allocation_successful (hb_buffer_t *buffer)
@@ -1223,7 +1223,7 @@ hb_buffer_allocation_successful (hb_buffer_t *buffer)
*
*
*
- * Since: 1.0
+ * Since: 0.9.7
**/
void
hb_buffer_add (hb_buffer_t *buffer,
@@ -1243,7 +1243,7 @@ hb_buffer_add (hb_buffer_t *buffer,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_buffer_set_length (hb_buffer_t *buffer,
@@ -1282,7 +1282,7 @@ hb_buffer_set_length (hb_buffer_t *buffer,
*
* Return value: buffer length.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
unsigned int
hb_buffer_get_length (hb_buffer_t *buffer)
@@ -1300,7 +1300,7 @@ hb_buffer_get_length (hb_buffer_t *buffer)
*
* Return value: (transfer none) (array length=length): buffer glyph information array.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_glyph_info_t *
hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
@@ -1322,7 +1322,7 @@ hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
*
* Return value: (transfer none) (array length=length): buffer glyph position array.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_glyph_position_t *
hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
@@ -1343,7 +1343,7 @@ hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
*
* Reverses buffer contents.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_reverse (hb_buffer_t *buffer)
@@ -1357,9 +1357,9 @@ hb_buffer_reverse (hb_buffer_t *buffer)
* @start: start index.
* @end: end index.
*
- * Reverses buffer contents between start to end.
+ * Reverses buffer contents between start to end.
*
- * Since: 1.0
+ * Since: 0.9.41
**/
void
hb_buffer_reverse_range (hb_buffer_t *buffer,
@@ -1376,7 +1376,7 @@ hb_buffer_reverse_range (hb_buffer_t *buffer,
* reversed, then each cluster (consecutive items having the
* same cluster number) are reversed again.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_reverse_clusters (hb_buffer_t *buffer)
@@ -1493,7 +1493,7 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_add_utf8 (hb_buffer_t *buffer,
@@ -1515,7 +1515,7 @@ hb_buffer_add_utf8 (hb_buffer_t *buffer,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_add_utf16 (hb_buffer_t *buffer,
@@ -1537,7 +1537,7 @@ hb_buffer_add_utf16 (hb_buffer_t *buffer,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_buffer_add_utf32 (hb_buffer_t *buffer,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.h
index 1cfe13c0f5b..bb89dc3de74 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-buffer.h
@@ -171,6 +171,9 @@ void
hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
+/*
+ * Since: 0.9.20
+ */
typedef enum { /*< flags >*/
HB_BUFFER_FLAG_DEFAULT = 0x00000000u,
HB_BUFFER_FLAG_BOT = 0x00000001u, /* Beginning-of-text */
@@ -185,6 +188,9 @@ hb_buffer_set_flags (hb_buffer_t *buffer,
hb_buffer_flags_t
hb_buffer_get_flags (hb_buffer_t *buffer);
+/*
+ * Since: 0.9.42
+ */
typedef enum {
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES = 0,
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS = 1,
@@ -319,6 +325,9 @@ hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
* Serialize
*/
+/*
+ * Since: 0.9.20
+ */
typedef enum { /*< flags >*/
HB_BUFFER_SERIALIZE_FLAG_DEFAULT = 0x00000000u,
HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS = 0x00000001u,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.cc
index d510c9be4f6..e67059d10be 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.cc
@@ -64,7 +64,7 @@ _hb_options_init (void)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_tag_t
hb_tag_from_string (const char *str, int len)
@@ -122,7 +122,7 @@ const char direction_strings[][4] = {
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_direction_t
hb_direction_from_string (const char *str, int len)
@@ -149,7 +149,7 @@ hb_direction_from_string (const char *str, int len)
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char *
hb_direction_to_string (hb_direction_t direction)
@@ -288,26 +288,26 @@ retry:
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_language_t
hb_language_from_string (const char *str, int len)
{
- char strbuf[64];
-
if (!str || !len || !*str)
return HB_LANGUAGE_INVALID;
+ hb_language_item_t *item = NULL;
if (len >= 0)
{
/* NUL-terminate it. */
+ char strbuf[64];
len = MIN (len, (int) sizeof (strbuf) - 1);
memcpy (strbuf, str, len);
strbuf[len] = '\0';
- str = strbuf;
+ item = lang_find_or_insert (strbuf);
}
-
- hb_language_item_t *item = lang_find_or_insert (str);
+ else
+ item = lang_find_or_insert (str);
return likely (item) ? item->lang : HB_LANGUAGE_INVALID;
}
@@ -320,7 +320,7 @@ hb_language_from_string (const char *str, int len)
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char *
hb_language_to_string (hb_language_t language)
@@ -336,7 +336,7 @@ hb_language_to_string (hb_language_t language)
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_language_t
hb_language_get_default (void)
@@ -363,7 +363,7 @@ hb_language_get_default (void)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_script_t
hb_script_from_iso15924_tag (hb_tag_t tag)
@@ -408,7 +408,7 @@ hb_script_from_iso15924_tag (hb_tag_t tag)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_script_t
hb_script_from_string (const char *s, int len)
@@ -424,7 +424,7 @@ hb_script_from_string (const char *s, int len)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_tag_t
hb_script_to_iso15924_tag (hb_script_t script)
@@ -440,7 +440,7 @@ hb_script_to_iso15924_tag (hb_script_t script)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_direction_t
hb_script_get_horizontal_direction (hb_script_t script)
@@ -545,7 +545,7 @@ hb_user_data_array_t::get (hb_user_data_key_t *key)
*
* Returns library version as three integer components.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_version (unsigned int *major,
@@ -564,7 +564,7 @@ hb_version (unsigned int *major,
*
* Return value: library version string.
*
- * Since: 1.0
+ * Since: 0.9.2
**/
const char *
hb_version_string (void)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.h
index d160be5ca75..c291dbbe947 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-common.h
@@ -272,6 +272,9 @@ typedef enum
/*6.1*/ HB_SCRIPT_SORA_SOMPENG = HB_TAG ('S','o','r','a'),
/*6.1*/ HB_SCRIPT_TAKRI = HB_TAG ('T','a','k','r'),
+ /*
+ * Since: 0.9.30
+ */
/*7.0*/ HB_SCRIPT_BASSA_VAH = HB_TAG ('B','a','s','s'),
/*7.0*/ HB_SCRIPT_CAUCASIAN_ALBANIAN = HB_TAG ('A','g','h','b'),
/*7.0*/ HB_SCRIPT_DUPLOYAN = HB_TAG ('D','u','p','l'),
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.cc
index a9664ee6829..13ba5d94ef1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.cc
@@ -125,6 +125,9 @@ _hb_coretext_shaper_face_data_destroy (hb_coretext_shaper_face_data_t *data)
CFRelease (data);
}
+/*
+ * Since: 0.9.10
+ */
CGFontRef
hb_coretext_face_get_cg_font (hb_face_t *face)
{
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.h
index 25267bc9784..25267bc9784 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-coretext.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-deprecated.h
index 30ae4b1caf7..30ae4b1caf7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-deprecated.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-deprecated.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face-private.hh
index c4266fff4f0..c4266fff4f0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.cc
index 96ea1da46b0..7aa89fcadb5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.cc
@@ -77,7 +77,7 @@ const hb_face_t _hb_face_nil = {
*
* Return value: (transfer full)
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_face_create_for_tables (hb_reference_table_func_t reference_table_func,
@@ -157,7 +157,7 @@ _hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_face_create (hb_blob_t *blob,
@@ -189,7 +189,7 @@ hb_face_create (hb_blob_t *blob,
*
* Return value: (transfer full)
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_face_get_empty (void)
@@ -206,7 +206,7 @@ hb_face_get_empty (void)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_face_reference (hb_face_t *face)
@@ -220,7 +220,7 @@ hb_face_reference (hb_face_t *face)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_face_destroy (hb_face_t *face)
@@ -257,7 +257,7 @@ hb_face_destroy (hb_face_t *face)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_face_set_user_data (hb_face_t *face,
@@ -278,7 +278,7 @@ hb_face_set_user_data (hb_face_t *face,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_face_get_user_data (hb_face_t *face,
@@ -293,7 +293,7 @@ hb_face_get_user_data (hb_face_t *face,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_face_make_immutable (hb_face_t *face)
@@ -312,7 +312,7 @@ hb_face_make_immutable (hb_face_t *face)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_face_is_immutable (hb_face_t *face)
@@ -330,7 +330,7 @@ hb_face_is_immutable (hb_face_t *face)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_blob_t *
hb_face_reference_table (hb_face_t *face,
@@ -417,7 +417,7 @@ hb_face_set_upem (hb_face_t *face,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
unsigned int
hb_face_get_upem (hb_face_t *face)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.h
index f682c468de5..f682c468de5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-face.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-face.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-fallback-shape.cc
index 9d061a9e845..9d061a9e845 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font-private.hh
index 33bbf7143a2..33bbf7143a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.cc
index 0cfba837a27..94045e36daf 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.cc
@@ -236,7 +236,7 @@ static const hb_font_funcs_t _hb_font_funcs_nil = {
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_funcs_t *
hb_font_funcs_create (void)
@@ -258,7 +258,7 @@ hb_font_funcs_create (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_funcs_t *
hb_font_funcs_get_empty (void)
@@ -274,7 +274,7 @@ hb_font_funcs_get_empty (void)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_funcs_t *
hb_font_funcs_reference (hb_font_funcs_t *ffuncs)
@@ -288,7 +288,7 @@ hb_font_funcs_reference (hb_font_funcs_t *ffuncs)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_destroy (hb_font_funcs_t *ffuncs)
@@ -315,7 +315,7 @@ hb_font_funcs_destroy (hb_font_funcs_t *ffuncs)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
@@ -336,7 +336,7 @@ hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs,
@@ -352,7 +352,7 @@ hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs)
@@ -371,7 +371,7 @@ hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs)
@@ -425,7 +425,7 @@ HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph (hb_font_t *font,
@@ -444,7 +444,7 @@ hb_font_get_glyph (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_position_t
hb_font_get_glyph_h_advance (hb_font_t *font,
@@ -462,7 +462,7 @@ hb_font_get_glyph_h_advance (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_position_t
hb_font_get_glyph_v_advance (hb_font_t *font,
@@ -482,7 +482,7 @@ hb_font_get_glyph_v_advance (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_h_origin (hb_font_t *font,
@@ -503,7 +503,7 @@ hb_font_get_glyph_h_origin (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_v_origin (hb_font_t *font,
@@ -523,7 +523,7 @@ hb_font_get_glyph_v_origin (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_position_t
hb_font_get_glyph_h_kerning (hb_font_t *font,
@@ -542,7 +542,7 @@ hb_font_get_glyph_h_kerning (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_position_t
hb_font_get_glyph_v_kerning (hb_font_t *font,
@@ -561,7 +561,7 @@ hb_font_get_glyph_v_kerning (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_extents (hb_font_t *font,
@@ -583,7 +583,7 @@ hb_font_get_glyph_extents (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_contour_point (hb_font_t *font,
@@ -648,7 +648,7 @@ hb_font_get_glyph_from_name (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_get_glyph_advance_for_direction (hb_font_t *font,
@@ -669,7 +669,7 @@ hb_font_get_glyph_advance_for_direction (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_get_glyph_origin_for_direction (hb_font_t *font,
@@ -690,7 +690,7 @@ hb_font_get_glyph_origin_for_direction (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_add_glyph_origin_for_direction (hb_font_t *font,
@@ -711,7 +711,7 @@ hb_font_add_glyph_origin_for_direction (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_subtract_glyph_origin_for_direction (hb_font_t *font,
@@ -733,7 +733,7 @@ hb_font_subtract_glyph_origin_for_direction (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_get_glyph_kerning_for_direction (hb_font_t *font,
@@ -755,7 +755,7 @@ hb_font_get_glyph_kerning_for_direction (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_extents_for_origin (hb_font_t *font,
@@ -779,7 +779,7 @@ hb_font_get_glyph_extents_for_origin (hb_font_t *font,
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_get_glyph_contour_point_for_origin (hb_font_t *font,
@@ -845,7 +845,7 @@ hb_font_glyph_from_string (hb_font_t *font,
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_font_create (hb_face_t *face)
@@ -872,7 +872,7 @@ hb_font_create (hb_face_t *face)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_font_create_sub_font (hb_font_t *parent)
@@ -903,7 +903,7 @@ hb_font_create_sub_font (hb_font_t *parent)
*
* Return value: (transfer full)
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_font_get_empty (void)
@@ -944,7 +944,7 @@ hb_font_get_empty (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_font_reference (hb_font_t *font)
@@ -958,7 +958,7 @@ hb_font_reference (hb_font_t *font)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_destroy (hb_font_t *font)
@@ -991,7 +991,7 @@ hb_font_destroy (hb_font_t *font)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_set_user_data (hb_font_t *font,
@@ -1012,7 +1012,7 @@ hb_font_set_user_data (hb_font_t *font,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_font_get_user_data (hb_font_t *font,
@@ -1027,7 +1027,7 @@ hb_font_get_user_data (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_make_immutable (hb_font_t *font)
@@ -1046,7 +1046,7 @@ hb_font_make_immutable (hb_font_t *font)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_font_is_immutable (hb_font_t *font)
@@ -1062,7 +1062,7 @@ hb_font_is_immutable (hb_font_t *font)
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_font_get_parent (hb_font_t *font)
@@ -1161,7 +1161,7 @@ hb_font_set_funcs_data (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_set_scale (hb_font_t *font,
@@ -1183,7 +1183,7 @@ hb_font_set_scale (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_get_scale (hb_font_t *font,
@@ -1202,7 +1202,7 @@ hb_font_get_scale (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_set_ppem (hb_font_t *font,
@@ -1224,7 +1224,7 @@ hb_font_set_ppem (hb_font_t *font,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_get_ppem (hb_font_t *font,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.h
index 5d28b8f434b..ffb2010e7b8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-font.h
@@ -149,7 +149,7 @@ typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
@@ -165,7 +165,7 @@ hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs,
@@ -181,7 +181,7 @@ hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs,
@@ -197,7 +197,7 @@ hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
@@ -213,7 +213,7 @@ hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
@@ -229,7 +229,7 @@ hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs,
@@ -245,7 +245,7 @@ hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs,
@@ -261,7 +261,7 @@ hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
@@ -277,7 +277,7 @@ hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.cc
index 468742cfd05..edafff4e92b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.cc
@@ -347,7 +347,7 @@ reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
*
*
* Return value: (transfer full):
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_ft_face_create (FT_Face ft_face,
@@ -403,7 +403,7 @@ hb_ft_face_finalize (FT_Face ft_face)
*
*
* Return value: (transfer full):
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_face_t *
hb_ft_face_create_cached (FT_Face ft_face)
@@ -434,7 +434,7 @@ _do_nothing (void)
*
*
* Return value: (transfer full):
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_font_t *
hb_ft_font_create (FT_Face ft_face,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.h
index 92f4b361441..92f4b361441 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.cc
index 7dbd83d2962..7dbd83d2962 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.h
index 1a8f42ea529..1a8f42ea529 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.cc.tmpl
index ca458a3846c..ca458a3846c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.h.tmpl
index 6ecda06c2a6..6ecda06c2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-enums.h.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-enums.h.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.cc
index 6bd63368b65..6bd63368b65 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.h
index 0a0387dce31..0a0387dce31 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject-structs.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject-structs.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject.h
index ea1bd25df82..ea1bd25df82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.cc
index 626b84f4e98..cd694c14065 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.cc
@@ -138,6 +138,9 @@ _hb_graphite2_shaper_face_data_destroy (hb_graphite2_shaper_face_data_t *data)
free (data);
}
+/*
+ * Since: 0.9.10
+ */
gr_face *
hb_graphite2_face_get_gr_face (hb_face_t *face)
{
@@ -172,6 +175,9 @@ _hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data)
gr_font_destroy (data);
}
+/*
+ * Since: 0.9.10
+ */
gr_font *
hb_graphite2_font_get_gr_font (hb_font_t *font)
{
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.h
index 3eae54acbd8..3eae54acbd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.cc
index 24cec9d7266..24cec9d7266 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-mutex-private.hh
index ed2703571c1..ed2703571c1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-object-private.hh
index 6b73ff92d09..6b73ff92d09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-file-private.hh
index 178bc7ccb85..152230a0e5f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-file-private.hh
@@ -56,7 +56,7 @@ typedef struct TableRecord
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
Tag tag; /* 4-byte identifier. */
@@ -106,7 +106,7 @@ typedef struct OffsetTable
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables));
+ return_trace (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables));
}
protected:
@@ -135,7 +135,7 @@ struct TTCHeaderVersion1
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (table.sanitize (c, this));
+ return_trace (table.sanitize (c, this));
}
protected:
@@ -175,11 +175,11 @@ struct TTCHeader
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!u.header.version.sanitize (c))) return TRACE_RETURN (false);
+ if (unlikely (!u.header.version.sanitize (c))) return_trace (false);
switch (u.header.version.major) {
case 2: /* version 2 is compatible with version 1 */
- case 1: return TRACE_RETURN (u.version1.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.version1.sanitize (c));
+ default:return_trace (true);
}
}
@@ -240,14 +240,14 @@ struct OpenTypeFontFile
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!u.tag.sanitize (c))) return TRACE_RETURN (false);
+ if (unlikely (!u.tag.sanitize (c))) return_trace (false);
switch (u.tag) {
case CFFTag: /* All the non-collection tags */
case TrueTag:
case Typ1Tag:
- case TrueTypeTag: return TRACE_RETURN (u.fontFace.sanitize (c));
- case TTCTag: return TRACE_RETURN (u.ttcHeader.sanitize (c));
- default: return TRACE_RETURN (true);
+ case TrueTypeTag: return_trace (u.fontFace.sanitize (c));
+ case TTCTag: return_trace (u.ttcHeader.sanitize (c));
+ default: return_trace (true);
}
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-type-private.hh
index 294889a8398..79e70b8ccfc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-open-type-private.hh
@@ -624,7 +624,7 @@ struct IntType
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (likely (c->check_struct (this)));
+ return_trace (likely (c->check_struct (this)));
}
protected:
BEInt<Type, Size> v;
@@ -652,7 +652,7 @@ struct LONGDATETIME
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (likely (c->check_struct (this)));
+ return_trace (likely (c->check_struct (this)));
}
protected:
LONG major;
@@ -729,7 +729,7 @@ struct FixedVersion
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
USHORT major;
@@ -765,21 +765,21 @@ struct OffsetTo : Offset<OffsetType>
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false);
+ if (unlikely (!c->check_struct (this))) return_trace (false);
unsigned int offset = *this;
- if (unlikely (!offset)) return TRACE_RETURN (true);
+ if (unlikely (!offset)) return_trace (true);
const Type &obj = StructAtOffset<Type> (base, offset);
- return TRACE_RETURN (likely (obj.sanitize (c)) || neuter (c));
+ return_trace (likely (obj.sanitize (c)) || neuter (c));
}
template <typename T>
inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const
{
TRACE_SANITIZE (this);
- if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false);
+ if (unlikely (!c->check_struct (this))) return_trace (false);
unsigned int offset = *this;
- if (unlikely (!offset)) return TRACE_RETURN (true);
+ if (unlikely (!offset)) return_trace (true);
const Type &obj = StructAtOffset<Type> (base, offset);
- return TRACE_RETURN (likely (obj.sanitize (c, user_data)) || neuter (c));
+ return_trace (likely (obj.sanitize (c, user_data)) || neuter (c));
}
/* Set the offset to Null */
@@ -830,10 +830,10 @@ struct ArrayOf
unsigned int items_len)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
len.set (items_len); /* TODO(serialize) Overflow? */
- if (unlikely (!c->extend (*this))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!c->extend (*this))) return_trace (false);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -841,17 +841,17 @@ struct ArrayOf
unsigned int items_len)
{
TRACE_SERIALIZE (this);
- if (unlikely (!serialize (c, items_len))) return TRACE_RETURN (false);
+ if (unlikely (!serialize (c, items_len))) return_trace (false);
for (unsigned int i = 0; i < items_len; i++)
array[i] = items[i];
items.advance (items_len);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false);
+ if (unlikely (!sanitize_shallow (c))) return_trace (false);
/* Note: for structs that do not reference other structs,
* we do not need to call their sanitize() as we already did
@@ -862,28 +862,28 @@ struct ArrayOf
*/
(void) (false && array[0].sanitize (c));
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false);
+ if (unlikely (!sanitize_shallow (c))) return_trace (false);
unsigned int count = len;
for (unsigned int i = 0; i < count; i++)
if (unlikely (!array[i].sanitize (c, base)))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ return_trace (false);
+ return_trace (true);
}
template <typename T>
inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const
{
TRACE_SANITIZE (this);
- if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false);
+ if (unlikely (!sanitize_shallow (c))) return_trace (false);
unsigned int count = len;
for (unsigned int i = 0; i < count; i++)
if (unlikely (!array[i].sanitize (c, base, user_data)))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ return_trace (false);
+ return_trace (true);
}
template <typename SearchType>
@@ -900,7 +900,7 @@ struct ArrayOf
inline bool sanitize_shallow (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && c->check_array (this, Type::static_size, len));
+ return_trace (c->check_struct (this) && c->check_array (this, Type::static_size, len));
}
public:
@@ -927,13 +927,13 @@ struct OffsetListOf : OffsetArrayOf<Type>
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (OffsetArrayOf<Type>::sanitize (c, this));
+ return_trace (OffsetArrayOf<Type>::sanitize (c, this));
}
template <typename T>
inline bool sanitize (hb_sanitize_context_t *c, T user_data) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (OffsetArrayOf<Type>::sanitize (c, this, user_data));
+ return_trace (OffsetArrayOf<Type>::sanitize (c, this, user_data));
}
};
@@ -955,14 +955,14 @@ struct HeadlessArrayOf
unsigned int items_len)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
len.set (items_len); /* TODO(serialize) Overflow? */
- if (unlikely (!items_len)) return TRACE_RETURN (true);
- if (unlikely (!c->extend (*this))) return TRACE_RETURN (false);
+ if (unlikely (!items_len)) return_trace (true);
+ if (unlikely (!c->extend (*this))) return_trace (false);
for (unsigned int i = 0; i < items_len - 1; i++)
array[i] = items[i];
items.advance (items_len - 1);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize_shallow (hb_sanitize_context_t *c) const
@@ -974,7 +974,7 @@ struct HeadlessArrayOf
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false);
+ if (unlikely (!sanitize_shallow (c))) return_trace (false);
/* Note: for structs that do not reference other structs,
* we do not need to call their sanitize() as we already did
@@ -985,7 +985,7 @@ struct HeadlessArrayOf
*/
(void) (false && array[0].sanitize (c));
- return TRACE_RETURN (true);
+ return_trace (true);
}
LenType len;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-cmap-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-cmap-table.hh
index 04823125538..c9161f0ef4c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-cmap-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-cmap-table.hh
@@ -54,7 +54,7 @@ struct CmapSubtableFormat0
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
protected:
@@ -130,7 +130,7 @@ struct CmapSubtableFormat4
{
TRACE_SANITIZE (this);
if (unlikely (!c->check_struct (this)))
- return TRACE_RETURN (false);
+ return_trace (false);
if (unlikely (!c->check_range (this, length)))
{
@@ -141,10 +141,10 @@ struct CmapSubtableFormat4
(uintptr_t) (c->end -
(char *) this));
if (!c->try_set (&length, new_length))
- return TRACE_RETURN (false);
+ return_trace (false);
}
- return TRACE_RETURN (16 + 4 * (unsigned int) segCountX2 <= length);
+ return_trace (16 + 4 * (unsigned int) segCountX2 <= length);
}
protected:
@@ -187,7 +187,7 @@ struct CmapSubtableLongGroup
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
private:
@@ -215,7 +215,7 @@ struct CmapSubtableTrimmed
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && glyphIdArray.sanitize (c));
+ return_trace (c->check_struct (this) && glyphIdArray.sanitize (c));
}
protected:
@@ -248,7 +248,7 @@ struct CmapSubtableLongSegmented
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && groups.sanitize (c));
+ return_trace (c->check_struct (this) && groups.sanitize (c));
}
protected:
@@ -295,7 +295,7 @@ struct UnicodeValueRange
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
UINT24 startUnicodeValue; /* First value in this range. */
@@ -317,7 +317,7 @@ struct UVSMapping
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
UINT24 unicodeValue; /* Base Unicode value of the UVS */
@@ -357,9 +357,9 @@ struct VariationSelectorRecord
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- defaultUVS.sanitize (c, base) &&
- nonDefaultUVS.sanitize (c, base));
+ return_trace (c->check_struct (this) &&
+ defaultUVS.sanitize (c, base) &&
+ nonDefaultUVS.sanitize (c, base));
}
UINT24 varSelector; /* Variation selector. */
@@ -383,8 +383,8 @@ struct CmapSubtableFormat14
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- record.sanitize (c, this));
+ return_trace (c->check_struct (this) &&
+ record.sanitize (c, this));
}
protected:
@@ -429,16 +429,16 @@ struct CmapSubtable
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 0: return TRACE_RETURN (u.format0 .sanitize (c));
- case 4: return TRACE_RETURN (u.format4 .sanitize (c));
- case 6: return TRACE_RETURN (u.format6 .sanitize (c));
- case 10: return TRACE_RETURN (u.format10.sanitize (c));
- case 12: return TRACE_RETURN (u.format12.sanitize (c));
- case 13: return TRACE_RETURN (u.format13.sanitize (c));
- case 14: return TRACE_RETURN (u.format14.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 0: return_trace (u.format0 .sanitize (c));
+ case 4: return_trace (u.format4 .sanitize (c));
+ case 6: return_trace (u.format6 .sanitize (c));
+ case 10: return_trace (u.format10.sanitize (c));
+ case 12: return_trace (u.format12.sanitize (c));
+ case 13: return_trace (u.format13.sanitize (c));
+ case 14: return_trace (u.format14.sanitize (c));
+ default:return_trace (true);
}
}
@@ -473,8 +473,8 @@ struct EncodingRecord
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- subtable.sanitize (c, base));
+ return_trace (c->check_struct (this) &&
+ subtable.sanitize (c, base));
}
USHORT platformID; /* Platform ID. */
@@ -509,9 +509,9 @@ struct cmap
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- likely (version == 0) &&
- encodingRecord.sanitize (c, this));
+ return_trace (c->check_struct (this) &&
+ likely (version == 0) &&
+ encodingRecord.sanitize (c, this));
}
USHORT version; /* Table version number (0). */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.cc
index 9cde8389833..9cde8389833 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.h
index b9947a16bc8..b9947a16bc8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-glyf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-glyf-table.hh
index 40b54fdee4c..9e5af6d10df 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-glyf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-glyf-table.hh
@@ -47,7 +47,7 @@ struct loca
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (true);
+ return_trace (true);
}
public:
@@ -75,7 +75,7 @@ struct glyf
TRACE_SANITIZE (this);
/* We don't check for anything specific here. The users of the
* struct do all the hard work... */
- return TRACE_RETURN (true);
+ return_trace (true);
}
public:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-head-table.hh
index 157961cf960..fc351cfb48e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-head-table.hh
@@ -55,7 +55,7 @@ struct head
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
+ return_trace (c->check_struct (this) && likely (version.major == 1));
}
protected:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hhea-table.hh
index 992fe552021..24114534a71 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hhea-table.hh
@@ -52,7 +52,7 @@ struct _hea
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
+ return_trace (c->check_struct (this) && likely (version.major == 1));
}
public:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hmtx-table.hh
index a0e3855a849..49056e67691 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-hmtx-table.hh
@@ -62,7 +62,7 @@ struct _mtx
TRACE_SANITIZE (this);
/* We don't check for anything specific here. The users of the
* struct do all the hard work... */
- return TRACE_RETURN (true);
+ return_trace (true);
}
public:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-common-private.hh
index 3db7f57ab42..6f818cb1351 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-common-private.hh
@@ -75,7 +75,7 @@ struct Record
{
TRACE_SANITIZE (this);
const sanitize_closure_t closure = {tag, base};
- return TRACE_RETURN (c->check_struct (this) && offset.sanitize (c, base, &closure));
+ return_trace (c->check_struct (this) && offset.sanitize (c, base, &closure));
}
Tag tag; /* 4-byte Tag identifier */
@@ -131,7 +131,7 @@ struct RecordListOf : RecordArrayOf<Type>
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (RecordArrayOf<Type>::sanitize (c, this));
+ return_trace (RecordArrayOf<Type>::sanitize (c, this));
}
};
@@ -145,7 +145,7 @@ struct RangeRecord
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
inline bool intersects (const hb_set_t *glyphs) const {
@@ -211,7 +211,7 @@ struct LangSys
const Record<LangSys>::sanitize_closure_t * = NULL) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && featureIndex.sanitize (c));
+ return_trace (c->check_struct (this) && featureIndex.sanitize (c));
}
Offset<> lookupOrderZ; /* = Null (reserved for an offset to a
@@ -251,7 +251,7 @@ struct Script
const Record<Script>::sanitize_closure_t * = NULL) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (defaultLangSys.sanitize (c, this) && langSys.sanitize (c, this));
+ return_trace (defaultLangSys.sanitize (c, this) && langSys.sanitize (c, this));
}
protected:
@@ -274,7 +274,7 @@ struct FeatureParamsSize
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false);
+ if (unlikely (!c->check_struct (this))) return_trace (false);
/* This subtable has some "history", if you will. Some earlier versions of
* Adobe tools calculated the offset of the FeatureParams sutable from the
@@ -326,19 +326,19 @@ struct FeatureParamsSize
*/
if (!designSize)
- return TRACE_RETURN (false);
+ return_trace (false);
else if (subfamilyID == 0 &&
subfamilyNameID == 0 &&
rangeStart == 0 &&
rangeEnd == 0)
- return TRACE_RETURN (true);
+ return_trace (true);
else if (designSize < rangeStart ||
designSize > rangeEnd ||
subfamilyNameID < 256 ||
subfamilyNameID > 32767)
- return TRACE_RETURN (false);
+ return_trace (false);
else
- return TRACE_RETURN (true);
+ return_trace (true);
}
USHORT designSize; /* Represents the design size in 720/inch
@@ -388,7 +388,7 @@ struct FeatureParamsStylisticSet
TRACE_SANITIZE (this);
/* Right now minorVersion is at zero. Which means, any table supports
* the uiNameID field. */
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
USHORT version; /* (set to 0): This corresponds to a “minor”
@@ -420,8 +420,8 @@ struct FeatureParamsCharacterVariants
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- characters.sanitize (c));
+ return_trace (c->check_struct (this) &&
+ characters.sanitize (c));
}
USHORT format; /* Format number is set to 0. */
@@ -462,12 +462,12 @@ struct FeatureParams
{
TRACE_SANITIZE (this);
if (tag == HB_TAG ('s','i','z','e'))
- return TRACE_RETURN (u.size.sanitize (c));
+ return_trace (u.size.sanitize (c));
if ((tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */
- return TRACE_RETURN (u.stylisticSet.sanitize (c));
+ return_trace (u.stylisticSet.sanitize (c));
if ((tag & 0xFFFF0000u) == HB_TAG ('c','v','\0','\0')) /* cvXX */
- return TRACE_RETURN (u.characterVariants.sanitize (c));
- return TRACE_RETURN (true);
+ return_trace (u.characterVariants.sanitize (c));
+ return_trace (true);
}
inline const FeatureParamsSize& get_size_params (hb_tag_t tag) const
@@ -505,7 +505,7 @@ struct Feature
{
TRACE_SANITIZE (this);
if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
- return TRACE_RETURN (false);
+ return_trace (false);
/* Some earlier versions of Adobe tools calculated the offset of the
* FeatureParams subtable from the beginning of the FeatureList table!
@@ -520,10 +520,10 @@ struct Feature
OffsetTo<FeatureParams> orig_offset = featureParams;
if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)))
- return TRACE_RETURN (false);
+ return_trace (false);
if (likely (orig_offset.is_null ()))
- return TRACE_RETURN (true);
+ return_trace (true);
if (featureParams == 0 && closure &&
closure->tag == HB_TAG ('s','i','z','e') &&
@@ -538,10 +538,10 @@ struct Feature
if (new_offset == new_offset_int &&
c->try_set (&featureParams, new_offset) &&
!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))
- return TRACE_RETURN (false);
+ return_trace (false);
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
OffsetTo<FeatureParams>
@@ -613,9 +613,9 @@ struct Lookup
for (unsigned int i = 0; i < count; i++) {
typename context_t::return_t r = get_subtable<SubTableType> (i).dispatch (c, lookup_type);
if (c->stop_sublookup_iteration (r))
- return TRACE_RETURN (r);
+ return_trace (r);
}
- return TRACE_RETURN (c->default_return_value ());
+ return_trace (c->default_return_value ());
}
inline bool serialize (hb_serialize_context_t *c,
@@ -624,29 +624,29 @@ struct Lookup
unsigned int num_subtables)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
lookupType.set (lookup_type);
lookupFlag.set (lookup_props & 0xFFFFu);
- if (unlikely (!subTable.serialize (c, num_subtables))) return TRACE_RETURN (false);
+ if (unlikely (!subTable.serialize (c, num_subtables))) return_trace (false);
if (lookupFlag & LookupFlag::UseMarkFilteringSet)
{
USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
markFilteringSet.set (lookup_props >> 16);
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
/* Real sanitize of the subtables is done by GSUB/GPOS/... */
- if (!(c->check_struct (this) && subTable.sanitize (c))) return TRACE_RETURN (false);
+ if (!(c->check_struct (this) && subTable.sanitize (c))) return_trace (false);
if (lookupFlag & LookupFlag::UseMarkFilteringSet)
{
const USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
- if (!markFilteringSet.sanitize (c)) return TRACE_RETURN (false);
+ if (!markFilteringSet.sanitize (c)) return_trace (false);
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
private:
@@ -685,19 +685,19 @@ struct CoverageFormat1
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
glyphArray.len.set (num_glyphs);
- if (unlikely (!c->extend (glyphArray))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend (glyphArray))) return_trace (false);
for (unsigned int i = 0; i < num_glyphs; i++)
glyphArray[i] = glyphs[i];
glyphs.advance (num_glyphs);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (glyphArray.sanitize (c));
+ return_trace (glyphArray.sanitize (c));
}
inline bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const {
@@ -754,16 +754,16 @@ struct CoverageFormat2
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
- if (unlikely (!num_glyphs)) return TRACE_RETURN (true);
+ if (unlikely (!num_glyphs)) return_trace (true);
unsigned int num_ranges = 1;
for (unsigned int i = 1; i < num_glyphs; i++)
if (glyphs[i - 1] + 1 != glyphs[i])
num_ranges++;
rangeRecord.len.set (num_ranges);
- if (unlikely (!c->extend (rangeRecord))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend (rangeRecord))) return_trace (false);
unsigned int range = 0;
rangeRecord[range].start = glyphs[0];
@@ -778,13 +778,13 @@ struct CoverageFormat2
rangeRecord[range].end = glyphs[i];
}
glyphs.advance (num_glyphs);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (rangeRecord.sanitize (c));
+ return_trace (rangeRecord.sanitize (c));
}
inline bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const {
@@ -864,27 +864,27 @@ struct Coverage
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
unsigned int num_ranges = 1;
for (unsigned int i = 1; i < num_glyphs; i++)
if (glyphs[i - 1] + 1 != glyphs[i])
num_ranges++;
u.format.set (num_glyphs * 2 < num_ranges * 3 ? 1 : 2);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, num_glyphs));
- case 2: return TRACE_RETURN (u.format2.serialize (c, glyphs, num_glyphs));
- default:return TRACE_RETURN (false);
+ case 1: return_trace (u.format1.serialize (c, glyphs, num_glyphs));
+ case 2: return_trace (u.format2.serialize (c, glyphs, num_glyphs));
+ default:return_trace (false);
}
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.sanitize (c));
- case 2: return TRACE_RETURN (u.format2.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.format1.sanitize (c));
+ case 2: return_trace (u.format2.sanitize (c));
+ default:return_trace (true);
}
}
@@ -993,7 +993,7 @@ struct ClassDefFormat1
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && classValue.sanitize (c));
+ return_trace (c->check_struct (this) && classValue.sanitize (c));
}
template <typename set_t>
@@ -1050,7 +1050,7 @@ struct ClassDefFormat2
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (rangeRecord.sanitize (c));
+ return_trace (rangeRecord.sanitize (c));
}
template <typename set_t>
@@ -1108,11 +1108,11 @@ struct ClassDef
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.sanitize (c));
- case 2: return TRACE_RETURN (u.format2.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.format1.sanitize (c));
+ case 2: return_trace (u.format2.sanitize (c));
+ default:return_trace (true);
}
}
@@ -1201,7 +1201,7 @@ struct Device
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && c->check_range (this, this->get_size ()));
+ return_trace (c->check_struct (this) && c->check_range (this, this->get_size ()));
}
protected:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gdef-table.hh
index 7a6c04d1700..bc36436be78 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gdef-table.hh
@@ -74,7 +74,7 @@ struct AttachList
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && attachPoint.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && attachPoint.sanitize (c, this));
}
protected:
@@ -105,7 +105,7 @@ struct CaretValueFormat1
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
protected:
@@ -132,7 +132,7 @@ struct CaretValueFormat2
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
protected:
@@ -156,7 +156,7 @@ struct CaretValueFormat3
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && deviceTable.sanitize (c, this));
+ return_trace (c->check_struct (this) && deviceTable.sanitize (c, this));
}
protected:
@@ -185,12 +185,12 @@ struct CaretValue
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.sanitize (c));
- case 2: return TRACE_RETURN (u.format2.sanitize (c));
- case 3: return TRACE_RETURN (u.format3.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.format1.sanitize (c));
+ case 2: return_trace (u.format2.sanitize (c));
+ case 3: return_trace (u.format3.sanitize (c));
+ default:return_trace (true);
}
}
@@ -227,7 +227,7 @@ struct LigGlyph
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (carets.sanitize (c, this));
+ return_trace (carets.sanitize (c, this));
}
protected:
@@ -262,7 +262,7 @@ struct LigCaretList
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this));
}
protected:
@@ -285,7 +285,7 @@ struct MarkGlyphSetsFormat1
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this));
}
protected:
@@ -310,10 +310,10 @@ struct MarkGlyphSets
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.format1.sanitize (c));
+ default:return_trace (true);
}
}
@@ -376,13 +376,13 @@ struct GDEF
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (version.sanitize (c) &&
- likely (version.major == 1) &&
- glyphClassDef.sanitize (c, this) &&
- attachList.sanitize (c, this) &&
- ligCaretList.sanitize (c, this) &&
- markAttachClassDef.sanitize (c, this) &&
- (version.to_int () < 0x00010002u || markGlyphSetsDef[0].sanitize (c, this)));
+ return_trace (version.sanitize (c) &&
+ likely (version.major == 1) &&
+ glyphClassDef.sanitize (c, this) &&
+ attachList.sanitize (c, this) &&
+ ligCaretList.sanitize (c, this) &&
+ markAttachClassDef.sanitize (c, this) &&
+ (version.to_int () < 0x00010002u || markGlyphSetsDef[0].sanitize (c, this)));
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gpos-table.hh
index 996f8b59b99..286253d705a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gpos-table.hh
@@ -181,7 +181,7 @@ struct ValueFormat : USHORT
inline bool sanitize_value (hb_sanitize_context_t *c, const void *base, const Value *values) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_range (values, get_size ()) && (!has_device () || sanitize_value_devices (c, base, values)));
+ return_trace (c->check_range (values, get_size ()) && (!has_device () || sanitize_value_devices (c, base, values)));
}
inline bool sanitize_values (hb_sanitize_context_t *c, const void *base, const Value *values, unsigned int count) const
@@ -189,17 +189,17 @@ struct ValueFormat : USHORT
TRACE_SANITIZE (this);
unsigned int len = get_len ();
- if (!c->check_array (values, get_size (), count)) return TRACE_RETURN (false);
+ if (!c->check_array (values, get_size (), count)) return_trace (false);
- if (!has_device ()) return TRACE_RETURN (true);
+ if (!has_device ()) return_trace (true);
for (unsigned int i = 0; i < count; i++) {
if (!sanitize_value_devices (c, base, values))
- return TRACE_RETURN (false);
+ return_trace (false);
values += len;
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
/* Just sanitize referenced Device tables. Doesn't check the values themselves. */
@@ -207,15 +207,15 @@ struct ValueFormat : USHORT
{
TRACE_SANITIZE (this);
- if (!has_device ()) return TRACE_RETURN (true);
+ if (!has_device ()) return_trace (true);
for (unsigned int i = 0; i < count; i++) {
if (!sanitize_value_devices (c, base, values))
- return TRACE_RETURN (false);
+ return_trace (false);
values += stride;
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
};
@@ -232,7 +232,7 @@ struct AnchorFormat1
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
protected:
@@ -262,7 +262,7 @@ struct AnchorFormat2
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
protected:
@@ -291,7 +291,7 @@ struct AnchorFormat3
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && xDeviceTable.sanitize (c, this) && yDeviceTable.sanitize (c, this));
+ return_trace (c->check_struct (this) && xDeviceTable.sanitize (c, this) && yDeviceTable.sanitize (c, this));
}
protected:
@@ -327,12 +327,12 @@ struct Anchor
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!u.format.sanitize (c)) return TRACE_RETURN (false);
+ if (!u.format.sanitize (c)) return_trace (false);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.sanitize (c));
- case 2: return TRACE_RETURN (u.format2.sanitize (c));
- case 3: return TRACE_RETURN (u.format3.sanitize (c));
- default:return TRACE_RETURN (true);
+ case 1: return_trace (u.format1.sanitize (c));
+ case 2: return_trace (u.format2.sanitize (c));
+ case 3: return_trace (u.format3.sanitize (c));
+ default:return_trace (true);
}
}
@@ -360,13 +360,13 @@ struct AnchorMatrix
inline bool sanitize (hb_sanitize_context_t *c, unsigned int cols) const
{
TRACE_SANITIZE (this);
- if (!c->check_struct (this)) return TRACE_RETURN (false);
- if (unlikely (rows > 0 && cols >= ((unsigned int) -1) / rows)) return TRACE_RETURN (false);
+ if (!c->check_struct (this)) return_trace (false);
+ if (unlikely (rows > 0 && cols >= ((unsigned int) -1) / rows)) return_trace (false);
unsigned int count = rows * cols;
- if (!c->check_array (matrixZ, matrixZ[0].static_size, count)) return TRACE_RETURN (false);
+ if (!c->check_array (matrixZ, matrixZ[0].static_size, count)) return_trace (false);
for (unsigned int i = 0; i < count; i++)
- if (!matrixZ[i].sanitize (c, this)) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (!matrixZ[i].sanitize (c, this)) return_trace (false);
+ return_trace (true);
}
USHORT rows; /* Number of rows */
@@ -386,7 +386,7 @@ struct MarkRecord
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && markAnchor.sanitize (c, base));
+ return_trace (c->check_struct (this) && markAnchor.sanitize (c, base));
}
protected:
@@ -415,7 +415,7 @@ struct MarkArray : ArrayOf<MarkRecord> /* Array of MarkRecords--in Coverage orde
const Anchor& glyph_anchor = anchors.get_anchor (glyph_index, mark_class, class_count, &found);
/* If this subtable doesn't have an anchor for this base and this class,
* return false such that the subsequent subtables have a chance at it. */
- if (unlikely (!found)) return TRACE_RETURN (false);
+ if (unlikely (!found)) return_trace (false);
hb_position_t mark_x, mark_y, base_x, base_y;
@@ -428,13 +428,13 @@ struct MarkArray : ArrayOf<MarkRecord> /* Array of MarkRecords--in Coverage orde
o.attach_lookback() = buffer->idx - glyph_pos;
buffer->idx++;
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (ArrayOf<MarkRecord>::sanitize (c, this));
+ return_trace (ArrayOf<MarkRecord>::sanitize (c, this));
}
};
@@ -459,21 +459,21 @@ struct SinglePosFormat1
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
valueFormat.apply_value (c->font, c->direction, this,
values, buffer->cur_pos());
buffer->idx++;
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this)
- && coverage.sanitize (c, this)
- && valueFormat.sanitize_value (c, this, values));
+ return_trace (c->check_struct (this) &&
+ coverage.sanitize (c, this) &&
+ valueFormat.sanitize_value (c, this, values));
}
protected:
@@ -508,24 +508,24 @@ struct SinglePosFormat2
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
- if (likely (index >= valueCount)) return TRACE_RETURN (false);
+ if (likely (index >= valueCount)) return_trace (false);
valueFormat.apply_value (c->font, c->direction, this,
&values[index * valueFormat.get_len ()],
buffer->cur_pos());
buffer->idx++;
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this)
- && coverage.sanitize (c, this)
- && valueFormat.sanitize_values (c, this, values, valueCount));
+ return_trace (c->check_struct (this) &&
+ coverage.sanitize (c, this) &&
+ valueFormat.sanitize_values (c, this, values, valueCount));
}
protected:
@@ -548,11 +548,11 @@ struct SinglePos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- case 2: return TRACE_RETURN (c->dispatch (u.format2));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ case 2: return_trace (c->dispatch (u.format2));
+ default:return_trace (c->default_return_value ());
}
}
@@ -615,7 +615,7 @@ struct PairSet
/* Hand-coded bsearch. */
if (unlikely (!count))
- return TRACE_RETURN (false);
+ return_trace (false);
hb_codepoint_t x = buffer->info[pos].codepoint;
int min = 0, max = (int) count - 1;
while (min <= max)
@@ -636,11 +636,11 @@ struct PairSet
if (len2)
pos++;
buffer->idx = pos;
- return TRACE_RETURN (true);
+ return_trace (true);
}
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
struct sanitize_closure_t {
@@ -654,12 +654,12 @@ struct PairSet
{
TRACE_SANITIZE (this);
if (!(c->check_struct (this)
- && c->check_array (arrayZ, USHORT::static_size * closure->stride, len))) return TRACE_RETURN (false);
+ && c->check_array (arrayZ, USHORT::static_size * closure->stride, len))) return_trace (false);
unsigned int count = len;
const PairValueRecord *record = CastP<PairValueRecord> (arrayZ);
- return TRACE_RETURN (closure->valueFormats[0].sanitize_values_stride_unsafe (c, closure->base, &record->values[0], count, closure->stride)
- && closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride));
+ return_trace (closure->valueFormats[0].sanitize_values_stride_unsafe (c, closure->base, &record->values[0], count, closure->stride) &&
+ closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride));
}
protected:
@@ -691,13 +691,13 @@ struct PairPosFormat1
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
- if (!skippy_iter.next ()) return TRACE_RETURN (false);
+ if (!skippy_iter.next ()) return_trace (false);
- return TRACE_RETURN ((this+pairSet[index]).apply (c, &valueFormat1, skippy_iter.idx));
+ return_trace ((this+pairSet[index]).apply (c, &valueFormat1, skippy_iter.idx));
}
inline bool sanitize (hb_sanitize_context_t *c) const
@@ -713,7 +713,7 @@ struct PairPosFormat1
1 + len1 + len2
};
- return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure));
+ return_trace (c->check_struct (this) && coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure));
}
protected:
@@ -762,11 +762,11 @@ struct PairPosFormat2
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
- if (!skippy_iter.next ()) return TRACE_RETURN (false);
+ if (!skippy_iter.next ()) return_trace (false);
unsigned int len1 = valueFormat1.get_len ();
unsigned int len2 = valueFormat2.get_len ();
@@ -774,7 +774,7 @@ struct PairPosFormat2
unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint);
unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
- if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) return TRACE_RETURN (false);
+ if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) return_trace (false);
const Value *v = &values[record_len * (klass1 * class2Count + klass2)];
valueFormat1.apply_value (c->font, c->direction, this,
@@ -786,7 +786,7 @@ struct PairPosFormat2
if (len2)
buffer->idx++;
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
@@ -795,16 +795,16 @@ struct PairPosFormat2
if (!(c->check_struct (this)
&& coverage.sanitize (c, this)
&& classDef1.sanitize (c, this)
- && classDef2.sanitize (c, this))) return TRACE_RETURN (false);
+ && classDef2.sanitize (c, this))) return_trace (false);
unsigned int len1 = valueFormat1.get_len ();
unsigned int len2 = valueFormat2.get_len ();
unsigned int stride = len1 + len2;
unsigned int record_size = valueFormat1.get_size () + valueFormat2.get_size ();
unsigned int count = (unsigned int) class1Count * (unsigned int) class2Count;
- return TRACE_RETURN (c->check_array (values, record_size, count) &&
- valueFormat1.sanitize_values_stride_unsafe (c, this, &values[0], count, stride) &&
- valueFormat2.sanitize_values_stride_unsafe (c, this, &values[len1], count, stride));
+ return_trace (c->check_array (values, record_size, count) &&
+ valueFormat1.sanitize_values_stride_unsafe (c, this, &values[0], count, stride) &&
+ valueFormat2.sanitize_values_stride_unsafe (c, this, &values[len1], count, stride));
}
protected:
@@ -843,11 +843,11 @@ struct PairPos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- case 2: return TRACE_RETURN (c->dispatch (u.format2));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ case 2: return_trace (c->dispatch (u.format2));
+ default:return_trace (c->default_return_value ());
}
}
@@ -867,7 +867,7 @@ struct EntryExitRecord
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base));
+ return_trace (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base));
}
protected:
@@ -905,17 +905,17 @@ struct CursivePosFormat1
hb_buffer_t *buffer = c->buffer;
/* We don't handle mark glyphs here. */
- if (unlikely (_hb_glyph_info_is_mark (&buffer->cur()))) return TRACE_RETURN (false);
+ if (unlikely (_hb_glyph_info_is_mark (&buffer->cur()))) return_trace (false);
const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage (buffer->cur().codepoint)];
- if (!this_record.exitAnchor) return TRACE_RETURN (false);
+ if (!this_record.exitAnchor) return_trace (false);
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
- if (!skippy_iter.next ()) return TRACE_RETURN (false);
+ if (!skippy_iter.next ()) return_trace (false);
const EntryExitRecord &next_record = entryExitRecord[(this+coverage).get_coverage (buffer->info[skippy_iter.idx].codepoint)];
- if (!next_record.entryAnchor) return TRACE_RETURN (false);
+ if (!next_record.entryAnchor) return_trace (false);
unsigned int i = buffer->idx;
unsigned int j = skippy_iter.idx;
@@ -997,13 +997,13 @@ struct CursivePosFormat1
pos[child].x_offset = x_offset;
buffer->idx = j;
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && entryExitRecord.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && entryExitRecord.sanitize (c, this));
}
protected:
@@ -1024,10 +1024,10 @@ struct CursivePos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1063,33 +1063,36 @@ struct MarkBasePosFormat1
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int mark_index = (this+markCoverage).get_coverage (buffer->cur().codepoint);
- if (likely (mark_index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (mark_index == NOT_COVERED)) return_trace (false);
/* now we search backwards for a non-mark glyph */
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
do {
- if (!skippy_iter.prev ()) return TRACE_RETURN (false);
+ if (!skippy_iter.prev ()) return_trace (false);
/* We only want to attach to the first of a MultipleSubst sequence. Reject others. */
if (0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx])) break;
skippy_iter.reject ();
} while (1);
/* Checking that matched glyph is actually a base glyph by GDEF is too strong; disabled */
- if (!_hb_glyph_info_is_base_glyph (&buffer->info[skippy_iter.idx])) { /*return TRACE_RETURN (false);*/ }
+ if (!_hb_glyph_info_is_base_glyph (&buffer->info[skippy_iter.idx])) { /*return_trace (false);*/ }
unsigned int base_index = (this+baseCoverage).get_coverage (buffer->info[skippy_iter.idx].codepoint);
- if (base_index == NOT_COVERED) return TRACE_RETURN (false);
+ if (base_index == NOT_COVERED) return_trace (false);
- return TRACE_RETURN ((this+markArray).apply (c, mark_index, base_index, this+baseArray, classCount, skippy_iter.idx));
+ return_trace ((this+markArray).apply (c, mark_index, base_index, this+baseArray, classCount, skippy_iter.idx));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && markCoverage.sanitize (c, this) && baseCoverage.sanitize (c, this) &&
- markArray.sanitize (c, this) && baseArray.sanitize (c, this, (unsigned int) classCount));
+ return_trace (c->check_struct (this) &&
+ markCoverage.sanitize (c, this) &&
+ baseCoverage.sanitize (c, this) &&
+ markArray.sanitize (c, this) &&
+ baseArray.sanitize (c, this, (unsigned int) classCount));
}
protected:
@@ -1117,10 +1120,10 @@ struct MarkBasePos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1161,27 +1164,27 @@ struct MarkLigPosFormat1
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int mark_index = (this+markCoverage).get_coverage (buffer->cur().codepoint);
- if (likely (mark_index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (mark_index == NOT_COVERED)) return_trace (false);
/* now we search backwards for a non-mark glyph */
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
- if (!skippy_iter.prev ()) return TRACE_RETURN (false);
+ if (!skippy_iter.prev ()) return_trace (false);
/* Checking that matched glyph is actually a ligature by GDEF is too strong; disabled */
- if (!_hb_glyph_info_is_ligature (&buffer->info[skippy_iter.idx])) { /*return TRACE_RETURN (false);*/ }
+ if (!_hb_glyph_info_is_ligature (&buffer->info[skippy_iter.idx])) { /*return_trace (false);*/ }
unsigned int j = skippy_iter.idx;
unsigned int lig_index = (this+ligatureCoverage).get_coverage (buffer->info[j].codepoint);
- if (lig_index == NOT_COVERED) return TRACE_RETURN (false);
+ if (lig_index == NOT_COVERED) return_trace (false);
const LigatureArray& lig_array = this+ligatureArray;
const LigatureAttach& lig_attach = lig_array[lig_index];
/* Find component to attach to */
unsigned int comp_count = lig_attach.rows;
- if (unlikely (!comp_count)) return TRACE_RETURN (false);
+ if (unlikely (!comp_count)) return_trace (false);
/* We must now check whether the ligature ID of the current mark glyph
* is identical to the ligature ID of the found ligature. If yes, we
@@ -1196,14 +1199,17 @@ struct MarkLigPosFormat1
else
comp_index = comp_count - 1;
- return TRACE_RETURN ((this+markArray).apply (c, mark_index, comp_index, lig_attach, classCount, j));
+ return_trace ((this+markArray).apply (c, mark_index, comp_index, lig_attach, classCount, j));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && markCoverage.sanitize (c, this) && ligatureCoverage.sanitize (c, this) &&
- markArray.sanitize (c, this) && ligatureArray.sanitize (c, this, (unsigned int) classCount));
+ return_trace (c->check_struct (this) &&
+ markCoverage.sanitize (c, this) &&
+ ligatureCoverage.sanitize (c, this) &&
+ markArray.sanitize (c, this) &&
+ ligatureArray.sanitize (c, this, (unsigned int) classCount));
}
protected:
@@ -1232,10 +1238,10 @@ struct MarkLigPos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1271,15 +1277,15 @@ struct MarkMarkPosFormat1
TRACE_APPLY (this);
hb_buffer_t *buffer = c->buffer;
unsigned int mark1_index = (this+mark1Coverage).get_coverage (buffer->cur().codepoint);
- if (likely (mark1_index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (mark1_index == NOT_COVERED)) return_trace (false);
/* now we search backwards for a suitable mark glyph until a non-mark glyph */
hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (buffer->idx, 1);
skippy_iter.set_lookup_props (c->lookup_props & ~LookupFlag::IgnoreFlags);
- if (!skippy_iter.prev ()) return TRACE_RETURN (false);
+ if (!skippy_iter.prev ()) return_trace (false);
- if (!_hb_glyph_info_is_mark (&buffer->info[skippy_iter.idx])) { return TRACE_RETURN (false); }
+ if (!_hb_glyph_info_is_mark (&buffer->info[skippy_iter.idx])) { return_trace (false); }
unsigned int j = skippy_iter.idx;
@@ -1301,21 +1307,23 @@ struct MarkMarkPosFormat1
}
/* Didn't match. */
- return TRACE_RETURN (false);
+ return_trace (false);
good:
unsigned int mark2_index = (this+mark2Coverage).get_coverage (buffer->info[j].codepoint);
- if (mark2_index == NOT_COVERED) return TRACE_RETURN (false);
+ if (mark2_index == NOT_COVERED) return_trace (false);
- return TRACE_RETURN ((this+mark1Array).apply (c, mark1_index, mark2_index, this+mark2Array, classCount, j));
+ return_trace ((this+mark1Array).apply (c, mark1_index, mark2_index, this+mark2Array, classCount, j));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && mark1Coverage.sanitize (c, this) &&
- mark2Coverage.sanitize (c, this) && mark1Array.sanitize (c, this)
- && mark2Array.sanitize (c, this, (unsigned int) classCount));
+ return_trace (c->check_struct (this) &&
+ mark1Coverage.sanitize (c, this) &&
+ mark2Coverage.sanitize (c, this) &&
+ mark1Array.sanitize (c, this) &&
+ mark2Array.sanitize (c, this, (unsigned int) classCount));
}
protected:
@@ -1345,10 +1353,10 @@ struct MarkMarkPos
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1397,18 +1405,18 @@ struct PosLookupSubTable
{
TRACE_DISPATCH (this, lookup_type);
/* The sub_format passed to may_dispatch is unnecessary but harmless. */
- if (unlikely (!c->may_dispatch (this, &u.sub_format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.sub_format))) return_trace (c->default_return_value ());
switch (lookup_type) {
- case Single: return TRACE_RETURN (u.single.dispatch (c));
- case Pair: return TRACE_RETURN (u.pair.dispatch (c));
- case Cursive: return TRACE_RETURN (u.cursive.dispatch (c));
- case MarkBase: return TRACE_RETURN (u.markBase.dispatch (c));
- case MarkLig: return TRACE_RETURN (u.markLig.dispatch (c));
- case MarkMark: return TRACE_RETURN (u.markMark.dispatch (c));
- case Context: return TRACE_RETURN (u.context.dispatch (c));
- case ChainContext: return TRACE_RETURN (u.chainContext.dispatch (c));
- case Extension: return TRACE_RETURN (u.extension.dispatch (c));
- default: return TRACE_RETURN (c->default_return_value ());
+ case Single: return_trace (u.single.dispatch (c));
+ case Pair: return_trace (u.pair.dispatch (c));
+ case Cursive: return_trace (u.cursive.dispatch (c));
+ case MarkBase: return_trace (u.markBase.dispatch (c));
+ case MarkLig: return_trace (u.markLig.dispatch (c));
+ case MarkMark: return_trace (u.markMark.dispatch (c));
+ case Context: return_trace (u.context.dispatch (c));
+ case ChainContext: return_trace (u.chainContext.dispatch (c));
+ case Extension: return_trace (u.extension.dispatch (c));
+ default: return_trace (c->default_return_value ());
}
}
@@ -1443,13 +1451,13 @@ struct PosLookup : Lookup
inline bool apply (hb_apply_context_t *c) const
{
TRACE_APPLY (this);
- return TRACE_RETURN (dispatch (c));
+ return_trace (dispatch (c));
}
inline hb_collect_glyphs_context_t::return_t collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- return TRACE_RETURN (dispatch (c));
+ return_trace (dispatch (c));
}
template <typename set_t>
@@ -1471,8 +1479,8 @@ struct PosLookup : Lookup
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!Lookup::sanitize (c))) return TRACE_RETURN (false);
- return TRACE_RETURN (dispatch (c));
+ if (unlikely (!Lookup::sanitize (c))) return_trace (false);
+ return_trace (dispatch (c));
}
};
@@ -1495,9 +1503,9 @@ struct GPOS : GSUBGPOS
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!GSUBGPOS::sanitize (c))) return TRACE_RETURN (false);
+ if (unlikely (!GSUBGPOS::sanitize (c))) return_trace (false);
const OffsetTo<PosLookupList> &list = CastR<OffsetTo<PosLookupList> > (lookupList);
- return TRACE_RETURN (list.sanitize (c, this));
+ return_trace (list.sanitize (c, this));
}
public:
DEFINE_SIZE_STATIC (10);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsub-table.hh
index ff204847017..c578254d4d2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsub-table.hh
@@ -67,7 +67,7 @@ struct SingleSubstFormat1
inline bool would_apply (hb_would_apply_context_t *c) const
{
TRACE_WOULD_APPLY (this);
- return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
+ return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
}
inline bool apply (hb_apply_context_t *c) const
@@ -75,14 +75,14 @@ struct SingleSubstFormat1
TRACE_APPLY (this);
hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
unsigned int index = (this+coverage).get_coverage (glyph_id);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
/* According to the Adobe Annotated OpenType Suite, result is always
* limited to 16bit. */
glyph_id = (glyph_id + deltaGlyphID) & 0xFFFFu;
c->replace_glyph (glyph_id);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -91,16 +91,16 @@ struct SingleSubstFormat1
int delta)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
deltaGlyphID.set (delta); /* TODO(serilaize) overflow? */
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && deltaGlyphID.sanitize (c));
+ return_trace (coverage.sanitize (c, this) && deltaGlyphID.sanitize (c));
}
protected:
@@ -144,7 +144,7 @@ struct SingleSubstFormat2
inline bool would_apply (hb_would_apply_context_t *c) const
{
TRACE_WOULD_APPLY (this);
- return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
+ return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
}
inline bool apply (hb_apply_context_t *c) const
@@ -152,14 +152,14 @@ struct SingleSubstFormat2
TRACE_APPLY (this);
hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
unsigned int index = (this+coverage).get_coverage (glyph_id);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
- if (unlikely (index >= substitute.len)) return TRACE_RETURN (false);
+ if (unlikely (index >= substitute.len)) return_trace (false);
glyph_id = substitute[index];
c->replace_glyph (glyph_id);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -168,16 +168,16 @@ struct SingleSubstFormat2
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!substitute.serialize (c, substitutes, num_glyphs))) return TRACE_RETURN (false);
- if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!substitute.serialize (c, substitutes, num_glyphs))) return_trace (false);
+ if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && substitute.sanitize (c));
+ return_trace (coverage.sanitize (c, this) && substitute.sanitize (c));
}
protected:
@@ -200,7 +200,7 @@ struct SingleSubst
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (u.format))) return_trace (false);
unsigned int format = 2;
int delta = 0;
if (num_glyphs) {
@@ -215,9 +215,9 @@ struct SingleSubst
}
u.format.set (format);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, num_glyphs, delta));
- case 2: return TRACE_RETURN (u.format2.serialize (c, glyphs, substitutes, num_glyphs));
- default:return TRACE_RETURN (false);
+ case 1: return_trace (u.format1.serialize (c, glyphs, num_glyphs, delta));
+ case 2: return_trace (u.format2.serialize (c, glyphs, substitutes, num_glyphs));
+ default:return_trace (false);
}
}
@@ -225,11 +225,11 @@ struct SingleSubst
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- case 2: return TRACE_RETURN (c->dispatch (u.format2));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ case 2: return_trace (c->dispatch (u.format2));
+ default:return_trace (c->default_return_value ());
}
}
@@ -273,14 +273,14 @@ struct Sequence
* buffer->move_to() makes assumptions about this too. Perhaps fix
* in the future after figuring out what to do with the clusters.
*/
- if (unlikely (!count)) return TRACE_RETURN (false);
+ if (unlikely (!count)) return_trace (false);
/* Special-case to make it in-place and not consider this
* as a "multiplied" substitution. */
if (unlikely (count == 1))
{
c->replace_glyph (substitute.array[0]);
- return TRACE_RETURN (true);
+ return_trace (true);
}
unsigned int klass = _hb_glyph_info_is_ligature (&c->buffer->cur()) ?
@@ -292,7 +292,7 @@ struct Sequence
}
c->buffer->skip_glyph ();
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -300,15 +300,15 @@ struct Sequence
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!substitute.serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!substitute.serialize (c, glyphs, num_glyphs))) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (substitute.sanitize (c));
+ return_trace (substitute.sanitize (c));
}
protected:
@@ -347,7 +347,7 @@ struct MultipleSubstFormat1
inline bool would_apply (hb_would_apply_context_t *c) const
{
TRACE_WOULD_APPLY (this);
- return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
+ return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
}
inline bool apply (hb_apply_context_t *c) const
@@ -355,9 +355,9 @@ struct MultipleSubstFormat1
TRACE_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
- return TRACE_RETURN ((this+sequence[index]).apply (c));
+ return_trace ((this+sequence[index]).apply (c));
}
inline bool serialize (hb_serialize_context_t *c,
@@ -367,21 +367,21 @@ struct MultipleSubstFormat1
Supplier<GlyphID> &substitute_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!sequence.serialize (c, num_glyphs))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!sequence.serialize (c, num_glyphs))) return_trace (false);
for (unsigned int i = 0; i < num_glyphs; i++)
if (unlikely (!sequence[i].serialize (c, this).serialize (c,
substitute_glyphs_list,
- substitute_len_list[i]))) return TRACE_RETURN (false);
+ substitute_len_list[i]))) return_trace (false);
substitute_len_list.advance (num_glyphs);
- if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && sequence.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && sequence.sanitize (c, this));
}
protected:
@@ -405,12 +405,12 @@ struct MultipleSubst
Supplier<GlyphID> &substitute_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (u.format))) return_trace (false);
unsigned int format = 1;
u.format.set (format);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, substitute_len_list, num_glyphs, substitute_glyphs_list));
- default:return TRACE_RETURN (false);
+ case 1: return_trace (u.format1.serialize (c, glyphs, substitute_len_list, num_glyphs, substitute_glyphs_list));
+ default:return_trace (false);
}
}
@@ -418,10 +418,10 @@ struct MultipleSubst
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -473,7 +473,7 @@ struct AlternateSubstFormat1
inline bool would_apply (hb_would_apply_context_t *c) const
{
TRACE_WOULD_APPLY (this);
- return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
+ return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
}
inline bool apply (hb_apply_context_t *c) const
@@ -482,11 +482,11 @@ struct AlternateSubstFormat1
hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
unsigned int index = (this+coverage).get_coverage (glyph_id);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const AlternateSet &alt_set = this+alternateSet[index];
- if (unlikely (!alt_set.len)) return TRACE_RETURN (false);
+ if (unlikely (!alt_set.len)) return_trace (false);
hb_mask_t glyph_mask = c->buffer->cur().mask;
hb_mask_t lookup_mask = c->lookup_mask;
@@ -495,13 +495,13 @@ struct AlternateSubstFormat1
unsigned int shift = _hb_ctz (lookup_mask);
unsigned int alt_index = ((lookup_mask & glyph_mask) >> shift);
- if (unlikely (alt_index > alt_set.len || alt_index == 0)) return TRACE_RETURN (false);
+ if (unlikely (alt_index > alt_set.len || alt_index == 0)) return_trace (false);
glyph_id = alt_set[alt_index - 1];
c->replace_glyph (glyph_id);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -511,21 +511,21 @@ struct AlternateSubstFormat1
Supplier<GlyphID> &alternate_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!alternateSet.serialize (c, num_glyphs))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!alternateSet.serialize (c, num_glyphs))) return_trace (false);
for (unsigned int i = 0; i < num_glyphs; i++)
if (unlikely (!alternateSet[i].serialize (c, this).serialize (c,
alternate_glyphs_list,
- alternate_len_list[i]))) return TRACE_RETURN (false);
+ alternate_len_list[i]))) return_trace (false);
alternate_len_list.advance (num_glyphs);
- if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && alternateSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && alternateSet.sanitize (c, this));
}
protected:
@@ -549,12 +549,12 @@ struct AlternateSubst
Supplier<GlyphID> &alternate_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (u.format))) return_trace (false);
unsigned int format = 1;
u.format.set (format);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, alternate_len_list, num_glyphs, alternate_glyphs_list));
- default:return TRACE_RETURN (false);
+ case 1: return_trace (u.format1.serialize (c, glyphs, alternate_len_list, num_glyphs, alternate_glyphs_list));
+ default:return_trace (false);
}
}
@@ -562,10 +562,10 @@ struct AlternateSubst
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -602,13 +602,13 @@ struct Ligature
{
TRACE_WOULD_APPLY (this);
if (c->len != component.len)
- return TRACE_RETURN (false);
+ return_trace (false);
for (unsigned int i = 1; i < c->len; i++)
if (likely (c->glyphs[i] != component[i]))
- return TRACE_RETURN (false);
+ return_trace (false);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool apply (hb_apply_context_t *c) const
@@ -616,14 +616,14 @@ struct Ligature
TRACE_APPLY (this);
unsigned int count = component.len;
- if (unlikely (!count)) return TRACE_RETURN (false);
+ if (unlikely (!count)) return_trace (false);
/* Special-case to make it in-place and not consider this
* as a "ligated" substitution. */
if (unlikely (count == 1))
{
c->replace_glyph (ligGlyph);
- return TRACE_RETURN (true);
+ return_trace (true);
}
bool is_mark_ligature = false;
@@ -640,7 +640,7 @@ struct Ligature
match_positions,
&is_mark_ligature,
&total_component_count)))
- return TRACE_RETURN (false);
+ return_trace (false);
ligate_input (c,
count,
@@ -650,7 +650,7 @@ struct Ligature
is_mark_ligature,
total_component_count);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -659,17 +659,17 @@ struct Ligature
unsigned int num_components /* Including first component */)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
ligGlyph = ligature;
- if (unlikely (!component.serialize (c, components, num_components))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!component.serialize (c, components, num_components))) return_trace (false);
+ return_trace (true);
}
public:
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (ligGlyph.sanitize (c) && component.sanitize (c));
+ return_trace (ligGlyph.sanitize (c) && component.sanitize (c));
}
protected:
@@ -708,9 +708,9 @@ struct LigatureSet
{
const Ligature &lig = this+ligature[i];
if (lig.would_apply (c))
- return TRACE_RETURN (true);
+ return_trace (true);
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool apply (hb_apply_context_t *c) const
@@ -720,10 +720,10 @@ struct LigatureSet
for (unsigned int i = 0; i < num_ligs; i++)
{
const Ligature &lig = this+ligature[i];
- if (lig.apply (c)) return TRACE_RETURN (true);
+ if (lig.apply (c)) return_trace (true);
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool serialize (hb_serialize_context_t *c,
@@ -733,22 +733,22 @@ struct LigatureSet
Supplier<GlyphID> &component_list /* Starting from second for each ligature */)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!ligature.serialize (c, num_ligatures))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!ligature.serialize (c, num_ligatures))) return_trace (false);
for (unsigned int i = 0; i < num_ligatures; i++)
if (unlikely (!ligature[i].serialize (c, this).serialize (c,
ligatures[i],
component_list,
- component_count_list[i]))) return TRACE_RETURN (false);
+ component_count_list[i]))) return_trace (false);
ligatures.advance (num_ligatures);
component_count_list.advance (num_ligatures);
- return TRACE_RETURN (true);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (ligature.sanitize (c, this));
+ return_trace (ligature.sanitize (c, this));
}
protected:
@@ -790,10 +790,10 @@ struct LigatureSubstFormat1
{
TRACE_WOULD_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->glyphs[0]);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const LigatureSet &lig_set = this+ligatureSet[index];
- return TRACE_RETURN (lig_set.would_apply (c));
+ return_trace (lig_set.would_apply (c));
}
inline bool apply (hb_apply_context_t *c) const
@@ -802,10 +802,10 @@ struct LigatureSubstFormat1
hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
unsigned int index = (this+coverage).get_coverage (glyph_id);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const LigatureSet &lig_set = this+ligatureSet[index];
- return TRACE_RETURN (lig_set.apply (c));
+ return_trace (lig_set.apply (c));
}
inline bool serialize (hb_serialize_context_t *c,
@@ -817,23 +817,23 @@ struct LigatureSubstFormat1
Supplier<GlyphID> &component_list /* Starting from second for each ligature */)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
- if (unlikely (!ligatureSet.serialize (c, num_first_glyphs))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (*this))) return_trace (false);
+ if (unlikely (!ligatureSet.serialize (c, num_first_glyphs))) return_trace (false);
for (unsigned int i = 0; i < num_first_glyphs; i++)
if (unlikely (!ligatureSet[i].serialize (c, this).serialize (c,
ligatures_list,
component_count_list,
ligature_per_first_glyph_count_list[i],
- component_list))) return TRACE_RETURN (false);
+ component_list))) return_trace (false);
ligature_per_first_glyph_count_list.advance (num_first_glyphs);
- if (unlikely (!coverage.serialize (c, this).serialize (c, first_glyphs, num_first_glyphs))) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (unlikely (!coverage.serialize (c, this).serialize (c, first_glyphs, num_first_glyphs))) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && ligatureSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && ligatureSet.sanitize (c, this));
}
protected:
@@ -859,13 +859,18 @@ struct LigatureSubst
Supplier<GlyphID> &component_list /* Starting from second for each ligature */)
{
TRACE_SERIALIZE (this);
- if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false);
+ if (unlikely (!c->extend_min (u.format))) return_trace (false);
unsigned int format = 1;
u.format.set (format);
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, num_first_glyphs,
- ligatures_list, component_count_list, component_list));
- default:return TRACE_RETURN (false);
+ case 1: return_trace (u.format1.serialize (c,
+ first_glyphs,
+ ligature_per_first_glyph_count_list,
+ num_first_glyphs,
+ ligatures_list,
+ component_count_list,
+ component_list));
+ default:return_trace (false);
}
}
@@ -873,10 +878,10 @@ struct LigatureSubst
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -959,17 +964,17 @@ struct ReverseChainSingleSubstFormat1
inline bool would_apply (hb_would_apply_context_t *c) const
{
TRACE_WOULD_APPLY (this);
- return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
+ return_trace (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED);
}
inline bool apply (hb_apply_context_t *c) const
{
TRACE_APPLY (this);
if (unlikely (c->nesting_level_left != MAX_NESTING_LEVEL))
- return TRACE_RETURN (false); /* No chaining to this type */
+ return_trace (false); /* No chaining to this type */
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
@@ -986,22 +991,22 @@ struct ReverseChainSingleSubstFormat1
/* Note: We DON'T decrease buffer->idx. The main loop does it
* for us. This is useful for preventing surprises if someone
* calls us through a Context lookup. */
- return TRACE_RETURN (true);
+ return_trace (true);
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
if (!(coverage.sanitize (c, this) && backtrack.sanitize (c, this)))
- return TRACE_RETURN (false);
+ return_trace (false);
const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
if (!lookahead.sanitize (c, this))
- return TRACE_RETURN (false);
+ return_trace (false);
const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
- return TRACE_RETURN (substitute.sanitize (c));
+ return_trace (substitute.sanitize (c));
}
protected:
@@ -1030,10 +1035,10 @@ struct ReverseChainSingleSubst
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1070,17 +1075,17 @@ struct SubstLookupSubTable
{
TRACE_DISPATCH (this, lookup_type);
/* The sub_format passed to may_dispatch is unnecessary but harmless. */
- if (unlikely (!c->may_dispatch (this, &u.sub_format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.sub_format))) return_trace (c->default_return_value ());
switch (lookup_type) {
- case Single: return TRACE_RETURN (u.single.dispatch (c));
- case Multiple: return TRACE_RETURN (u.multiple.dispatch (c));
- case Alternate: return TRACE_RETURN (u.alternate.dispatch (c));
- case Ligature: return TRACE_RETURN (u.ligature.dispatch (c));
- case Context: return TRACE_RETURN (u.context.dispatch (c));
- case ChainContext: return TRACE_RETURN (u.chainContext.dispatch (c));
- case Extension: return TRACE_RETURN (u.extension.dispatch (c));
- case ReverseChainSingle: return TRACE_RETURN (u.reverseChainContextSingle.dispatch (c));
- default: return TRACE_RETURN (c->default_return_value ());
+ case Single: return_trace (u.single.dispatch (c));
+ case Multiple: return_trace (u.multiple.dispatch (c));
+ case Alternate: return_trace (u.alternate.dispatch (c));
+ case Ligature: return_trace (u.ligature.dispatch (c));
+ case Context: return_trace (u.context.dispatch (c));
+ case ChainContext: return_trace (u.chainContext.dispatch (c));
+ case Extension: return_trace (u.extension.dispatch (c));
+ case ReverseChainSingle: return_trace (u.reverseChainContextSingle.dispatch (c));
+ default: return_trace (c->default_return_value ());
}
}
@@ -1120,21 +1125,21 @@ struct SubstLookup : Lookup
inline bool apply (hb_apply_context_t *c) const
{
TRACE_APPLY (this);
- return TRACE_RETURN (dispatch (c));
+ return_trace (dispatch (c));
}
inline hb_closure_context_t::return_t closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
c->set_recurse_func (dispatch_recurse_func<hb_closure_context_t>);
- return TRACE_RETURN (dispatch (c));
+ return_trace (dispatch (c));
}
inline hb_collect_glyphs_context_t::return_t collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
c->set_recurse_func (dispatch_recurse_func<hb_collect_glyphs_context_t>);
- return TRACE_RETURN (dispatch (c));
+ return_trace (dispatch (c));
}
template <typename set_t>
@@ -1148,9 +1153,9 @@ struct SubstLookup : Lookup
const hb_ot_layout_lookup_accelerator_t *accel) const
{
TRACE_WOULD_APPLY (this);
- if (unlikely (!c->len)) return TRACE_RETURN (false);
- if (!accel->may_have (c->glyphs[0])) return TRACE_RETURN (false);
- return TRACE_RETURN (dispatch (c));
+ if (unlikely (!c->len)) return_trace (false);
+ if (!accel->may_have (c->glyphs[0])) return_trace (false);
+ return_trace (dispatch (c));
}
static bool apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index);
@@ -1166,8 +1171,8 @@ struct SubstLookup : Lookup
unsigned int num_glyphs)
{
TRACE_SERIALIZE (this);
- if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Single, lookup_props, 1))) return TRACE_RETURN (false);
- return TRACE_RETURN (serialize_subtable (c, 0).u.single.serialize (c, glyphs, substitutes, num_glyphs));
+ if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Single, lookup_props, 1))) return_trace (false);
+ return_trace (serialize_subtable (c, 0).u.single.serialize (c, glyphs, substitutes, num_glyphs));
}
inline bool serialize_multiple (hb_serialize_context_t *c,
@@ -1178,9 +1183,12 @@ struct SubstLookup : Lookup
Supplier<GlyphID> &substitute_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Multiple, lookup_props, 1))) return TRACE_RETURN (false);
- return TRACE_RETURN (serialize_subtable (c, 0).u.multiple.serialize (c, glyphs, substitute_len_list, num_glyphs,
- substitute_glyphs_list));
+ if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Multiple, lookup_props, 1))) return_trace (false);
+ return_trace (serialize_subtable (c, 0).u.multiple.serialize (c,
+ glyphs,
+ substitute_len_list,
+ num_glyphs,
+ substitute_glyphs_list));
}
inline bool serialize_alternate (hb_serialize_context_t *c,
@@ -1191,9 +1199,12 @@ struct SubstLookup : Lookup
Supplier<GlyphID> &alternate_glyphs_list)
{
TRACE_SERIALIZE (this);
- if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Alternate, lookup_props, 1))) return TRACE_RETURN (false);
- return TRACE_RETURN (serialize_subtable (c, 0).u.alternate.serialize (c, glyphs, alternate_len_list, num_glyphs,
- alternate_glyphs_list));
+ if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Alternate, lookup_props, 1))) return_trace (false);
+ return_trace (serialize_subtable (c, 0).u.alternate.serialize (c,
+ glyphs,
+ alternate_len_list,
+ num_glyphs,
+ alternate_glyphs_list));
}
inline bool serialize_ligature (hb_serialize_context_t *c,
@@ -1206,9 +1217,14 @@ struct SubstLookup : Lookup
Supplier<GlyphID> &component_list /* Starting from second for each ligature */)
{
TRACE_SERIALIZE (this);
- if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Ligature, lookup_props, 1))) return TRACE_RETURN (false);
- return TRACE_RETURN (serialize_subtable (c, 0).u.ligature.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, num_first_glyphs,
- ligatures_list, component_count_list, component_list));
+ if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Ligature, lookup_props, 1))) return_trace (false);
+ return_trace (serialize_subtable (c, 0).u.ligature.serialize (c,
+ first_glyphs,
+ ligature_per_first_glyph_count_list,
+ num_first_glyphs,
+ ligatures_list,
+ component_count_list,
+ component_list));
}
template <typename context_t>
@@ -1221,8 +1237,8 @@ struct SubstLookup : Lookup
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!Lookup::sanitize (c))) return TRACE_RETURN (false);
- if (unlikely (!dispatch (c))) return TRACE_RETURN (false);
+ if (unlikely (!Lookup::sanitize (c))) return_trace (false);
+ if (unlikely (!dispatch (c))) return_trace (false);
if (unlikely (get_type () == SubstLookupSubTable::Extension))
{
@@ -1233,9 +1249,9 @@ struct SubstLookup : Lookup
unsigned int count = get_subtable_count ();
for (unsigned int i = 1; i < count; i++)
if (get_subtable (i).u.extension.get_type () != type)
- return TRACE_RETURN (false);
+ return_trace (false);
}
- return TRACE_RETURN (true);
+ return_trace (true);
}
};
@@ -1258,9 +1274,9 @@ struct GSUB : GSUBGPOS
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (unlikely (!GSUBGPOS::sanitize (c))) return TRACE_RETURN (false);
+ if (unlikely (!GSUBGPOS::sanitize (c))) return_trace (false);
const OffsetTo<SubstLookupList> &list = CastR<OffsetTo<SubstLookupList> > (lookupList);
- return TRACE_RETURN (list.sanitize (c, this));
+ return_trace (list.sanitize (c, this));
}
public:
DEFINE_SIZE_STATIC (10);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsubgpos-private.hh
index 3e74dfeee70..6cf1ffca7ef 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-gsubgpos-private.hh
@@ -722,7 +722,7 @@ static inline bool match_input (hb_apply_context_t *c,
{
TRACE_APPLY (NULL);
- if (unlikely (count > MAX_CONTEXT_LENGTH)) return TRACE_RETURN (false);
+ if (unlikely (count > MAX_CONTEXT_LENGTH)) return_trace (false);
hb_buffer_t *buffer = c->buffer;
@@ -759,7 +759,7 @@ static inline bool match_input (hb_apply_context_t *c,
match_positions[0] = buffer->idx;
for (unsigned int i = 1; i < count; i++)
{
- if (!skippy_iter.next ()) return TRACE_RETURN (false);
+ if (!skippy_iter.next ()) return_trace (false);
match_positions[i] = skippy_iter.idx;
@@ -771,13 +771,13 @@ static inline bool match_input (hb_apply_context_t *c,
* all subsequent components should be attached to the same ligature
* component, otherwise we shouldn't ligate them. */
if (first_lig_id != this_lig_id || first_lig_comp != this_lig_comp)
- return TRACE_RETURN (false);
+ return_trace (false);
} else {
/* If first component was NOT attached to a previous ligature component,
* all subsequent components should also NOT be attached to any ligature
* component, unless they are attached to the first component itself! */
if (this_lig_id && this_lig_comp && (this_lig_id != first_lig_id))
- return TRACE_RETURN (false);
+ return_trace (false);
}
is_mark_ligature = is_mark_ligature && _hb_glyph_info_is_mark (&buffer->info[skippy_iter.idx]);
@@ -792,9 +792,9 @@ static inline bool match_input (hb_apply_context_t *c,
if (p_total_component_count)
*p_total_component_count = total_component_count;
- return TRACE_RETURN (true);
+ return_trace (true);
}
-static inline void ligate_input (hb_apply_context_t *c,
+static inline bool ligate_input (hb_apply_context_t *c,
unsigned int count, /* Including the first glyph */
unsigned int match_positions[MAX_CONTEXT_LENGTH], /* Including the first glyph */
unsigned int match_length,
@@ -884,7 +884,7 @@ static inline void ligate_input (hb_apply_context_t *c,
break;
}
}
- TRACE_RETURN (true);
+ return_trace (true);
}
static inline bool match_backtrack (hb_apply_context_t *c,
@@ -901,9 +901,9 @@ static inline bool match_backtrack (hb_apply_context_t *c,
for (unsigned int i = 0; i < count; i++)
if (!skippy_iter.prev ())
- return TRACE_RETURN (false);
+ return_trace (false);
- return TRACE_RETURN (true);
+ return_trace (true);
}
static inline bool match_lookahead (hb_apply_context_t *c,
@@ -921,9 +921,9 @@ static inline bool match_lookahead (hb_apply_context_t *c,
for (unsigned int i = 0; i < count; i++)
if (!skippy_iter.next ())
- return TRACE_RETURN (false);
+ return_trace (false);
- return TRACE_RETURN (true);
+ return_trace (true);
}
@@ -933,7 +933,7 @@ struct LookupRecord
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this));
+ return_trace (c->check_struct (this));
}
USHORT sequenceIndex; /* Index into current glyph
@@ -1034,7 +1034,7 @@ static inline bool apply_lookup (hb_apply_context_t *c,
buffer->move_to (end);
- return TRACE_RETURN (true);
+ return_trace (true);
}
@@ -1143,14 +1143,14 @@ struct Rule
{
TRACE_WOULD_APPLY (this);
const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (inputZ, inputZ[0].static_size * (inputCount ? inputCount - 1 : 0));
- return TRACE_RETURN (context_would_apply_lookup (c, inputCount, inputZ, lookupCount, lookupRecord, lookup_context));
+ return_trace (context_would_apply_lookup (c, inputCount, inputZ, lookupCount, lookupRecord, lookup_context));
}
inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
{
TRACE_APPLY (this);
const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (inputZ, inputZ[0].static_size * (inputCount ? inputCount - 1 : 0));
- return TRACE_RETURN (context_apply_lookup (c, inputCount, inputZ, lookupCount, lookupRecord, lookup_context));
+ return_trace (context_apply_lookup (c, inputCount, inputZ, lookupCount, lookupRecord, lookup_context));
}
public:
@@ -1202,9 +1202,9 @@ struct RuleSet
for (unsigned int i = 0; i < num_rules; i++)
{
if ((this+rule[i]).would_apply (c, lookup_context))
- return TRACE_RETURN (true);
+ return_trace (true);
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const
@@ -1214,15 +1214,15 @@ struct RuleSet
for (unsigned int i = 0; i < num_rules; i++)
{
if ((this+rule[i]).apply (c, lookup_context))
- return TRACE_RETURN (true);
+ return_trace (true);
}
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (rule.sanitize (c, this));
+ return_trace (rule.sanitize (c, this));
}
protected:
@@ -1279,7 +1279,7 @@ struct ContextFormat1
{match_glyph},
NULL
};
- return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+ return_trace (rule_set.would_apply (c, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -1292,20 +1292,20 @@ struct ContextFormat1
TRACE_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
if (likely (index == NOT_COVERED))
- return TRACE_RETURN (false);
+ return_trace (false);
const RuleSet &rule_set = this+ruleSet[index];
struct ContextApplyLookupContext lookup_context = {
{match_glyph},
NULL
};
- return TRACE_RETURN (rule_set.apply (c, lookup_context));
+ return_trace (rule_set.apply (c, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
}
protected:
@@ -1371,7 +1371,7 @@ struct ContextFormat2
{match_class},
&class_def
};
- return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+ return_trace (rule_set.would_apply (c, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -1383,7 +1383,7 @@ struct ContextFormat2
{
TRACE_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const ClassDef &class_def = this+classDef;
index = class_def.get_class (c->buffer->cur().codepoint);
@@ -1392,13 +1392,13 @@ struct ContextFormat2
{match_class},
&class_def
};
- return TRACE_RETURN (rule_set.apply (c, lookup_context));
+ return_trace (rule_set.apply (c, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && classDef.sanitize (c, this) && ruleSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && classDef.sanitize (c, this) && ruleSet.sanitize (c, this));
}
protected:
@@ -1462,7 +1462,7 @@ struct ContextFormat3
{match_coverage},
this
};
- return TRACE_RETURN (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+ return_trace (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -1474,27 +1474,27 @@ struct ContextFormat3
{
TRACE_APPLY (this);
unsigned int index = (this+coverageZ[0]).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverageZ, coverageZ[0].static_size * glyphCount);
struct ContextApplyLookupContext lookup_context = {
{match_coverage},
this
};
- return TRACE_RETURN (context_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
+ return_trace (context_apply_lookup (c, glyphCount, (const USHORT *) (coverageZ + 1), lookupCount, lookupRecord, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!c->check_struct (this)) return TRACE_RETURN (false);
+ if (!c->check_struct (this)) return_trace (false);
unsigned int count = glyphCount;
- if (!count) return TRACE_RETURN (false); /* We want to access coverageZ[0] freely. */
- if (!c->check_array (coverageZ, coverageZ[0].static_size, count)) return TRACE_RETURN (false);
+ if (!count) return_trace (false); /* We want to access coverageZ[0] freely. */
+ if (!c->check_array (coverageZ, coverageZ[0].static_size, count)) return_trace (false);
for (unsigned int i = 0; i < count; i++)
- if (!coverageZ[i].sanitize (c, this)) return TRACE_RETURN (false);
+ if (!coverageZ[i].sanitize (c, this)) return_trace (false);
const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverageZ, coverageZ[0].static_size * count);
- return TRACE_RETURN (c->check_array (lookupRecord, lookupRecord[0].static_size, lookupCount));
+ return_trace (c->check_array (lookupRecord, lookupRecord[0].static_size, lookupCount));
}
protected:
@@ -1517,12 +1517,12 @@ struct Context
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- case 2: return TRACE_RETURN (c->dispatch (u.format2));
- case 3: return TRACE_RETURN (c->dispatch (u.format3));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ case 2: return_trace (c->dispatch (u.format2));
+ case 3: return_trace (c->dispatch (u.format3));
+ default:return_trace (c->default_return_value ());
}
}
@@ -1687,11 +1687,11 @@ struct ChainRule
const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
- return TRACE_RETURN (chain_context_would_apply_lookup (c,
- backtrack.len, backtrack.array,
- input.len, input.array,
- lookahead.len, lookahead.array, lookup.len,
- lookup.array, lookup_context));
+ return_trace (chain_context_would_apply_lookup (c,
+ backtrack.len, backtrack.array,
+ input.len, input.array,
+ lookahead.len, lookahead.array, lookup.len,
+ lookup.array, lookup_context));
}
inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
@@ -1700,23 +1700,23 @@ struct ChainRule
const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
- return TRACE_RETURN (chain_context_apply_lookup (c,
- backtrack.len, backtrack.array,
- input.len, input.array,
- lookahead.len, lookahead.array, lookup.len,
- lookup.array, lookup_context));
+ return_trace (chain_context_apply_lookup (c,
+ backtrack.len, backtrack.array,
+ input.len, input.array,
+ lookahead.len, lookahead.array, lookup.len,
+ lookup.array, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!backtrack.sanitize (c)) return TRACE_RETURN (false);
+ if (!backtrack.sanitize (c)) return_trace (false);
const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
- if (!input.sanitize (c)) return TRACE_RETURN (false);
+ if (!input.sanitize (c)) return_trace (false);
const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
- if (!lookahead.sanitize (c)) return TRACE_RETURN (false);
+ if (!lookahead.sanitize (c)) return_trace (false);
const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
- return TRACE_RETURN (lookup.sanitize (c));
+ return_trace (lookup.sanitize (c));
}
protected:
@@ -1761,9 +1761,9 @@ struct ChainRuleSet
unsigned int num_rules = rule.len;
for (unsigned int i = 0; i < num_rules; i++)
if ((this+rule[i]).would_apply (c, lookup_context))
- return TRACE_RETURN (true);
+ return_trace (true);
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const
@@ -1772,15 +1772,15 @@ struct ChainRuleSet
unsigned int num_rules = rule.len;
for (unsigned int i = 0; i < num_rules; i++)
if ((this+rule[i]).apply (c, lookup_context))
- return TRACE_RETURN (true);
+ return_trace (true);
- return TRACE_RETURN (false);
+ return_trace (false);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (rule.sanitize (c, this));
+ return_trace (rule.sanitize (c, this));
}
protected:
@@ -1835,7 +1835,7 @@ struct ChainContextFormat1
{match_glyph},
{NULL, NULL, NULL}
};
- return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+ return_trace (rule_set.would_apply (c, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -1847,20 +1847,20 @@ struct ChainContextFormat1
{
TRACE_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const ChainRuleSet &rule_set = this+ruleSet[index];
struct ChainContextApplyLookupContext lookup_context = {
{match_glyph},
{NULL, NULL, NULL}
};
- return TRACE_RETURN (rule_set.apply (c, lookup_context));
+ return_trace (rule_set.apply (c, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) && ruleSet.sanitize (c, this));
}
protected:
@@ -1939,7 +1939,7 @@ struct ChainContextFormat2
&input_class_def,
&lookahead_class_def}
};
- return TRACE_RETURN (rule_set.would_apply (c, lookup_context));
+ return_trace (rule_set.would_apply (c, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -1951,7 +1951,7 @@ struct ChainContextFormat2
{
TRACE_APPLY (this);
unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const ClassDef &backtrack_class_def = this+backtrackClassDef;
const ClassDef &input_class_def = this+inputClassDef;
@@ -1965,15 +1965,17 @@ struct ChainContextFormat2
&input_class_def,
&lookahead_class_def}
};
- return TRACE_RETURN (rule_set.apply (c, lookup_context));
+ return_trace (rule_set.apply (c, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (coverage.sanitize (c, this) && backtrackClassDef.sanitize (c, this) &&
- inputClassDef.sanitize (c, this) && lookaheadClassDef.sanitize (c, this) &&
- ruleSet.sanitize (c, this));
+ return_trace (coverage.sanitize (c, this) &&
+ backtrackClassDef.sanitize (c, this) &&
+ inputClassDef.sanitize (c, this) &&
+ lookaheadClassDef.sanitize (c, this) &&
+ ruleSet.sanitize (c, this));
}
protected:
@@ -2056,11 +2058,11 @@ struct ChainContextFormat3
{match_coverage},
{this, this, this}
};
- return TRACE_RETURN (chain_context_would_apply_lookup (c,
- backtrack.len, (const USHORT *) backtrack.array,
- input.len, (const USHORT *) input.array + 1,
- lookahead.len, (const USHORT *) lookahead.array,
- lookup.len, lookup.array, lookup_context));
+ return_trace (chain_context_would_apply_lookup (c,
+ backtrack.len, (const USHORT *) backtrack.array,
+ input.len, (const USHORT *) input.array + 1,
+ lookahead.len, (const USHORT *) lookahead.array,
+ lookup.len, lookup.array, lookup_context));
}
inline const Coverage &get_coverage (void) const
@@ -2075,7 +2077,7 @@ struct ChainContextFormat3
const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
unsigned int index = (this+input[0]).get_coverage (c->buffer->cur().codepoint);
- if (likely (index == NOT_COVERED)) return TRACE_RETURN (false);
+ if (likely (index == NOT_COVERED)) return_trace (false);
const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input);
const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
@@ -2083,24 +2085,24 @@ struct ChainContextFormat3
{match_coverage},
{this, this, this}
};
- return TRACE_RETURN (chain_context_apply_lookup (c,
- backtrack.len, (const USHORT *) backtrack.array,
- input.len, (const USHORT *) input.array + 1,
- lookahead.len, (const USHORT *) lookahead.array,
- lookup.len, lookup.array, lookup_context));
+ return_trace (chain_context_apply_lookup (c,
+ backtrack.len, (const USHORT *) backtrack.array,
+ input.len, (const USHORT *) input.array + 1,
+ lookahead.len, (const USHORT *) lookahead.array,
+ lookup.len, lookup.array, lookup_context));
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- if (!backtrack.sanitize (c, this)) return TRACE_RETURN (false);
+ if (!backtrack.sanitize (c, this)) return_trace (false);
const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
- if (!input.sanitize (c, this)) return TRACE_RETURN (false);
- if (!input.len) return TRACE_RETURN (false); /* To be consistent with Context. */
+ if (!input.sanitize (c, this)) return_trace (false);
+ if (!input.len) return_trace (false); /* To be consistent with Context. */
const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input);
- if (!lookahead.sanitize (c, this)) return TRACE_RETURN (false);
+ if (!lookahead.sanitize (c, this)) return_trace (false);
const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
- return TRACE_RETURN (lookup.sanitize (c));
+ return_trace (lookup.sanitize (c));
}
protected:
@@ -2130,12 +2132,12 @@ struct ChainContext
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (c->dispatch (u.format1));
- case 2: return TRACE_RETURN (c->dispatch (u.format2));
- case 3: return TRACE_RETURN (c->dispatch (u.format3));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (c->dispatch (u.format1));
+ case 2: return_trace (c->dispatch (u.format2));
+ case 3: return_trace (c->dispatch (u.format3));
+ default:return_trace (c->default_return_value ());
}
}
@@ -2166,15 +2168,15 @@ struct ExtensionFormat1
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, format);
- if (unlikely (!c->may_dispatch (this, this))) TRACE_RETURN (c->default_return_value ());
- return TRACE_RETURN (get_subtable<typename T::LookupSubTable> ().dispatch (c, get_type ()));
+ if (unlikely (!c->may_dispatch (this, this))) return_trace (c->default_return_value ());
+ return_trace (get_subtable<typename T::LookupSubTable> ().dispatch (c, get_type ()));
}
/* This is called from may_dispatch() above with hb_sanitize_context_t. */
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) && extensionOffset != 0);
+ return_trace (c->check_struct (this) && extensionOffset != 0);
}
protected:
@@ -2211,10 +2213,10 @@ struct Extension
inline typename context_t::return_t dispatch (context_t *c) const
{
TRACE_DISPATCH (this, u.format);
- if (unlikely (!c->may_dispatch (this, &u.format))) TRACE_RETURN (c->default_return_value ());
+ if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->default_return_value ());
switch (u.format) {
- case 1: return TRACE_RETURN (u.format1.dispatch (c));
- default:return TRACE_RETURN (c->default_return_value ());
+ case 1: return_trace (u.format1.dispatch (c));
+ default:return_trace (c->default_return_value ());
}
}
@@ -2269,10 +2271,11 @@ struct GSUBGPOS
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (version.sanitize (c) && likely (version.major == 1) &&
- scriptList.sanitize (c, this) &&
- featureList.sanitize (c, this) &&
- lookupList.sanitize (c, this));
+ return_trace (version.sanitize (c) &&
+ likely (version.major == 1) &&
+ scriptList.sanitize (c, this) &&
+ featureList.sanitize (c, this) &&
+ lookupList.sanitize (c, this));
}
protected:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-jstf-table.hh
index 739dfd91067..7e199c2e14c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-jstf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-jstf-table.hh
@@ -57,17 +57,17 @@ struct JstfPriority
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- shrinkageEnableGSUB.sanitize (c, this) &&
- shrinkageDisableGSUB.sanitize (c, this) &&
- shrinkageEnableGPOS.sanitize (c, this) &&
- shrinkageDisableGPOS.sanitize (c, this) &&
- shrinkageJstfMax.sanitize (c, this) &&
- extensionEnableGSUB.sanitize (c, this) &&
- extensionDisableGSUB.sanitize (c, this) &&
- extensionEnableGPOS.sanitize (c, this) &&
- extensionDisableGPOS.sanitize (c, this) &&
- extensionJstfMax.sanitize (c, this));
+ return_trace (c->check_struct (this) &&
+ shrinkageEnableGSUB.sanitize (c, this) &&
+ shrinkageDisableGSUB.sanitize (c, this) &&
+ shrinkageEnableGPOS.sanitize (c, this) &&
+ shrinkageDisableGPOS.sanitize (c, this) &&
+ shrinkageJstfMax.sanitize (c, this) &&
+ extensionEnableGSUB.sanitize (c, this) &&
+ extensionDisableGSUB.sanitize (c, this) &&
+ extensionEnableGPOS.sanitize (c, this) &&
+ extensionDisableGPOS.sanitize (c, this) &&
+ extensionJstfMax.sanitize (c, this));
}
protected:
@@ -127,7 +127,7 @@ struct JstfLangSys : OffsetListOf<JstfPriority>
const Record<JstfLangSys>::sanitize_closure_t * = NULL) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (OffsetListOf<JstfPriority>::sanitize (c));
+ return_trace (OffsetListOf<JstfPriority>::sanitize (c));
}
};
@@ -168,9 +168,9 @@ struct JstfScript
const Record<JstfScript>::sanitize_closure_t * = NULL) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (extenderGlyphs.sanitize (c, this) &&
- defaultLangSys.sanitize (c, this) &&
- langSys.sanitize (c, this));
+ return_trace (extenderGlyphs.sanitize (c, this) &&
+ defaultLangSys.sanitize (c, this) &&
+ langSys.sanitize (c, this));
}
protected:
@@ -212,8 +212,9 @@ struct JSTF
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (version.sanitize (c) && likely (version.major == 1) &&
- scriptList.sanitize (c, this));
+ return_trace (version.sanitize (c) &&
+ likely (version.major == 1) &&
+ scriptList.sanitize (c, this));
}
protected:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-private.hh
index d168e27f534..d168e27f534 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.cc
index 39d007d6764..1a6fb15ee99 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.cc
@@ -798,7 +798,7 @@ hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer)
}
/**
- * Since: 0.9.8
+ * Since: 0.9.10
**/
hb_bool_t
hb_ot_layout_get_size_params (hb_face_t *face,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.h
index 949678ac422..949678ac422 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-layout.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map-private.hh
index f9538af1831..f9538af1831 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map.cc
index 95bd04ee8e2..95bd04ee8e2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-map.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-maxp-table.hh
index 0d9a0fa1d87..27105af1326 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-maxp-table.hh
@@ -51,8 +51,9 @@ struct maxp
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- likely (version.major == 1 || (version.major == 0 && version.minor == 0x5000u)));
+ return_trace (c->check_struct (this) &&
+ likely (version.major == 1 ||
+ (version.major == 0 && version.minor == 0x5000u)));
}
/* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-name-table.hh
index 21450c61382..870f1233251 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-name-table.hh
@@ -60,7 +60,7 @@ struct NameRecord
{
TRACE_SANITIZE (this);
/* We can check from base all the way up to the end of string... */
- return TRACE_RETURN (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
+ return_trace (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
}
USHORT platformID; /* Platform ID. */
@@ -107,17 +107,17 @@ struct name
char *string_pool = (char *) this + stringOffset;
unsigned int _count = count;
for (unsigned int i = 0; i < _count; i++)
- if (!nameRecord[i].sanitize (c, string_pool)) return TRACE_RETURN (false);
- return TRACE_RETURN (true);
+ if (!nameRecord[i].sanitize (c, string_pool)) return_trace (false);
+ return_trace (true);
}
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return TRACE_RETURN (c->check_struct (this) &&
- likely (format == 0 || format == 1) &&
- c->check_array (nameRecord, nameRecord[0].static_size, count) &&
- sanitize_records (c));
+ return_trace (c->check_struct (this) &&
+ likely (format == 0 || format == 1) &&
+ c->check_array (nameRecord, nameRecord[0].static_size, count) &&
+ sanitize_records (c));
}
/* We only implement format 0 for now. */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-fallback.hh
index d97d2852105..d97d2852105 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-private.hh
index fcedc7d7420..fcedc7d7420 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-table.hh
index 80d50443546..80d50443546 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-win1256.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-win1256.hh
index e70c48f427c..e70c48f427c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic-win1256.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic-win1256.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic.cc
index cde02e0a567..cde02e0a567 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-default.cc
index f7f097eedaa..f7f097eedaa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hangul.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hangul.cc
index 1fa79ce6d42..1fa79ce6d42 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hangul.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hangul.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hebrew.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hebrew.cc
index c7b7a5eba6a..c7b7a5eba6a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-hebrew.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-hebrew.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.hh
index f652d4fda73..f652d4fda73 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.rl
index 694b235d1d1..694b235d1d1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-private.hh
index 559ebe49867..559ebe49867 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-table.cc
index 2e159a12b00..2e159a12b00 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic.cc
index 00526f3df4f..00526f3df4f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-indic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.hh
index 29fdf9a1aef..29fdf9a1aef 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.rl
index 9649a916f02..9649a916f02 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar.cc
index 30a53c7e35d..30a53c7e35d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-myanmar.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-private.hh
index 8d03dee51f1..8d03dee51f1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-thai.cc
index d4ede209f4b..d4ede209f4b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-tibetan.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-tibetan.cc
index 01465a426f8..01465a426f8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-tibetan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-tibetan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.hh
index ced9d97f28f..ced9d97f28f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.rl
index b8242bab1e7..b8242bab1e7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-private.hh
index a1437362119..a1437362119 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-table.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-table.cc
index 6cd1c5db75f..6cd1c5db75f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use.cc
index 4b15deedd48..4b15deedd48 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-complex-use.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-complex-use.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback-private.hh
index ec653513f1b..ec653513f1b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback.cc
index 748372d01fe..748372d01fe 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-fallback.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize-private.hh
index c744e26451d..c744e26451d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize.cc
index a706461326a..a706461326a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-normalize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-private.hh
index 54ac2c3cf7c..54ac2c3cf7c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.cc
index 40332d69f12..40332d69f12 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.h
index 1402f54acc5..1402f54acc5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.cc
index 61c38b19626..a2e5728fcd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.cc
@@ -733,7 +733,6 @@ static const LangTag ot_languages[] = {
/*{"fuf?", HB_TAG('F','T','A',' ')},*/ /* Futa */
/*{"ar-Syrc?", HB_TAG('G','A','R',' ')},*/ /* Garshuni */
/*{"cfm/rnl?", HB_TAG('H','A','L',' ')},*/ /* Halam */
-/*{"fonipa", HB_TAG('I','P','P','H')},*/ /* Phonetic transcription—IPA conventions */
/*{"ga-Latg?/Latg?", HB_TAG('I','R','T',' ')},*/ /* Irish Traditional */
/*{"krc", HB_TAG('K','A','R',' ')},*/ /* Karachay */
/*{"alw?/ktb?", HB_TAG('K','E','B',' ')},*/ /* Kebena */
@@ -832,6 +831,14 @@ hb_ot_tag_from_language (hb_language_t language)
}
}
+ /*
+ * The International Phonetic Alphabet is a variant tag in BCP-47,
+ * which can be applied to any language.
+ */
+ if (strstr (lang_str, "-fonipa")) {
+ return HB_TAG('I','P','P','H'); /* Phonetic transcription—IPA conventions */
+ }
+
/* Find a language matching in the first component */
{
const LangTag *lang_tag;
@@ -877,7 +884,7 @@ hb_ot_tag_from_language (hb_language_t language)
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_language_t
hb_ot_tag_to_language (hb_tag_t tag)
@@ -901,6 +908,12 @@ hb_ot_tag_to_language (hb_tag_t tag)
}
}
+ /* struct LangTag has only room for 3-letter language tags. */
+ switch (tag) {
+ case HB_TAG('I','P','P','H'): /* Phonetic transcription—IPA conventions */
+ return hb_language_from_string ("und-fonipa", -1);
+ }
+
/* Else return a custom language in the form of "x-hbotABCD" */
{
unsigned char buf[11] = "x-hbot";
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot.h
index 47c92a58e4b..47c92a58e4b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ot.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-private.hh
index c0810294689..07550cb6eaa 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-private.hh
@@ -740,7 +740,7 @@ template <typename T>
static inline void _hb_warn_no_return (bool returned)
{
if (unlikely (!returned)) {
- fprintf (stderr, "OUCH, returned with no call to TRACE_RETURN. This is a bug, please report.\n");
+ fprintf (stderr, "OUCH, returned with no call to return_trace(). This is a bug, please report.\n");
}
}
template <>
@@ -775,7 +775,7 @@ struct hb_auto_trace_t {
inline ret_t ret (ret_t v, unsigned int line = 0)
{
if (unlikely (returned)) {
- fprintf (stderr, "OUCH, double calls to TRACE_RETURN. This is a bug, please report.\n");
+ fprintf (stderr, "OUCH, double calls to return_trace(). This is a bug, please report.\n");
return v;
}
@@ -806,7 +806,7 @@ struct hb_auto_trace_t<0, ret_t> {
inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; }
};
-#define TRACE_RETURN(RET) trace.ret (RET, __LINE__)
+#define return_trace(RET) return trace.ret (RET, __LINE__)
/* Misc */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set-private.hh
index 3c302b1daf6..3c302b1daf6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.cc
index cb7fcdbf64c..cb7fcdbf64c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.h
index bafdae96333..29bf6556ab7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-set.h
@@ -36,6 +36,9 @@
HB_BEGIN_DECLS
+/*
+ * Since: 0.9.21
+ */
#define HB_SET_VALUE_INVALID ((hb_codepoint_t) -1)
typedef struct hb_set_t hb_set_t;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan-private.hh
index 607da5e7791..607da5e7791 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.cc
index d2f293d69de..d2f293d69de 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.cc
index 5ddde5ad59d..c06b9a46e87 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.cc
@@ -399,7 +399,7 @@ hb_shape_full (hb_font_t *font,
*
* Return value: %FALSE if all shapers failed, %TRUE otherwise
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_shape (hb_font_t *font,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.h
index b665509a0dd..b665509a0dd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-list.hh
index 6c537d49215..6c537d49215 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-private.hh
index d1d1146dad2..d1d1146dad2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper.cc
index 580b95c84b4..580b95c84b4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ucdn.cc
index b4a58332445..b4a58332445 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode-private.hh
index 968bca5567d..968bca5567d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.cc
index 6b32faf667f..487d10b9395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.cc
@@ -158,7 +158,7 @@ hb_unicode_funcs_get_default (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_unicode_funcs_t *
hb_unicode_funcs_create (hb_unicode_funcs_t *parent)
@@ -204,7 +204,7 @@ const hb_unicode_funcs_t _hb_unicode_funcs_nil = {
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_unicode_funcs_t *
hb_unicode_funcs_get_empty (void)
@@ -220,7 +220,7 @@ hb_unicode_funcs_get_empty (void)
*
* Return value: (transfer full):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_unicode_funcs_t *
hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs)
@@ -234,7 +234,7 @@ hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs)
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs)
@@ -263,7 +263,7 @@ hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
@@ -284,7 +284,7 @@ hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
*
* Return value: (transfer none):
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void *
hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
@@ -300,7 +300,7 @@ hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs)
@@ -319,7 +319,7 @@ hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_bool_t
hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs)
@@ -335,7 +335,7 @@ hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs)
*
* Return value:
*
- * Since: 1.0
+ * Since: 0.9.2
**/
hb_unicode_funcs_t *
hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.h
index bf1796dcafd..3a12e2f9a2e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-unicode.h
@@ -283,7 +283,7 @@ typedef unsigned int (*hb_unicode_decompose_compatibility_func_t) (hb_unicode_
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_set_combining_class_func (hb_unicode_funcs_t *ufuncs,
@@ -299,7 +299,7 @@ hb_unicode_funcs_set_combining_class_func (hb_unicode_funcs_t *ufuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs,
@@ -315,7 +315,7 @@ hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_set_general_category_func (hb_unicode_funcs_t *ufuncs,
@@ -331,7 +331,7 @@ hb_unicode_funcs_set_general_category_func (hb_unicode_funcs_t *ufuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
@@ -347,7 +347,7 @@ hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
*
*
*
- * Since: 1.0
+ * Since: 0.9.2
**/
void
hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.cc
index 01be0cc846b..01be0cc846b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.h
index 001ab38ea87..001ab38ea87 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-utf-private.hh
index 14d3c2e369b..14d3c2e369b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-version.h.in
index 2517160d18b..2517160d18b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-warning.cc
index 8f322bcb10d..8f322bcb10d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb-warning.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb.h
index c5a938a3818..c5a938a3818 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/main.cc
index f9708cc948e..f9708cc948e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-buffer-serialize.cc
index 18c46e9524b..18c46e9524b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-size-params.cc
index 35d9e3c8e25..35d9e3c8e25 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-would-substitute.cc
index 8ea87cdf397..8ea87cdf397 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test.cc
index a8fe046f34c..a8fe046f34c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-1.0.3/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-1.0.4/src/test.cc
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index f55976e9d7a..3fc6ae61970 100644
--- a/Build/source/libs/harfbuzz/version.ac
+++ b/Build/source/libs/harfbuzz/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current harfbuzz version
-m4_define([harfbuzz_version], [1.0.3])
+m4_define([harfbuzz_version], [1.0.4])