From bcdfedbc09c308965239c4b7a750a9cc20618542 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 22 Jan 2022 11:19:05 -0700 Subject: [PATCH] [unsafe-to-concat] Mark as unsafe in kern machine Fixes that last test. Yay! --- src/hb-aat-layout-kerx-table.hh | 1 - src/hb-kern.hh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index 346024f2b..0354b47d5 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -406,7 +406,6 @@ struct KerxSubTableFormat2 accelerator_t accel (*this, c); hb_kern_machine_t machine (accel, header.coverage & header.CrossStream); machine.kern (c->font, c->buffer, c->plan->kern_mask); - c->buffer->set_glyph_flags (HB_GLYPH_FLAG_UNSAFE_TO_CONCAT); return_trace (true); } diff --git a/src/hb-kern.hh b/src/hb-kern.hh index 4e1a35bbc..debfbb1ce 100644 --- a/src/hb-kern.hh +++ b/src/hb-kern.hh @@ -49,6 +49,7 @@ struct hb_kern_machine_t hb_mask_t kern_mask, bool scale = true) const { + buffer->set_glyph_flags (HB_GLYPH_FLAG_UNSAFE_TO_CONCAT); OT::hb_ot_apply_context_t c (1, font, buffer); c.set_lookup_mask (kern_mask); c.set_lookup_props (OT::LookupFlag::IgnoreMarks); @@ -70,7 +71,6 @@ struct hb_kern_machine_t unsigned unsafe_to; if (!skippy_iter.next (&unsafe_to)) { - buffer->unsafe_to_concat (idx, unsafe_to); idx++; continue; }