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

[subset] Change serialize_rangeoffset_glyid back to using iterator.

This commit is contained in:
Garret Rieger 2022-04-29 23:30:32 +00:00
parent c66fd50c26
commit 6922a2561f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,14 +285,16 @@ 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,
const hb_vector_t<hb_pair_t<hb_codepoint_t, hb_codepoint_t>>& cp_to_gid_vector, Iterator it,
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 {cp_to_gid_vector.iter()}; hb_hashmap_t<hb_codepoint_t, hb_codepoint_t> cp_to_gid { it };
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;
@ -330,8 +332,10 @@ 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; // TODO(grieger): does pre-alloc make this faster?
+ format4_iter | hb_sink (cp_to_gid); hb_vector_t<hb_pair_t<hb_codepoint_t, hb_codepoint_t>> cp_to_gid {
format4_iter
};
//serialize endCode[], startCode[], idDelta[] //serialize endCode[], startCode[], idDelta[]
HBUINT16* endCode = c->start_embed<HBUINT16> (); HBUINT16* endCode = c->start_embed<HBUINT16> ();
@ -343,7 +347,7 @@ struct CmapSubtableFormat4
HBINT16 *idDelta = ((HBINT16*)startCode) + segcount; HBINT16 *idDelta = ((HBINT16*)startCode) + segcount;
HBUINT16 *idRangeOffset = serialize_rangeoffset_glyid (c, HBUINT16 *idRangeOffset = serialize_rangeoffset_glyid (c,
cp_to_gid, cp_to_gid.iter (),
endCode, endCode,
startCode, startCode,
idDelta, idDelta,