From b38bab86229bc40d9cdf4819d6dc6aab444d0291 Mon Sep 17 00:00:00 2001 From: Eric Muller Date: Tue, 12 Feb 2019 11:41:16 -0800 Subject: [PATCH] Update generation code for hb-ot-shape-complex-vowel-constraints.cc. Remove 'unlikely' --- src/gen-vowel-constraints.py | 3 +++ src/hb-ot-shape-complex-vowel-constraints.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gen-vowel-constraints.py b/src/gen-vowel-constraints.py index e4dc95dfe..afb21d928 100755 --- a/src/gen-vowel-constraints.py +++ b/src/gen-vowel-constraints.py @@ -180,6 +180,9 @@ print ('_hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB print ('\t\t\t\t hb_buffer_t *buffer,') print ('\t\t\t\t hb_font_t *font HB_UNUSED)') print ('{') +print (' if (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)') +print (' return;') +print () print (' /* UGLY UGLY UGLY business of adding dotted-circle in the middle of') print (' * vowel-sequences that look like another vowel. Data for each script') print (' * collected from the USE script development spec.') diff --git a/src/hb-ot-shape-complex-vowel-constraints.cc b/src/hb-ot-shape-complex-vowel-constraints.cc index 919c0305b..e4cf64561 100644 --- a/src/hb-ot-shape-complex-vowel-constraints.cc +++ b/src/hb-ot-shape-complex-vowel-constraints.cc @@ -34,7 +34,7 @@ _hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB_UNUSED, hb_buffer_t *buffer, hb_font_t *font HB_UNUSED) { - if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)) + if (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE) return; /* UGLY UGLY UGLY business of adding dotted-circle in the middle of