walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[COLR] Respect HB_NO_PAINT 

Fixes https://github.com/harfbuzz/harfbuzz/issues/4204
This commit is contained in:
Behdad Esfahbod 2023-04-24 13:24:47 -06:00
parent 4129061e37
commit d1c00c0470
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OT/Color/COLR/COLR.hh
View File

@ -2213,6 +2213,7 @@ struct COLR
return nullptr; return nullptr;
} }
#ifndef HB_NO_PAINT
bool bool
get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
{ {
@ -2251,6 +2252,7 @@ struct COLR
return ret; return ret;
} }
#endif
bool bool
has_paint_for_glyph (hb_codepoint_t glyph) const has_paint_for_glyph (hb_codepoint_t glyph) const
@ -2274,6 +2276,7 @@ struct COLR
instancer); instancer);
} }
#ifndef HB_NO_PAINT
bool bool
paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, unsigned int palette_index, hb_color_t foreground, bool clip = true) const paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, unsigned int palette_index, hb_color_t foreground, bool clip = true) const
{ {
@ -2360,6 +2363,7 @@ struct COLR
return false; return false;
} }
#endif
protected: protected:
HBUINT16 version; /* Table version number (starts at 0). */ HBUINT16 version; /* Table version number (starts at 0). */

2
src/hb-ot-font.cc
View File

@ -413,7 +413,7 @@ hb_ot_get_glyph_extents (hb_font_t *font,
if (ot_face->sbix->get_extents (font, glyph, extents)) return true; if (ot_face->sbix->get_extents (font, glyph, extents)) return true;
if (ot_face->CBDT->get_extents (font, glyph, extents)) return true; if (ot_face->CBDT->get_extents (font, glyph, extents)) return true;
#endif #endif
#if !defined(HB_NO_COLOR) #if !defined(HB_NO_COLOR) && !defined(HB_NO_PAINT)
if (ot_face->COLR->get_extents (font, glyph, extents)) return true; if (ot_face->COLR->get_extents (font, glyph, extents)) return true;
#endif #endif
if (ot_face->glyf->get_extents (font, glyph, extents)) return true; if (ot_face->glyf->get_extents (font, glyph, extents)) return true;