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

[subset] entrySelectorZ -> entrySelector.

This commit is contained in:
Garret Rieger 2018-05-04 11:23:32 -07:00
parent 7c22f98da7
commit 3be050f075
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,11 @@ struct CmapSubtableFormat4
this->length.set (get_sub_table_size (segments)); this->length.set (get_sub_table_size (segments));
this->segCountX2.set (segments.len * 2); this->segCountX2.set (segments.len * 2);
this->entrySelectorZ.set (MAX (1u, _hb_bit_storage (segments.len)) - 1); this->entrySelector.set (MAX (1u, _hb_bit_storage (segments.len)) - 1);
this->searchRangeZ.set (2 * (1u << this->entrySelectorZ)); this->searchRange.set (2 * (1u << this->entrySelector));
this->rangeShiftZ.set (segments.len * 2 > this->searchRangeZ this->rangeShift.set (segments.len * 2 > this->searchRange
? 2 * segments.len - this->searchRangeZ ? 2 * segments.len - this->searchRange
: 0); : 0);
HBUINT16 *end_count = c->allocate_size<HBUINT16> (HBUINT16::static_size * segments.len); HBUINT16 *end_count = c->allocate_size<HBUINT16> (HBUINT16::static_size * segments.len);
c->allocate_size<HBUINT16> (HBUINT16::static_size); // 2 bytes of padding. c->allocate_size<HBUINT16> (HBUINT16::static_size); // 2 bytes of padding.
@ -479,8 +479,8 @@ struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12>
if (unlikely (!c->extend_min (*this))) return false; if (unlikely (!c->extend_min (*this))) return false;
this->format.set (12); this->format.set (12);
this->reservedZ.set (0); this->reserved.set (0);
this->lengthZ.set (get_sub_table_size (groups)); this->length.set (get_sub_table_size (groups));
return CmapSubtableLongSegmented<CmapSubtableFormat12>::serialize (c, groups); return CmapSubtableLongSegmented<CmapSubtableFormat12>::serialize (c, groups);
} }