diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-23 02:21:31 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-23 07:12:53 +0000 |
commit | f2ec2fcd553955335b0795d26cb18c9fe2f58008 (patch) | |
tree | a1245e5c1a25dbe33fb0b15a90e3fbb51ed4ba96 /src/3rdparty/harfbuzz-ng | |
parent | 241ff426eb69cd30fa45cdc91a66b0f5e7688623 (diff) |
Update bundled HarfBuzz to 0.9.40
Change-Id: I88c3608c3f15e39e89a00cfc23c184aebe7097e4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/harfbuzz-ng')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/NEWS | 8 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-buffer.cc | 2 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-common.cc | 8 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-font.cc | 2 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-shape.cc | 2 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-version.h | 4 |
6 files changed, 17 insertions, 9 deletions
diff --git a/src/3rdparty/harfbuzz-ng/NEWS b/src/3rdparty/harfbuzz-ng/NEWS index dbbfbba195..c4950e2620 100644 --- a/src/3rdparty/harfbuzz-ng/NEWS +++ b/src/3rdparty/harfbuzz-ng/NEWS @@ -1,3 +1,11 @@ +Overview of changes leading to 0.9.40 +Friday, March 20, 2015 +===================================== + +- Another hb-coretext crasher fix. Ouch! +- Happy Norouz! + + Overview of changes leading to 0.9.39 Wednesday, March 4, 2015 ===================================== diff --git a/src/3rdparty/harfbuzz-ng/src/hb-buffer.cc b/src/3rdparty/harfbuzz-ng/src/hb-buffer.cc index 942177cbd0..b9fe263ce5 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-buffer.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-buffer.cc @@ -443,7 +443,7 @@ hb_buffer_t::reverse_range (unsigned int start, { unsigned int i, j; - if (start == end - 1) + if (end - start < 2) return; for (i = start, j = end - 1; i < j; i++, j--) { diff --git a/src/3rdparty/harfbuzz-ng/src/hb-common.cc b/src/3rdparty/harfbuzz-ng/src/hb-common.cc index 05a1f9ce19..1516211e96 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-common.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-common.cc @@ -57,7 +57,7 @@ _hb_options_init (void) /** * hb_tag_from_string: - * @str: (array length=len): + * @str: (array length=len) (element-type uint8_t): * @len: * * @@ -115,7 +115,7 @@ const char direction_strings[][4] = { /** * hb_direction_from_string: - * @str: (array length=len): + * @str: (array length=len) (element-type uint8_t): * @len: * * @@ -281,7 +281,7 @@ retry: /** * hb_language_from_string: - * @str: (array length=len): + * @str: (array length=len) (element-type uint8_t): * @len: * * @@ -401,7 +401,7 @@ hb_script_from_iso15924_tag (hb_tag_t tag) /** * hb_script_from_string: - * @s: (array length=len): + * @s: (array length=len) (element-type uint8_t): * @len: * * diff --git a/src/3rdparty/harfbuzz-ng/src/hb-font.cc b/src/3rdparty/harfbuzz-ng/src/hb-font.cc index 4364ca72fb..d42db59855 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-font.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-font.cc @@ -814,7 +814,7 @@ hb_font_glyph_to_string (hb_font_t *font, /** * hb_font_glyph_from_string: * @font: a font. - * @s: (array length=len): + * @s: (array length=len) (element-type uint8_t): * @len: * @glyph: (out): * diff --git a/src/3rdparty/harfbuzz-ng/src/hb-shape.cc b/src/3rdparty/harfbuzz-ng/src/hb-shape.cc index 9a59c08556..4e22c61862 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-shape.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-shape.cc @@ -198,7 +198,7 @@ parse_one_feature (const char **pp, const char *end, hb_feature_t *feature) /** * hb_feature_from_string: - * @str: (array length=len): + * @str: (array length=len) (element-type uint8_t): * @len: * @feature: (out) (optional): * diff --git a/src/3rdparty/harfbuzz-ng/src/hb-version.h b/src/3rdparty/harfbuzz-ng/src/hb-version.h index eacdc598d9..648a46fde7 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-version.h +++ b/src/3rdparty/harfbuzz-ng/src/hb-version.h @@ -38,9 +38,9 @@ HB_BEGIN_DECLS #define HB_VERSION_MAJOR 0 #define HB_VERSION_MINOR 9 -#define HB_VERSION_MICRO 39 +#define HB_VERSION_MICRO 40 -#define HB_VERSION_STRING "0.9.39" +#define HB_VERSION_STRING "0.9.40" #define HB_VERSION_ATLEAST(major,minor,micro) \ ((major)*10000+(minor)*100+(micro) <= \ |