[subset] Switch to a non-log using implementation of caculating searchRangeZ, entrySelectorZ, and rangeShiftZ in cmap4.

This commit is contained in:
Garret Rieger 2018-05-03 13:00:19 -07:00
parent b0d7971be0
commit 95eb0f3baf
1 changed files with 5 additions and 7 deletions

View File

@ -87,14 +87,12 @@ struct CmapSubtableFormat4
this->format.set (4); this->format.set (4);
this->length.set (get_sub_table_size (segments)); this->length.set (get_sub_table_size (segments));
// 2 * segCount
this->segCountX2.set (segments.len * 2); this->segCountX2.set (segments.len * 2);
// 2 * (2**floor(log2(segCount))) this->entrySelectorZ.set (MAX (1u, _hb_bit_storage (segments.len)) - 1);
this->searchRangeZ.set (2 * (1 << (int) (log (segments.len) / log (2.0)))); this->searchRangeZ.set (2 * (1u << this->entrySelectorZ));
// log2(searchRange/2) this->rangeShiftZ.set (segments.len * 2 > this->searchRangeZ
this->entrySelectorZ.set (log ((double) this->searchRangeZ / 2.0) / log (2.0)); ? 2 * segments.len - this->searchRangeZ
// 2 x segCount - searchRange : 0);
this->rangeShiftZ.set (2 * segments.len - this->searchRangeZ);
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.