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

COLRv1: Return bool from paint_glyph 

This will let hb_ot_font_paint_glyph() try
multiple tables in turn.
This commit is contained in:
Matthias Clasen 2022-12-16 23:22:15 -05:00 committed by Behdad Esfahbod
parent 0d890061d1
commit 0b33b35eb0
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hb-ot-color-colr-table.hh
View File

@ -1950,7 +1950,7 @@ struct COLR
return false; return false;
} }
void bool
paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const
{ {
VarStoreInstancer instancer (this+varStore, VarStoreInstancer instancer (this+varStore,
@ -1959,16 +1959,16 @@ struct COLR
hb_paint_context_t c (this, funcs, data, instancer); hb_paint_context_t c (this, funcs, data, instancer);
const Paint *paint = get_base_glyph_paint (glyph);
if (paint)
{
int xscale, yscale; int xscale, yscale;
unsigned int upem; unsigned int upem;
hb_font_get_scale (font, &xscale, &yscale); hb_font_get_scale (font, &xscale, &yscale);
upem = hb_face_get_upem (hb_font_get_face (font)); upem = hb_face_get_upem (hb_font_get_face (font));
const Paint *paint = get_base_glyph_paint (glyph);
if (paint)
{
// COLRv1 glyph
// FIXME handle slant // FIXME handle slant
funcs->push_transform (data, xscale/(float)upem, 0, funcs->push_transform (data, xscale/(float)upem, 0,
0, yscale/(float)upem, 0, yscale/(float)upem,
@ -1976,21 +1976,36 @@ struct COLR
c.recurse (*paint); c.recurse (*paint);
funcs->pop_transform (data); c.funcs->pop_transform (c.data);
return true;
} }
else
const BaseGlyphRecord *record = get_base_glyph_record (glyph);
if (record && ((hb_codepoint_t) record->glyphId == glyph))
{ {
const BaseGlyphRecord &record = (this+baseGlyphsZ).bsearch (numBaseGlyphs, glyph); // COLRv0 glyph
// FIXME handle slant
funcs->push_transform (data, xscale/(float)upem, 0,
0, yscale/(float)upem,
0, 0);
hb_array_t<const LayerRecord> all_layers = (this+layersZ).as_array (numLayers); hb_array_t<const LayerRecord> all_layers = (this+layersZ).as_array (numLayers);
for (unsigned int i = 0; i < record.numLayers; i++) for (unsigned int i = 0; i < record->numLayers; i++)
{ {
const LayerRecord *r = &all_layers[record.firstLayerIdx + i]; const LayerRecord *r = &all_layers[record->firstLayerIdx + i];
c.funcs->push_clip_glyph (c.data, r->glyphId); c.funcs->push_clip_glyph (c.data, r->glyphId);
c.funcs->color (c.data, r->colorIdx, 1.); c.funcs->color (c.data, r->colorIdx, 1.);
c.funcs->pop_clip (c.data); c.funcs->pop_clip (c.data);
} }
c.funcs->pop_transform (c.data);
return true;
} }
return false;
} }
protected: protected: