summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-14 07:44:19 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-14 07:44:19 +0000
commite537bba01fd3f3a532b7fc1f6186c24065208638 (patch)
tree91c8b0e9abb27daf849517eeb4b358db5e97a129 /Build/source/libs
parent58ce98b913641326350d78f817c529ab803cf283 (diff)
harfbuzz 0.9.24
git-svn-id: svn://tug.org/texlive/trunk@32146 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-0.9.24-PATCHES/ChangeLog (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/ChangeLog)5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24-PATCHES/TL-Changes (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/TL-Changes)4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/AUTHORS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/AUTHORS)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/Android.mk (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/Android.mk)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/ChangeLog (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/ChangeLog)139
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/Makefile.am)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/NEWS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/NEWS)8
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/README (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/README)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/THANKS (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/THANKS)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/TODO (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/TODO)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/autogen.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/autogen.sh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/config.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/config.h.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/configure.ac (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/configure.ac)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/gtk-doc.make (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/gtk-doc.make)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/harfbuzz.doap (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/harfbuzz.doap)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/Makefile.am (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/Makefile.am)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-c-linkage-decls.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-c-linkage-decls.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-defs.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-defs.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-header-guards.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-header-guards.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-includes.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-includes.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-libstdc++.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-libstdc++.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-static-inits.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-static-inits.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-symbols.sh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-symbols.sh)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-arabic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-arabic-table.py)0
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-indic-table.py (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-indic-table.py)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-gobject.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-gobject.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-icu.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-icu.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz.pc.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz.pc.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-atomic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-atomic-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-private.hh)3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-serialize.cc)8
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.cc)7
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-cache-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-cache-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.cc)29
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-deprecated.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-deprecated.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-fallback-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-fallback-shape.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font-private.hh)6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.cc)4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.cc.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.cc.tmpl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.h.tmpl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.h.tmpl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.cc)28
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-mutex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-mutex-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-object-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-object-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-file-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-file-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-type-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-type-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-head-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-head-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hhea-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hhea-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hmtx-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hmtx-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-common-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-common-private.hh)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gdef-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gdef-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gpos-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gpos-table.hh)6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsub-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsub-table.hh)56
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsubgpos-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsubgpos-private.hh)162
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-jstf-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-jstf-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map.cc)2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-maxp-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-maxp-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-name-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-name-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-fallback.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-fallback.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-table.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-table.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-default.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-default.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-table.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-table.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.rl (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.rl)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-thai.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-thai.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-private.hh)3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-impl-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-impl-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-list.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-list.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-tt-font.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-tt-font.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ucdn.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ucdn.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.cc)35
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-utf-private.hh (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-utf-private.hh)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-version.h.in (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-version.h.in)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-warning.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-warning.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb.h (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb.h)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/main.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/main.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-buffer-serialize.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-buffer-serialize.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-size-params.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-size-params.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-would-substitute.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-would-substitute.cc)0
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test.cc (renamed from Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test.cc)0
-rw-r--r--Build/source/libs/harfbuzz/version.ac2
145 files changed, 255 insertions, 299 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 0a36d9f1fd5..23a695b7bdc 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -21,7 +21,7 @@ gd 2.1.0 - checked 26jun13
graphite2 1.2.3 - checked 12jun13
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 0.9.23 - checked 29oct13
+harfbuzz 0.9.24 - checked 14nov13
http://www.freedesktop.org/software/harfbuzz/release/
icu 52.1 (release) - checked 10oct13
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index c7fbc53f3c1..57a9957a1f0 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import harfbuzz-0.9.24.
+ * version.ac: Adjust.
+
2013-10-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* hbtest.c: Print more info.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 8f97d2d8d43..445fcd76922 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -83,7 +83,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/harfbuzz-0.9.23/src/hb-version.h.in \
+ $(top_srcdir)/harfbuzz-0.9.24/src/hb-version.h.in \
$(am__dist_check_SCRIPTS_DIST) \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/test-driver ChangeLog \
@@ -771,7 +771,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-0.9.23/src/hb-version.h.in
+hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.24/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 60703959f19..5d5161dea59 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) 0.9.23.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 0.9.24.
#
# 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='0.9.23'
-PACKAGE_STRING='harfbuzz (TeX Live) 0.9.23'
+PACKAGE_VERSION='0.9.24'
+PACKAGE_STRING='harfbuzz (TeX Live) 0.9.24'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="harfbuzz-0.9.23/src/harfbuzz.pc.in"
+ac_unique_file="harfbuzz-0.9.24/src/harfbuzz.pc.in"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1324,7 +1324,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) 0.9.23 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 0.9.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1395,7 +1395,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.23:";;
+ short | recursive ) echo "Configuration of harfbuzz (TeX Live) 0.9.24:";;
esac
cat <<\_ACEOF
@@ -1508,7 +1508,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-harfbuzz (TeX Live) configure 0.9.23
+harfbuzz (TeX Live) configure 0.9.24
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1915,7 +1915,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 0.9.23, which was
+It was created by harfbuzz (TeX Live) $as_me 0.9.24, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3838,7 +3838,7 @@ fi
# Define the identity of the package.
PACKAGE='harfbuzz--tex-live-'
- VERSION='0.9.23'
+ VERSION='0.9.24'
cat >>confdefs.h <<_ACEOF
@@ -4040,8 +4040,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
HB_VERSION_MAJOR=0
HB_VERSION_MINOR=9
-HB_VERSION_MICRO=23
-HB_VERSION=0.9.23
+HB_VERSION_MICRO=24
+HB_VERSION=0.9.24
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6408,14 +6408,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h
fi
-HARFBUZZ_TREE=harfbuzz-0.9.23
+HARFBUZZ_TREE=harfbuzz-0.9.24
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-0.9.23/src/hb-version.h.in"
+ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.24/src/hb-version.h.in"
cat >confcache <<\_ACEOF
@@ -6964,7 +6964,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 0.9.23, which was
+This file was extended by harfbuzz (TeX Live) $as_me 0.9.24, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7030,7 +7030,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 0.9.23
+harfbuzz (TeX Live) config.status 0.9.24
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7163,7 +7163,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-0.9.23/src/hb-version.h.in" ;;
+ "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.24/src/hb-version.h.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.24-PATCHES/ChangeLog
index 63270d083d0..7f62de7b14e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported harfbuzz-0.9.24 source tree from:
+ http://www.freedesktop.org/software/harfbuzz/release/
+
2013-10-29 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported harfbuzz-0.9.23 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.24-PATCHES/TL-Changes
index 6d0cac49098..c8ca924d08c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the harfbuzz-0.9.23/ tree as obtained from:
- http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.23.tar.bz2
+Changes applied to the harfbuzz-0.9.24/ tree as obtained from:
+ http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.24.tar.bz2
Removed:
COPYING
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/AUTHORS
index c611d7d4769..c611d7d4769 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/AUTHORS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/AUTHORS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/Android.mk
index 757d136e509..757d136e509 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/Android.mk
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/Android.mk
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/ChangeLog
index 3aeb416a11b..fe34d44a7ac 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/ChangeLog
@@ -1,3 +1,142 @@
+commit 6300694f6e531593e7e932000f9540b0367940b8
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Nov 13 14:54:07 2013 -0500
+
+ 0.9.24
+
+ NEWS | 8 ++++++++
+ configure.ac | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit 061cb4649342b005fb1de93abae25e889cc560bd
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Nov 13 14:50:25 2013 -0500
+
+ Use long alignment for scratch buffer
+
+ Fixes last of scratch alignment warnings in hb-coretext.
+
+ src/hb-buffer-private.hh | 2 +-
+ src/hb-buffer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 68c372ed2eac76a6d347811293fe2ba2fd6a1eed
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Nov 13 14:44:01 2013 -0500
+
+ More scratch-buffer cleanup
+
+ src/hb-buffer-private.hh | 3 ++-
+ src/hb-buffer.cc | 10 +++++-----
+ src/hb-coretext.cc | 5 ++---
+ src/hb-graphite2.cc | 2 +-
+ src/hb-uniscribe.cc | 30 ++++++++++++++----------------
+ 5 files changed, 24 insertions(+), 26 deletions(-)
+
+commit 8fcadb9cf9418345610e3f4e38c28c12b768b589
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Nov 13 14:33:57 2013 -0500
+
+ [coretext] More scratch buffer fixes
+
+ src/hb-coretext.cc | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+commit 16f175cb2e081e605fe7f9cd01bbe8c24380278a
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Nov 12 17:22:49 2013 -0500
+
+ Fix scratch-buffer alignment warnings
+
+ src/hb-buffer-private.hh | 2 +-
+ src/hb-buffer.cc | 9 +++++----
+ src/hb-coretext.cc | 17 ++++++++++-------
+ src/hb-graphite2.cc | 28 +++++++++++++++++-----------
+ src/hb-private.hh | 3 +++
+ src/hb-uniscribe.cc | 29 +++++++++++++++++------------
+ 6 files changed, 53 insertions(+), 35 deletions(-)
+
+commit c7c4ccf8a1e784b6f8798388a219dda9a26fbd93
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue Nov 12 15:41:22 2013 -0500
+
+ [travis] Enable graphite2
+
+ .travis.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 83408cf804a6908873c41b70bb7c43448e66ddd2
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Nov 6 14:46:04 2013 -0500
+
+ Fix llvm warnings on Mac
+
+ Patch from Scott Fleischman. Warnings were:
+
+ harfbuzz/src/hb-font-private.hh:121:42: Implicit conversion loses
+ integer precision: 'long long' to 'hb_position_t' (aka 'int')
+ harfbuzz/src/hb-font-private.hh:126:42: Implicit conversion loses
+ integer precision: 'long long' to 'hb_position_t' (aka 'int')
+ harfbuzz/src/hb-font-private.hh:400:85: Implicit conversion loses
+ integer precision: 'long long' to 'hb_position_t' (aka 'int')
+ harfbuzz/src/hb-ot-layout-common-private.hh:1115:37: Implicit
+ conversion
+ loses integer precision: 'long long' to 'int'
+ harfbuzz/src/hb-ft.cc:421:97: Implicit conversion loses integer
+ precision: 'unsigned long long' to 'int'
+ harfbuzz/src/hb-ft.cc:422:97: Implicit conversion loses integer
+ precision: 'unsigned long long' to 'int'
+
+ src/hb-font-private.hh | 6 +++---
+ src/hb-ft.cc | 4 ++--
+ src/hb-ot-layout-common-private.hh | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 333cc6e2d11831bcd2370723456e678574d570ec
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Oct 30 17:30:11 2013 +0000
+
+ [otlayout] Remove unused is_inplace()
+
+ Patch from Jonathan Kew.
+
+ src/hb-ot-layout-gpos-table.hh | 6 --
+ src/hb-ot-layout-gsub-table.hh | 56 ------------
+ src/hb-ot-layout-gsubgpos-private.hh | 159
+ -----------------------------------
+ 3 files changed, 221 deletions(-)
+
+commit 176fd17d02ac183af32a0e710ec32d25c9322021
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed Oct 30 17:27:24 2013 +0000
+
+ Bug 70971 - Signed/unsigned compiler warnings on windows
+
+ Patch from Emil Eklund.
+
+ src/hb-buffer-serialize.cc | 8 ++++----
+ src/hb-ot-map.cc | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3d436d325edccc0f3dd820e06e3d529cc8f3eca4
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Mon Oct 28 21:00:37 2013 +0100
+
+ [otlayout] Reset ccc when marking glyph as letter
+
+ src/hb-ot-layout-gsubgpos-private.hh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit b9d0077ac1a8e8a62ee15c64ad302f7976e23bdd
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Mon Oct 28 20:44:03 2013 +0100
+
+ Fix win32 testing
+
+ test/shaping/Makefile.am | 1 +
+ test/shaping/run-tests.sh | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
commit dce79c2bd747d398bdf2f4b171b0ba9b5b951f72
Author: Behdad Esfahbod <behdad@behdad.org>
Date: Mon Oct 28 20:26:40 2013 +0100
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/Makefile.am
index 15ccbf87134..15ccbf87134 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/NEWS
index 3636f77086c..df28c8559d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/NEWS
@@ -1,3 +1,11 @@
+Overview of changes leading to 0.9.24
+Tuesday, November 13, 2013
+=====================================
+
+- Misc compiler warning fixes with clang.
+- No functional changes.
+
+
Overview of changes leading to 0.9.23
Monday, October 28, 2013
=====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/README
index 74e739da52a..74e739da52a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/README
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/README
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/THANKS
index 940cfde5c39..940cfde5c39 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/THANKS
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/THANKS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/TODO
index e1aa39c4c01..e1aa39c4c01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/TODO
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/TODO
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/autogen.sh
index 6f4e903d745..6f4e903d745 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/autogen.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/autogen.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/config.h.in
index 3e906b18416..3e906b18416 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/config.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/config.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/configure.ac
index d1c40da4d39..7b804b29206 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([HarfBuzz],
- [0.9.23],
+ [0.9.24],
[http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
[harfbuzz],
[http://harfbuzz.org/])
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/gtk-doc.make b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/gtk-doc.make
index 9841de47922..9841de47922 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/gtk-doc.make
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/gtk-doc.make
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/harfbuzz.doap
index d2896ebefa8..d2896ebefa8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/harfbuzz.doap
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/harfbuzz.doap
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/Makefile.am
index 81802252fd7..81802252fd7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/Makefile.am
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/Makefile.am
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-c-linkage-decls.sh
index b10310f5384..b10310f5384 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-c-linkage-decls.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-c-linkage-decls.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-defs.sh
index d7a8ec281bf..d7a8ec281bf 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-defs.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-defs.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-header-guards.sh
index 9a3302c7f87..9a3302c7f87 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-header-guards.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-header-guards.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-includes.sh
index 5643c6973bc..5643c6973bc 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-includes.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-includes.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-libstdc++.sh
index e7e0e295e1a..e7e0e295e1a 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-libstdc++.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-libstdc++.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-static-inits.sh
index bb0a7ff630d..bb0a7ff630d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-static-inits.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-static-inits.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-symbols.sh
index 67bdf71e1b1..67bdf71e1b1 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/check-symbols.sh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-arabic-table.py
index da5a4fcbf5c..da5a4fcbf5c 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-arabic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-arabic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-indic-table.py
index 9ed3fd6d34d..9ed3fd6d34d 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/gen-indic-table.py
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-gobject.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-gobject.pc.in
index 70083601901..70083601901 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-gobject.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-gobject.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-icu.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-icu.pc.in
index 949869a3563..949869a3563 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz-icu.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz-icu.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz.pc.in
index 7f27bbbdef0..7f27bbbdef0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/harfbuzz.pc.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/harfbuzz.pc.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-atomic-private.hh
index 9cc3bc5587c..9cc3bc5587c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-atomic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-atomic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.cc
index 7a659b26b97..7a659b26b97 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.h
index d3d0f41b11c..d3d0f41b11c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-blob.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-blob.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.hh
index dead700db82..dead700db82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.rl
index 7351b2ab47c..7351b2ab47c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-json.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-json.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.hh
index a38efe3a415..a38efe3a415 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.rl
index 8856580fbe3..8856580fbe3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-deserialize-text.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-deserialize-text.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-private.hh
index 703239035f0..d3ed4491ed9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-private.hh
@@ -186,7 +186,8 @@ struct hb_buffer_t {
HB_INTERNAL bool make_room_for (unsigned int num_in, unsigned int num_out);
HB_INTERNAL bool shift_forward (unsigned int count);
- HB_INTERNAL void *get_scratch_buffer (unsigned int *size);
+ typedef long scratch_buffer_t;
+ HB_INTERNAL scratch_buffer_t *get_scratch_buffer (unsigned int *size);
inline void clear_context (unsigned int side) { context_len[side] = 0; }
};
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-serialize.cc
index b32092cf0b3..4541db23bd2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer-serialize.cc
@@ -146,9 +146,9 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
*p++ = '}';
- if (buf_size > (p - b))
+ unsigned int l = p - b;
+ if (buf_size > l)
{
- unsigned int l = p - b;
memcpy (buf, b, l);
buf += l;
buf_size -= l;
@@ -208,9 +208,9 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance));
}
- if (buf_size > (p - b))
+ unsigned int l = p - b;
+ if (buf_size > l)
{
- unsigned int l = p - b;
memcpy (buf, b, l);
buf += l;
buf_size -= l;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.cc
index 867438a906a..bbf8ea0f977 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.cc
@@ -152,7 +152,7 @@ hb_buffer_t::shift_forward (unsigned int count)
return true;
}
-void *
+hb_buffer_t::scratch_buffer_t *
hb_buffer_t::get_scratch_buffer (unsigned int *size)
{
have_output = false;
@@ -161,8 +161,9 @@ hb_buffer_t::get_scratch_buffer (unsigned int *size)
out_len = 0;
out_info = info;
- *size = allocated * sizeof (pos[0]);
- return pos;
+ assert ((uintptr_t) pos % sizeof (scratch_buffer_t) == 0);
+ *size = allocated * sizeof (pos[0]) / sizeof (scratch_buffer_t);
+ return (scratch_buffer_t *) (void *) pos;
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.h
index 3086851b012..3086851b012 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-buffer.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-cache-private.hh
index 19b70b7e395..19b70b7e395 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-cache-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-cache-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.cc
index cf24660f798..cf24660f798 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.h
index e445504550b..e445504550b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-common.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.cc
index f780973565b..ba8013604ed 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.cc
@@ -553,11 +553,21 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
} HB_STMT_END;
unsigned int scratch_size;
- char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+ hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
+
+#define ALLOCATE_ARRAY(Type, name, len) \
+ Type *name = (Type *) scratch; \
+ { \
+ unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
+ assert (_consumed <= scratch_size); \
+ scratch += _consumed; \
+ scratch_size -= _consumed; \
+ }
#define utf16_index() var1.u32
- UniChar *pchars = (UniChar *) scratch;
+ ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2);
+
unsigned int chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++) {
hb_codepoint_t c = buffer->info[i].codepoint;
@@ -586,7 +596,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
if (num_features)
{
- unsigned int *log_clusters = (unsigned int *) (pchars + chars_len);
+ ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len);
/* Need log_clusters to assign features. */
chars_len = 0;
@@ -647,17 +657,10 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
buffer->ensure (buffer->len + num_glyphs);
- /* Testing indicates that CTRunGetGlyphsPtr (almost?) always succeeds,
- * and so copying data to our own buffer with CTRunGetGlyphs will be
- * extremely rare. */
-
- unsigned int scratch_size;
- char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+ scratch = buffer->get_scratch_buffer (&scratch_size);
-#define ALLOCATE_ARRAY(Type, name, len) \
- Type *name = (Type *) scratch; \
- scratch += (len) * sizeof ((name)[0]); \
- scratch_size -= (len) * sizeof ((name)[0]);
+ /* Testing indicates that CTRunGetGlyphsPtr, etc (almost?) always
+ * succeed, and so copying data to our own buffer will be rare. */
const CGGlyph* glyphs = CTRunGetGlyphsPtr (run);
if (!glyphs) {
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.h
index c4954fa1b2c..c4954fa1b2c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-coretext.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-coretext.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-deprecated.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-deprecated.h
index 30ae4b1caf7..30ae4b1caf7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-deprecated.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-deprecated.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face-private.hh
index b33be0e5fce..b33be0e5fce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.cc
index ebe8ec5e5d5..ebe8ec5e5d5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.h
index f682c468de5..f682c468de5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-face.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-face.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-fallback-shape.cc
index 1a1fcfbda1e..1a1fcfbda1e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-fallback-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font-private.hh
index 00c0cc3f25f..aa6c515bcb2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font-private.hh
@@ -118,12 +118,12 @@ struct hb_font_t {
/* Convert from parent-font user-space to our user-space */
inline hb_position_t parent_scale_x_distance (hb_position_t v) {
if (unlikely (parent && parent->x_scale != x_scale))
- return v * (int64_t) this->x_scale / this->parent->x_scale;
+ return (hb_position_t) (v * (int64_t) this->x_scale / this->parent->x_scale);
return v;
}
inline hb_position_t parent_scale_y_distance (hb_position_t v) {
if (unlikely (parent && parent->y_scale != y_scale))
- return v * (int64_t) this->y_scale / this->parent->y_scale;
+ return (hb_position_t) (v * (int64_t) this->y_scale / this->parent->y_scale);
return v;
}
inline hb_position_t parent_scale_x_position (hb_position_t v) {
@@ -397,7 +397,7 @@ struct hb_font_t {
}
private:
- inline hb_position_t em_scale (int16_t v, int scale) { return v * (int64_t) scale / face->get_upem (); }
+ inline hb_position_t em_scale (int16_t v, int scale) { return (hb_position_t) (v * (int64_t) scale / face->get_upem ()); }
};
#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.cc
index 855864377e7..855864377e7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.h
index 7273db43eda..7273db43eda 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-font.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-font.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.cc
index 113b0eb8502..44e0b0bc2a5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.cc
@@ -418,8 +418,8 @@ hb_ft_font_create (FT_Face ft_face,
_hb_ft_get_font_funcs (),
ft_face, (hb_destroy_func_t) _do_nothing);
hb_font_set_scale (font,
- ((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16,
- ((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16);
+ (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16),
+ (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16));
hb_font_set_ppem (font,
ft_face->size->metrics.x_ppem,
ft_face->size->metrics.y_ppem);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.h
index 696251e143f..696251e143f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ft.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ft.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.cc
index c35d9966c26..c35d9966c26 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.h
index 63a9d3366c5..63a9d3366c5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-glib.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-glib.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.cc.tmpl
index ca458a3846c..ca458a3846c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.cc.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.cc.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.h.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.h.tmpl
index 6ecda06c2a6..6ecda06c2a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-enums.h.tmpl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-enums.h.tmpl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.cc
index 2451b66291b..2451b66291b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.h
index 4a88d569e8d..4a88d569e8d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject-structs.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject-structs.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject.h
index ea1bd25df82..ea1bd25df82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-gobject.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-gobject.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.cc
index 6fe16ca93cd..60d68d6b57a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.cc
@@ -243,14 +243,9 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
float curradvx = 0., curradvy = 0.;
unsigned int scratch_size;
- char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+ hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
-#define ALLOCATE_ARRAY(Type, name, len) \
- Type *name = (Type *) scratch; \
- scratch += (len) * sizeof ((name)[0]); \
- scratch_size -= (len) * sizeof ((name)[0]);
-
- ALLOCATE_ARRAY (uint32_t, chars, buffer->len);
+ uint32_t *chars = (uint32_t *) scratch;
for (unsigned int i = 0; i < buffer->len; ++i)
chars[i] = buffer->info[i].codepoint;
@@ -276,9 +271,9 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
return false;
}
- scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
- while ((sizeof (hb_graphite2_cluster_t) * buffer->len +
- sizeof (hb_codepoint_t) * glyph_count) > scratch_size)
+ scratch = buffer->get_scratch_buffer (&scratch_size);
+ while ((DIV_CEIL (sizeof (hb_graphite2_cluster_t) * buffer->len, sizeof (*scratch)) +
+ DIV_CEIL (sizeof (hb_codepoint_t) * glyph_count, sizeof (*scratch))) > scratch_size)
{
buffer->ensure (buffer->allocated * 2);
if (unlikely (buffer->in_error)) {
@@ -286,12 +281,23 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan,
gr_seg_destroy (seg);
return false;
}
- scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
+ scratch = buffer->get_scratch_buffer (&scratch_size);
+ }
+
+#define ALLOCATE_ARRAY(Type, name, len) \
+ Type *name = (Type *) scratch; \
+ { \
+ unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
+ assert (_consumed <= scratch_size); \
+ scratch += _consumed; \
+ scratch_size -= _consumed; \
}
ALLOCATE_ARRAY (hb_graphite2_cluster_t, clusters, buffer->len);
ALLOCATE_ARRAY (hb_codepoint_t, gids, glyph_count);
+#undef ALLOCATE_ARRAY
+
memset (clusters, 0, sizeof (clusters[0]) * buffer->len);
hb_codepoint_t *pg = gids;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.h
index 3eae54acbd8..3eae54acbd8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-graphite2.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-graphite2.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.cc
index c177be2c4b2..c177be2c4b2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.h
index f2f35f0f2ce..f2f35f0f2ce 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-icu.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-icu.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-mutex-private.hh
index 0fb21c2e86e..0fb21c2e86e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-mutex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-mutex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-object-private.hh
index 8a9ae34dbee..8a9ae34dbee 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-object-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-object-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-file-private.hh
index 250504ae20b..250504ae20b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-file-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-file-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-type-private.hh
index ee3a21dc3b1..ee3a21dc3b1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-open-type-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-head-table.hh
index 0285f0cf310..0285f0cf310 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-head-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-head-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hhea-table.hh
index 611de8a6665..611de8a6665 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hhea-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hhea-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hmtx-table.hh
index d107cf990a2..d107cf990a2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-hmtx-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-common-private.hh
index 1e75930cda4..367db95574c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-common-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-common-private.hh
@@ -1112,7 +1112,7 @@ struct Device
if (!pixels) return 0;
- return pixels * (int64_t) scale / ppem;
+ return (int) (pixels * (int64_t) scale / ppem);
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gdef-table.hh
index 389cbb9e398..389cbb9e398 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gdef-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gdef-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gpos-table.hh
index 103676b05d3..5e4326ef0c5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gpos-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gpos-table.hh
@@ -1444,12 +1444,6 @@ struct PosLookup : Lookup
return false;
}
- inline hb_is_inplace_context_t::return_t is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (true);
- }
-
inline hb_collect_glyphs_context_t::return_t collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsub-table.hh
index d5f8b311ebf..76b4f33c705 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsub-table.hh
@@ -37,12 +37,6 @@ namespace OT {
struct SingleSubstFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -121,12 +115,6 @@ struct SingleSubstFormat1
struct SingleSubstFormat2
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -263,13 +251,6 @@ struct SingleSubst
struct Sequence
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- /* For len==0 we don't do anything, so it's harmless. */
- return TRACE_RETURN (substitute.len <= 1);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -334,18 +315,6 @@ struct Sequence
struct MultipleSubstFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- /* Some tools generate MultipleSubst with each substitute having length 1!
- * So, check them. */
- unsigned int count = sequence.len;
- for (unsigned int i = 0; i < count; i++)
- if (!(this+sequence[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -471,12 +440,6 @@ typedef ArrayOf<GlyphID> AlternateSet; /* Array of alternate GlyphIDs--in
struct AlternateSubstFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -796,12 +759,6 @@ struct LigatureSet
struct LigatureSubstFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (false);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -950,12 +907,6 @@ struct ExtensionSubst : Extension<ExtensionSubst>
struct ReverseChainSingleSubstFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -1195,13 +1146,6 @@ struct SubstLookup : Lookup
return lookup_type_is_reverse (type);
}
- inline hb_is_inplace_context_t::return_t is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- c->set_recurse_func (dispatch_recurse_func<hb_is_inplace_context_t>);
- return TRACE_RETURN (dispatch (c));
- }
-
inline hb_closure_context_t::return_t closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsubgpos-private.hh
index 16c96fafb59..bdd773e36b9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-gsubgpos-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-gsubgpos-private.hh
@@ -43,56 +43,6 @@ namespace OT {
(&c->debug_depth, c->get_name (), this, HB_FUNC, \
"");
-
-
-#ifndef HB_DEBUG_IS_INPLACE
-#define HB_DEBUG_IS_INPLACE (HB_DEBUG+0)
-#endif
-
-#define TRACE_IS_INPLACE(this) \
- hb_auto_trace_t<HB_DEBUG_IS_INPLACE, bool> trace \
- (&c->debug_depth, c->get_name (), this, HB_FUNC, \
- "");
-
-struct hb_is_inplace_context_t
-{
- inline const char *get_name (void) { return "IS_INPLACE"; }
- static const unsigned int max_debug_depth = HB_DEBUG_IS_INPLACE;
- typedef bool return_t;
- typedef return_t (*recurse_func_t) (hb_is_inplace_context_t *c, unsigned int lookup_index);
- template <typename T>
- inline return_t dispatch (const T &obj) { return obj.is_inplace (this); }
- static return_t default_return_value (void) { return true; }
- bool stop_sublookup_iteration (return_t r) const { return !r; }
-
- return_t recurse (unsigned int lookup_index)
- {
- if (unlikely (nesting_level_left == 0 || !recurse_func))
- return default_return_value ();
-
- nesting_level_left--;
- bool ret = recurse_func (this, lookup_index);
- nesting_level_left++;
- return ret;
- }
-
- hb_face_t *face;
- recurse_func_t recurse_func;
- unsigned int nesting_level_left;
- unsigned int debug_depth;
-
- hb_is_inplace_context_t (hb_face_t *face_,
- unsigned int nesting_level_left_ = MAX_NESTING_LEVEL) :
- face (face_),
- recurse_func (NULL),
- nesting_level_left (nesting_level_left_),
- debug_depth (0) {}
-
- void set_recurse_func (recurse_func_t func) { recurse_func = func; }
-};
-
-
-
#ifndef HB_DEBUG_CLOSURE
#define HB_DEBUG_CLOSURE (HB_DEBUG+0)
#endif
@@ -894,7 +844,10 @@ static inline void ligate_input (hb_apply_context_t *c,
{
_hb_glyph_info_set_lig_props_for_ligature (&buffer->cur(), lig_id, total_component_count);
if (_hb_glyph_info_get_general_category (&buffer->cur()) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
+ {
_hb_glyph_info_set_general_category (&buffer->cur(), HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER);
+ _hb_glyph_info_set_modified_combining_class (&buffer->cur(), 0);
+ }
}
c->replace_glyph_with_ligature (lig_glyph, klass);
@@ -1160,17 +1113,6 @@ static inline bool context_apply_lookup (hb_apply_context_t *c,
struct Rule
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0));
- unsigned int count = lookupCount;
- for (unsigned int i = 0; i < count; i++)
- if (!c->recurse (lookupRecord[i].lookupListIndex))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c, ContextClosureLookupContext &lookup_context) const
{
TRACE_CLOSURE (this);
@@ -1230,16 +1172,6 @@ struct Rule
struct RuleSet
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int num_rules = rule.len;
- for (unsigned int i = 0; i < num_rules; i++)
- if (!(this+rule[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c, ContextClosureLookupContext &lookup_context) const
{
TRACE_CLOSURE (this);
@@ -1296,16 +1228,6 @@ struct RuleSet
struct ContextFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int count = ruleSet.len;
- for (unsigned int i = 0; i < count; i++)
- if (!(this+ruleSet[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -1392,16 +1314,6 @@ struct ContextFormat1
struct ContextFormat2
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int count = ruleSet.len;
- for (unsigned int i = 0; i < count; i++)
- if (!(this+ruleSet[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -1497,17 +1409,6 @@ struct ContextFormat2
struct ContextFormat3
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount);
- unsigned int count = lookupCount;
- for (unsigned int i = 0; i < count; i++)
- if (!c->recurse (lookupRecord[i].lookupListIndex))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -1750,19 +1651,6 @@ static inline bool chain_context_apply_lookup (hb_apply_context_t *c,
struct ChainRule
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack);
- const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input);
- const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
- unsigned int count = lookup.len;
- for (unsigned int i = 0; i < count; i++)
- if (!c->recurse (lookup.array[i].lookupListIndex))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const
{
TRACE_CLOSURE (this);
@@ -1848,16 +1736,6 @@ struct ChainRule
struct ChainRuleSet
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int num_rules = rule.len;
- for (unsigned int i = 0; i < num_rules; i++)
- if (!(this+rule[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const
{
TRACE_CLOSURE (this);
@@ -1911,16 +1789,6 @@ struct ChainRuleSet
struct ChainContextFormat1
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int count = ruleSet.len;
- for (unsigned int i = 0; i < count; i++)
- if (!(this+ruleSet[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -2004,16 +1872,6 @@ struct ChainContextFormat1
struct ChainContextFormat2
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- unsigned int count = ruleSet.len;
- for (unsigned int i = 0; i < count; i++)
- if (!(this+ruleSet[i]).is_inplace (c))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
@@ -2138,20 +1996,6 @@ struct ChainContextFormat2
struct ChainContextFormat3
{
- inline bool is_inplace (hb_is_inplace_context_t *c) const
- {
- TRACE_IS_INPLACE (this);
- const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
- const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input);
- const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead);
-
- unsigned int count = lookup.len;
- for (unsigned int i = 0; i < count; i++)
- if (!c->recurse (lookup.array[i].lookupListIndex))
- return TRACE_RETURN (false);
- return TRACE_RETURN (true);
- }
-
inline void closure (hb_closure_context_t *c) const
{
TRACE_CLOSURE (this);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-jstf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-jstf-table.hh
index 79eb859566a..79eb859566a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-jstf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-jstf-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-private.hh
index 139e33fe7a3..139e33fe7a3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.cc
index 183726e63cf..183726e63cf 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.h
index dfc7f2446f7..dfc7f2446f7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-layout.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-layout.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map-private.hh
index 0e718a6f1f5..0e718a6f1f5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map.cc
index 17dc934e2fa..559193c1bae 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-map.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-map.cc
@@ -181,7 +181,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m)
continue; /* Feature disabled, or not enough bits. */
- bool found = false;
+ hb_bool_t found = false;
unsigned int feature_index[2];
for (unsigned int table_index = 0; table_index < 2; table_index++)
found |= hb_ot_layout_language_find_feature (face,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-maxp-table.hh
index e6d255579c6..e6d255579c6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-maxp-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-name-table.hh
index 07dc0565ca6..07dc0565ca6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-name-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-name-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-fallback.hh
index 6b2b87e3f28..6b2b87e3f28 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-table.hh
index 730a275bf0a..730a275bf0a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic.cc
index 4f6c86e8ee5..4f6c86e8ee5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-arabic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-default.cc
index d6afa0e1c11..d6afa0e1c11 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-default.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-default.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.hh
index 747315b7a2a..747315b7a2a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.rl
index 5c3e734eb33..5c3e734eb33 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-private.hh
index 3de5c203fa3..3de5c203fa3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-table.cc
index 18a022bc507..18a022bc507 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic-table.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic.cc
index 9edefe305dc..9edefe305dc 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-indic.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.hh
index 797bfc5bea0..797bfc5bea0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.rl
index 51d42dd64ab..51d42dd64ab 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar.cc
index a32405a8219..a32405a8219 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-myanmar.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-private.hh
index ac0072ba565..ac0072ba565 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.hh
index 86b7ae7d5ca..86b7ae7d5ca 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.rl
index 46140fc4d5f..46140fc4d5f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea-machine.rl
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea.cc
index da687ed6467..da687ed6467 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-sea.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-sea.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-thai.cc
index 45945339d6b..45945339d6b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-complex-thai.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-complex-thai.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback-private.hh
index ec653513f1b..ec653513f1b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback.cc
index 449b64e5ca7..449b64e5ca7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-fallback.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-fallback.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize-private.hh
index 085d48511d0..085d48511d0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize.cc
index 6531e1b215c..6531e1b215c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-normalize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-normalize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-private.hh
index 817147199fd..817147199fd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape.cc
index 63c36f936fb..63c36f936fb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.cc
index 91ebec76ee3..91ebec76ee3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.h
index 1bf12ab3c09..1bf12ab3c09 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot-tag.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot-tag.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot.h
index 80739063991..80739063991 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ot.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ot.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-private.hh
index 4152e275523..4b72260ed5c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-private.hh
@@ -79,6 +79,9 @@ static inline Type MIN (const Type &a, const Type &b) { return a < b ? a : b; }
template <typename Type>
static inline Type MAX (const Type &a, const Type &b) { return a > b ? a : b; }
+static inline unsigned int DIV_CEIL (const unsigned int a, unsigned int b)
+{ return (a + (b - 1)) / b; }
+
#undef ARRAY_LENGTH
template <typename Type, unsigned int n>
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set-private.hh
index ca2a07b7619..ca2a07b7619 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.cc
index 59a0af46ed4..59a0af46ed4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.h
index bafdae96333..bafdae96333 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-set.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-set.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan-private.hh
index dd014e38d01..dd014e38d01 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.cc
index b44a9e2ab77..b44a9e2ab77 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.h
index 8f54552f90b..8f54552f90b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape-plan.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape-plan.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.cc
index c1b752405e1..c1b752405e1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.h
index 10a35cb517e..10a35cb517e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shape.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shape.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-impl-private.hh
index 7844081e95b..7844081e95b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-impl-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-impl-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-list.hh
index b9c029e58f1..b9c029e58f1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-list.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-private.hh
index 29c4493943d..29c4493943d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper.cc
index 44f718aa702..44f718aa702 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-shaper.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-shaper.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-tt-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-tt-font.cc
index c503a404380..c503a404380 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-tt-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-tt-font.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ucdn.cc
index 7d24559de67..7d24559de67 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-ucdn.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode-private.hh
index dd4d00138e1..dd4d00138e1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.cc
index 5b44913bd35..5b44913bd35 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.h
index 1c4e097b92d..1c4e097b92d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-unicode.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-unicode.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.cc
index 65a63f3be54..fcb1aa65d4a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.cc
@@ -729,18 +729,21 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan,
retry:
unsigned int scratch_size;
- char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size);
-
- /* Allocate char buffers; they all fit */
+ hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
#define ALLOCATE_ARRAY(Type, name, len) \
Type *name = (Type *) scratch; \
- scratch += (len) * sizeof ((name)[0]); \
- scratch_size -= (len) * sizeof ((name)[0]);
+ { \
+ unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
+ assert (_consumed <= scratch_size); \
+ scratch += _consumed; \
+ scratch_size -= _consumed; \
+ }
#define utf16_index() var1.u32
- WCHAR *pchars = (WCHAR *) scratch;
+ ALLOCATE_ARRAY (WCHAR, pchars, buffer->len * 2);
+
unsigned int chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++)
{
@@ -756,7 +759,6 @@ retry:
}
}
- ALLOCATE_ARRAY (WCHAR, wchars, chars_len);
ALLOCATE_ARRAY (WORD, log_clusters, chars_len);
ALLOCATE_ARRAY (SCRIPT_CHARPROP, char_props, chars_len);
@@ -774,12 +776,13 @@ retry:
}
}
- /* On Windows, we don't care about alignment...*/
- unsigned int glyphs_size = scratch_size / (sizeof (WORD) +
- sizeof (SCRIPT_GLYPHPROP) +
- sizeof (int) +
- sizeof (GOFFSET) +
- sizeof (uint32_t));
+ /* All the following types are sized in multiples of sizeof(int). */
+ unsigned int glyphs_size = scratch_size / ((sizeof (WORD) +
+ sizeof (SCRIPT_GLYPHPROP) +
+ sizeof (int) +
+ sizeof (GOFFSET) +
+ sizeof (uint32_t))
+ / sizeof (int));
ALLOCATE_ARRAY (WORD, glyphs, glyphs_size);
ALLOCATE_ARRAY (SCRIPT_GLYPHPROP, glyph_props, glyphs_size);
@@ -812,7 +815,7 @@ retry:
bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
bidi_state.fOverrideDirection = 1;
- hr = funcs->ScriptItemizeOpenType (wchars,
+ hr = funcs->ScriptItemizeOpenType (pchars,
chars_len,
MAX_ITEMS,
&bidi_control,
@@ -887,7 +890,7 @@ retry:
range_char_counts.array,
range_properties.array,
range_properties.len,
- wchars + chars_offset,
+ pchars + chars_offset,
item_chars_len,
glyphs_size - glyphs_offset,
/* out */
@@ -929,7 +932,7 @@ retry:
range_char_counts.array,
range_properties.array,
range_properties.len,
- wchars + chars_offset,
+ pchars + chars_offset,
log_clusters + chars_offset,
char_props + chars_offset,
item_chars_len,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.h
index 51887c8794b..51887c8794b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-uniscribe.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-uniscribe.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-utf-private.hh
index b9a6519d28e..b9a6519d28e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-utf-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-utf-private.hh
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-version.h.in
index 43634f91ce8..43634f91ce8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-version.h.in
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-version.h.in
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-warning.cc
index 4f1f65f5a21..4f1f65f5a21 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb-warning.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb-warning.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb.h
index c5a938a3818..c5a938a3818 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/hb.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/hb.h
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/main.cc
index ff75237b23f..ff75237b23f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/main.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/main.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-buffer-serialize.cc
index 18c46e9524b..18c46e9524b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-buffer-serialize.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-buffer-serialize.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-size-params.cc
index 35d9e3c8e25..35d9e3c8e25 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-size-params.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-size-params.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-would-substitute.cc
index 8ea87cdf397..8ea87cdf397 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test-would-substitute.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test-would-substitute.cc
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test.cc
index a8fe046f34c..a8fe046f34c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.23/src/test.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.24/src/test.cc
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index 1e4e31b914b..11c6b70555b 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], [0.9.23])
+m4_define([harfbuzz_version], [0.9.24])