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

Switch to C style comments.

This commit is contained in:
Garret Rieger 2020-02-25 17:20:05 -08:00
parent 52b6e0baa0
commit 38c6598c1c
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -948,17 +948,19 @@ struct CmapSubtableFormat14
auto src_tbl = reinterpret_cast<const CmapSubtableFormat14*> (src_base); auto src_tbl = reinterpret_cast<const CmapSubtableFormat14*> (src_base);
// Some versions of OTS require that offsets are in order. Due to the use /*
// of push()/pop_pack() serializing the variation records in order results * Some versions of OTS require that offsets are in order. Due to the use
// in the offsets being in reverse order (first record has the largest * of push()/pop_pack() serializing the variation records in order results
// offset). While this is perfectly valid, it will cause some versions of * in the offsets being in reverse order (first record has the largest
// OTS to consider this table bad. * offset). While this is perfectly valid, it will cause some versions of
// * OTS to consider this table bad.
// So to prevent this issue we serialize the variation records in reverse *
// order, so that the offsets are ordered from small to large. Since * So to prevent this issue we serialize the variation records in reverse
// variation records are supposed to be in increasing order of varSelector * order, so that the offsets are ordered from small to large. Since
// we then have to reverse the order of the written variation selector * variation records are supposed to be in increasing order of varSelector
// records after everything is finalized. * we then have to reverse the order of the written variation selector
* records after everything is finalized.
*/
hb_vector_t<hb_pair_t<unsigned, unsigned>> obj_indices; hb_vector_t<hb_pair_t<unsigned, unsigned>> obj_indices;
for (int i = src_tbl->record.len - 1; i >= 0; i--) for (int i = src_tbl->record.len - 1; i >= 0; i--)
{ {
@ -980,11 +982,11 @@ struct CmapSubtableFormat14
(c->length () - table_initpos - CmapSubtableFormat14::min_size) / (c->length () - table_initpos - CmapSubtableFormat14::min_size) /
VariationSelectorRecord::static_size); VariationSelectorRecord::static_size);
// Correct the incorrect write order by reversing the order of the variation /* Correct the incorrect write order by reversing the order of the variation
// records array. records array. */
_reverse_variation_records (); _reverse_variation_records ();
// Now that records are in the right order, we can set up the offsets. /* Now that records are in the right order, we can set up the offsets. */
_add_links_to_variation_records (c, obj_indices); _add_links_to_variation_records (c, obj_indices);
} }
@ -1008,9 +1010,11 @@ struct CmapSubtableFormat14
{ {
for (unsigned i = 0; i < obj_indices.length; i++) for (unsigned i = 0; i < obj_indices.length; i++)
{ {
// Since the record array has been reversed (see comments in copy()) /*
// but obj_indices has not been, the indices at obj_indices[i] * Since the record array has been reversed (see comments in copy())
// are for the variation record at record[j]. * but obj_indices has not been, the indices at obj_indices[i]
* are for the variation record at record[j].
*/
int j = obj_indices.length - 1 - i; int j = obj_indices.length - 1 - i;
c->add_link (record[j].defaultUVS, obj_indices[i].first, this); c->add_link (record[j].defaultUVS, obj_indices[i].first, this);
c->add_link (record[j].nonDefaultUVS, obj_indices[i].second, this); c->add_link (record[j].nonDefaultUVS, obj_indices[i].second, this);