From 6215d68b697ccbaf0514520f2c640a0ec3b878c9 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 5 Feb 2025 10:43:24 +0000 Subject: [PATCH] [aat] Minor tweak to logic DELETED_GLYPH can also initiate action. --- src/hb-aat-layout-common.hh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh index f8076aa24..3659e3305 100644 --- a/src/hb-aat-layout-common.hh +++ b/src/hb-aat-layout-common.hh @@ -31,7 +31,6 @@ #include "hb-aat-map.hh" #include "hb-open-type.hh" #include "hb-cache.hh" -#include "hb-bit-page.hh" namespace OT { struct GDEF; @@ -157,7 +156,6 @@ struct LookupSegmentSingle template void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const { - if (first == DELETED_GLYPH) return; if (!filter (value)) return; glyphs.add_range (first, last); } @@ -247,7 +245,6 @@ struct LookupSegmentArray template void collect_glyphs_filtered (set_t &glyphs, const void *base, const filter_t &filter) const { - if (first == DELETED_GLYPH) return; const auto &values = base+valuesZ; for (hb_codepoint_t i = first; i <= last; i++) if (filter (values[i - first])) @@ -348,7 +345,6 @@ struct LookupSingle template void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const { - if (glyph == DELETED_GLYPH) return; if (!filter (value)) return; glyphs.add (glyph); } @@ -708,6 +704,7 @@ struct StateTable // Collect all classes going out from the start state. unsigned num_classes = nClasses; hb_set_t filter; + for (unsigned i = 0; i < num_classes; i++) { const auto &entry = get_entry (STATE_START_OF_TEXT, i);