From d2966d39197090a29c35b635831496e6e5a64cf3 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 22 Sep 2022 23:30:50 +0200 Subject: [PATCH] [ot-font] Try CBDT extents before outline tables Like we do for sbix table. Fixes https://github.com/harfbuzz/harfbuzz/issues/3827 --- src/hb-ot-font.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index 8f05a3961..825b30853 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -348,15 +348,13 @@ hb_ot_get_glyph_extents (hb_font_t *font, #if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR) if (ot_face->sbix->get_extents (font, glyph, extents)) return true; + if (ot_face->CBDT->get_extents (font, glyph, extents)) return true; #endif if (ot_face->glyf->get_extents (font, glyph, extents)) return true; #ifndef HB_NO_OT_FONT_CFF if (ot_face->cff1->get_extents (font, glyph, extents)) return true; if (ot_face->cff2->get_extents (font, glyph, extents)) return true; #endif -#if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR) - if (ot_face->CBDT->get_extents (font, glyph, extents)) return true; -#endif // TODO Hook up side-bearings variations. return false;