diff options
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src')
6 files changed, 83 insertions, 8 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index da10d70ac27..b21e5973a13 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,63 @@ +commit cd5c6cd0419ac5e4de975d6c476fb760bf06d2ce +Author: Khaled Hosny <khaled@aliftype.com> +Date: Mon Nov 8 06:59:55 2021 +0200 + + 3.1.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + meson.build | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 11 insertions(+), 4 deletions(-) + +commit 1e07d42aa6259f73aed09f25dd37993974b9b366 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sun Nov 7 01:19:42 2021 -0400 + + Typo fix + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1fd7fd98235649115bba7407f2a2b977bf86733c +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sat Nov 6 10:18:20 2021 -0400 + + Cosmetics: Avoid confusing indentation + + This line had me confused for a second because + the condition looked like a cast and the if just + looked misplaced. Add a line break to prevent + such confusion. + + src/hb-ot-layout.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3471f8f69e25ffebe96dc55173096cedc738ca6f +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sat Nov 6 10:17:20 2021 -0400 + + docs: Clarify a doc comment + + Reword the docs for hb_ot_layout_script_select_language and + be a bit more specific about the returned index. + + src/hb-ot-layout.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 07dc34bdaf977a3be97ab5a68455ed7a67f80a06 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Fri Nov 5 14:45:20 2021 -0700 + + [mutex] Try work around GCC cast-align error/warning + + Shouldn't be needed because of the alignas(). Oh well... + + Might fix https://github.com/harfbuzz/harfbuzz/issues/3283 + + src/hb-mutex.hh | 3 +++ + 1 file changed, 3 insertions(+) + commit 77eeec53a917554a2766a7cb1687607841282777 Author: Khaled Hosny <khaled@aliftype.com> Date: Wed Nov 3 23:31:03 2021 +0200 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 5fbdca8b123..da7d8db1d6f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,10 @@ +Overview of changes leading to 3.1.1 +Wednesday, November 8, 2021 +==================================== +- Work around GCC cast-align error/warning on some platforms. (Behdad Esfahbod) +- Documentation improvements. (Matthias Clasen) + + Overview of changes leading to 3.1.0 Wednesday, November 3, 2021 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index 80e92b9696c..0acbba364f5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [3.1.0], + [3.1.1], [https://github.com/harfbuzz/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/meson.build b/Build/source/libs/harfbuzz/harfbuzz-src/meson.build index d5487218263..cd7acff249f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/meson.build +++ b/Build/source/libs/harfbuzz/harfbuzz-src/meson.build @@ -1,6 +1,6 @@ project('harfbuzz', 'c', 'cpp', meson_version: '>= 0.52.0', - version: '3.1.0', + version: '3.1.1', default_options: [ 'cpp_rtti=false', # Just to support msvc, we are passing -fno-exceptions also anyway 'cpp_std=c++11', diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh index 4e135027f73..6914b224502 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh @@ -97,10 +97,13 @@ struct hb_mutex_t /* Create space for, but do not initialize m. */ alignas(hb_mutex_impl_t) char m[sizeof (hb_mutex_impl_t)]; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-align" void init () { hb_mutex_impl_init ((hb_mutex_impl_t *) m); } void lock () { hb_mutex_impl_lock ((hb_mutex_impl_t *) m); } void unlock () { hb_mutex_impl_unlock ((hb_mutex_impl_t *) m); } void fini () { hb_mutex_impl_finish ((hb_mutex_impl_t *) m); } +#pragma GCC diagnostic pop }; struct hb_lock_t diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc index 1e446c66ff4..fbdedd0e209 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc @@ -613,7 +613,7 @@ hb_ot_layout_table_get_feature_tags (hb_face_t *face, * hb_ot_layout_table_find_feature: * @face: #hb_face_t to work upon * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS - * @feature_tag: The #hb_tag_t og the requested feature tag + * @feature_tag: The #hb_tag_t of the requested feature tag * @feature_index: (out): The index of the requested feature * * Fetches the index for a given feature tag in the specified face's GSUB table @@ -717,10 +717,14 @@ hb_ot_layout_script_find_language (hb_face_t *face, * @language_tags: The array of language tags * @language_index: (out): The index of the requested language * - * Fetches the index of a given language tag in the specified face's GSUB table - * or GPOS table, underneath the specified script index. + * Fetches the index of the first language tag fom @language_tags that is present + * in the specified face's GSUB or GPOS table, underneath the specified script + * index. * - * Return value: %true if the language tag is found, %false otherwise + * If none of the given language tags is found, %false is returned and + * @language_index is set to the default language index. + * + * Return value: %true if one of the given language tags is found, %false otherwise * * Since: 2.0.0 **/ @@ -746,7 +750,8 @@ hb_ot_layout_script_select_language (hb_face_t *face, if (s.find_lang_sys_index (HB_OT_TAG_DEFAULT_LANGUAGE, language_index)) return false; - if (language_index) *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX; + if (language_index) + *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX; return false; } @@ -1016,7 +1021,7 @@ struct hb_collect_features_context_t hb_set_t features_set; for (; *features; features++) features_set.add (*features); - + for (unsigned i = 0; i < g.get_feature_count (); i++) { hb_tag_t tag = g.get_feature_tag (i); |