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

[subset] COLR, simplify logic and use add_array

This commit is contained in:
ckitagawa 2020-01-29 16:06:55 -05:00
parent fba5128a9e
commit 92f43a99c6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,13 +138,12 @@ struct COLR
void closure_glyphs (hb_codepoint_t glyph, void closure_glyphs (hb_codepoint_t glyph,
hb_set_t *related_ids /* OUT */) const hb_set_t *related_ids /* OUT */) const
{ {
const BaseGlyphRecord &record = (this+baseGlyphsZ).bsearch (numBaseGlyphs, glyph); const BaseGlyphRecord *record = get_base_glyph_record (glyph);
if (!record) return;
hb_array_t<const LayerRecord> all_layers = (this+layersZ).as_array (numLayers); hb_array_t<const LayerRecord> glyph_layers = (this+layersZ).as_array (numLayers).sub_array (record->firstLayerIdx, record->numLayers);
hb_array_t<const LayerRecord> glyph_layers = all_layers.sub_array (record.firstLayerIdx, if (!glyph_layers.length) return;
record.numLayers); related_ids->add_array (&glyph_layers[0].glyphId, glyph_layers.length, LayerRecord::min_size);
for (unsigned int i = 0; i < glyph_layers.length; i++)
hb_set_add (related_ids, glyph_layers[i].glyphId);
} }
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
@ -253,9 +252,7 @@ struct COLR
| hb_map_retains_sorting (hb_second) | hb_map_retains_sorting (hb_second)
; ;
if (unlikely (!base_it.len () || if (unlikely (!base_it || !layer_it || base_it.len () != layer_it.len ()))
!layer_it.len () ||
base_it.len () != layer_it.len ()))
return_trace (false); return_trace (false);
COLR *colr_prime = c->serializer->start_embed<COLR> (); COLR *colr_prime = c->serializer->start_embed<COLR> ();