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

[subset] in cmap4 serialization save cp to gid iter to memory. 

Iterator accesses are slow and it's iterated multiple times.
This commit is contained in:
Garret Rieger 2022-04-29 23:18:53 +00:00
parent 17b98563dc
commit c66fd50c26
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hb-ot-cmap-table.hh
View File

@ -285,17 +285,14 @@ struct CmapSubtableFormat4
return true; return true;
} }
template<typename Iterator,
hb_requires (hb_is_iterator (Iterator))>
HBUINT16* serialize_rangeoffset_glyid (hb_serialize_context_t *c, HBUINT16* serialize_rangeoffset_glyid (hb_serialize_context_t *c,
Iterator it, const hb_vector_t<hb_pair_t<hb_codepoint_t, hb_codepoint_t>>& cp_to_gid_vector,
HBUINT16 *endCode, HBUINT16 *endCode,
HBUINT16 *startCode, HBUINT16 *startCode,
HBINT16 *idDelta, HBINT16 *idDelta,
unsigned segcount) unsigned segcount)
{ {
hb_hashmap_t<hb_codepoint_t, hb_codepoint_t> cp_to_gid; hb_hashmap_t<hb_codepoint_t, hb_codepoint_t> cp_to_gid {cp_to_gid_vector.iter()};
+ it | hb_sink (cp_to_gid);
HBUINT16 *idRangeOffset = c->allocate_size<HBUINT16> (HBUINT16::static_size * segcount); HBUINT16 *idRangeOffset = c->allocate_size<HBUINT16> (HBUINT16::static_size * segcount);
if (unlikely (!c->check_success (idRangeOffset))) return nullptr; if (unlikely (!c->check_success (idRangeOffset))) return nullptr;
@ -333,16 +330,24 @@ struct CmapSubtableFormat4
if (unlikely (!c->extend_min (this))) return; if (unlikely (!c->extend_min (this))) return;
this->format = 4; this->format = 4;
hb_vector_t<hb_pair_t<hb_codepoint_t, hb_codepoint_t>> cp_to_gid;
+ format4_iter | hb_sink (cp_to_gid);
//serialize endCode[], startCode[], idDelta[] //serialize endCode[], startCode[], idDelta[]
HBUINT16* endCode = c->start_embed<HBUINT16> (); HBUINT16* endCode = c->start_embed<HBUINT16> ();
unsigned segcount = serialize_find_segcount (format4_iter); unsigned segcount = serialize_find_segcount (cp_to_gid.iter());
if (unlikely (!serialize_start_end_delta_arrays (c, format4_iter, segcount))) if (unlikely (!serialize_start_end_delta_arrays (c, cp_to_gid.iter(), segcount)))
return; return;
HBUINT16 *startCode = endCode + segcount + 1; HBUINT16 *startCode = endCode + segcount + 1;
HBINT16 *idDelta = ((HBINT16*)startCode) + segcount; HBINT16 *idDelta = ((HBINT16*)startCode) + segcount;
HBUINT16 *idRangeOffset = serialize_rangeoffset_glyid (c, format4_iter, endCode, startCode, idDelta, segcount); HBUINT16 *idRangeOffset = serialize_rangeoffset_glyid (c,
cp_to_gid,
endCode,
startCode,
idDelta,
segcount);
if (unlikely (!c->check_success (idRangeOffset))) return; if (unlikely (!c->check_success (idRangeOffset))) return;
this->length = c->length () - table_initpos; this->length = c->length () - table_initpos;