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

[PairSet] Unify get_size()

This commit is contained in:
Behdad Esfahbod 2023-01-21 15:57:18 -07:00
parent b63159e8bf
commit 891623243c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OT/Layout/GPOS/PairPosFormat1.hh
View File

@ -177,9 +177,7 @@ struct PairPosFormat1_3
hb_pair_t<unsigned, unsigned> compute_effective_value_formats (const hb_set_t& glyphset) const hb_pair_t<unsigned, unsigned> compute_effective_value_formats (const hb_set_t& glyphset) const
{ {
unsigned len1 = valueFormat[0].get_len (); unsigned record_size = PairSet::get_size (valueFormat);
unsigned len2 = valueFormat[1].get_len ();
unsigned record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
unsigned format1 = 0; unsigned format1 = 0;
unsigned format2 = 0; unsigned format2 = 0;

24
src/OT/Layout/GPOS/PairSet.hh
View File

@ -24,6 +24,13 @@ struct PairSet
public: public:
DEFINE_SIZE_MIN (2); DEFINE_SIZE_MIN (2);
static unsigned get_size (const ValueFormat valueFormats[2])
{
unsigned len1 = valueFormats[0].get_len ();
unsigned len2 = valueFormats[1].get_len ();
return Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
}
struct sanitize_closure_t struct sanitize_closure_t
{ {
const ValueFormat *valueFormats; const ValueFormat *valueFormats;
@ -48,9 +55,7 @@ struct PairSet
bool intersects (const hb_set_t *glyphs, bool intersects (const hb_set_t *glyphs,
const ValueFormat *valueFormats) const const ValueFormat *valueFormats) const
{ {
unsigned int len1 = valueFormats[0].get_len (); unsigned record_size = get_size (valueFormats);
unsigned int len2 = valueFormats[1].get_len ();
unsigned int record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
const PairValueRecord *record = &firstPairValueRecord; const PairValueRecord *record = &firstPairValueRecord;
unsigned int count = len; unsigned int count = len;
@ -66,9 +71,7 @@ struct PairSet
void collect_glyphs (hb_collect_glyphs_context_t *c, void collect_glyphs (hb_collect_glyphs_context_t *c,
const ValueFormat *valueFormats) const const ValueFormat *valueFormats) const
{ {
unsigned int len1 = valueFormats[0].get_len (); unsigned record_size = get_size (valueFormats);
unsigned int len2 = valueFormats[1].get_len ();
unsigned int record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
const PairValueRecord *record = &firstPairValueRecord; const PairValueRecord *record = &firstPairValueRecord;
c->input->add_array (&record->secondGlyph, len, record_size); c->input->add_array (&record->secondGlyph, len, record_size);
@ -77,9 +80,7 @@ struct PairSet
void collect_variation_indices (hb_collect_variation_indices_context_t *c, void collect_variation_indices (hb_collect_variation_indices_context_t *c,
const ValueFormat *valueFormats) const const ValueFormat *valueFormats) const
{ {
unsigned len1 = valueFormats[0].get_len (); unsigned record_size = get_size (valueFormats);
unsigned len2 = valueFormats[1].get_len ();
unsigned int record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
const PairValueRecord *record = &firstPairValueRecord; const PairValueRecord *record = &firstPairValueRecord;
unsigned count = len; unsigned count = len;
@ -100,7 +101,7 @@ struct PairSet
hb_buffer_t *buffer = c->buffer; hb_buffer_t *buffer = c->buffer;
unsigned int len1 = valueFormats[0].get_len (); unsigned int len1 = valueFormats[0].get_len ();
unsigned int len2 = valueFormats[1].get_len (); unsigned int len2 = valueFormats[1].get_len ();
unsigned int record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2); unsigned record_size = get_size (valueFormats);
const PairValueRecord *record = hb_bsearch (buffer->info[pos].codepoint, const PairValueRecord *record = hb_bsearch (buffer->info[pos].codepoint,
&firstPairValueRecord, &firstPairValueRecord,
@ -166,8 +167,7 @@ struct PairSet
const hb_map_t &glyph_map = *c->plan->glyph_map; const hb_map_t &glyph_map = *c->plan->glyph_map;
unsigned len1 = valueFormats[0].get_len (); unsigned len1 = valueFormats[0].get_len ();
unsigned len2 = valueFormats[1].get_len (); unsigned record_size = get_size (valueFormats);
unsigned int record_size = Types::HBGlyphID::static_size + Value::static_size * (len1 + len2);
typename PairValueRecord::context_t context = typename PairValueRecord::context_t context =
{ {