diff options
author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-12-23 23:28:02 +0200 |
---|---|---|
committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-12-27 10:38:37 +0200 |
commit | 86006ce476287e8401949080b32e39f75f42a373 (patch) | |
tree | 94d6371d78f33c20991b015a4473d5cee5eecf6b /thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc | |
parent | ef4e625918f4431392517e450c3480679d00d4a0 (diff) |
HarfBuzz: Update to upstream version 2.7.4
Diffstat (limited to 'thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc')
-rw-r--r-- | thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc b/thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc index 50b5829c4a..3eabae1b45 100644 --- a/thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc +++ b/thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc @@ -373,7 +373,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan, /* Second round, reorder (inplace) */ - if (!all_simple) + if (!all_simple && buffer->message(font, "start reorder")) { count = buffer->len; for (unsigned int i = 0; i < count; i++) @@ -399,6 +399,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan, i = end; } + (void) buffer->message(font, "end reorder"); } if (buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_CGJ) { @@ -408,7 +409,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan, */ for (unsigned int i = 1; i + 1 < buffer->len; i++) if (buffer->info[i].codepoint == 0x034Fu/*CGJ*/ && - info_cc(buffer->info[i-1]) <= info_cc(buffer->info[i+1])) + (info_cc(buffer->info[i+1]) == 0 || info_cc(buffer->info[i-1]) <= info_cc(buffer->info[i+1]))) { _hb_glyph_info_unhide (&buffer->info[i]); } |