diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index 0975d5ac6..bbb9a5953 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -448,7 +448,12 @@ hb_ot_get_glyph_paint (hb_font_t *font, void *user_data) { #ifndef HB_NO_COLOR - font->face->table.COLR->paint_glyph (font, glyph, paint_funcs, paint_data); + if (font->face->table.COLR->paint_glyph (font, glyph, paint_funcs, paint_data)) return; +#endif + if (font->face->table.glyf->paint_glyph (font, glyph, paint_funcs, paint_data)) return; +#ifndef HB_NO_CFF + if (font->face->table.cff1->paint_glyph (font, glyph, paint_funcs, paint_data)) return; + if (font->face->table.cff2->paint_glyph (font, glyph, paint_funcs, paint_data)) return; #endif } #endif