From 3be050f07572d8556726b188668d727e3e7ba643 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Fri, 4 May 2018 11:23:32 -0700 Subject: [PATCH] [subset] entrySelectorZ -> entrySelector. --- src/hb-ot-cmap-table.hh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 40125b05b..dc55c0d79 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -88,11 +88,11 @@ struct CmapSubtableFormat4 this->length.set (get_sub_table_size (segments)); this->segCountX2.set (segments.len * 2); - this->entrySelectorZ.set (MAX (1u, _hb_bit_storage (segments.len)) - 1); - this->searchRangeZ.set (2 * (1u << this->entrySelectorZ)); - this->rangeShiftZ.set (segments.len * 2 > this->searchRangeZ - ? 2 * segments.len - this->searchRangeZ - : 0); + this->entrySelector.set (MAX (1u, _hb_bit_storage (segments.len)) - 1); + this->searchRange.set (2 * (1u << this->entrySelector)); + this->rangeShift.set (segments.len * 2 > this->searchRange + ? 2 * segments.len - this->searchRange + : 0); HBUINT16 *end_count = c->allocate_size (HBUINT16::static_size * segments.len); c->allocate_size (HBUINT16::static_size); // 2 bytes of padding. @@ -479,8 +479,8 @@ struct CmapSubtableFormat12 : CmapSubtableLongSegmented if (unlikely (!c->extend_min (*this))) return false; this->format.set (12); - this->reservedZ.set (0); - this->lengthZ.set (get_sub_table_size (groups)); + this->reserved.set (0); + this->length.set (get_sub_table_size (groups)); return CmapSubtableLongSegmented::serialize (c, groups); }