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

[gdef] minor, use dagger in ligature carets fetch

This commit is contained in:
Ebrahim Byagowi 2020-05-23 12:38:07 +04:30
parent 2264a7011f
commit 1fbb788326
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/hb-ot-layout-gdef-table.hh
View File

@ -176,7 +176,7 @@ struct CaretValueFormat3
return_trace (out->deviceTable.serialize_copy (c->serializer, deviceTable, this, c->serializer->to_bias (out), return_trace (out->deviceTable.serialize_copy (c->serializer, deviceTable, this, c->serializer->to_bias (out),
hb_serialize_context_t::Head, c->plan->layout_variation_idx_map)); hb_serialize_context_t::Head, c->plan->layout_variation_idx_map));
} }
void collect_variation_indices (hb_set_t *layout_variation_indices) const void collect_variation_indices (hb_set_t *layout_variation_indices) const
{ (this+deviceTable).collect_variation_indices (layout_variation_indices); } { (this+deviceTable).collect_variation_indices (layout_variation_indices); }
@ -263,20 +263,21 @@ struct CaretValue
struct LigGlyph struct LigGlyph
{ {
unsigned int get_lig_carets (hb_font_t *font, unsigned get_lig_carets (hb_font_t *font,
hb_direction_t direction, hb_direction_t direction,
hb_codepoint_t glyph_id, hb_codepoint_t glyph_id,
const VariationStore &var_store, const VariationStore &var_store,
unsigned int start_offset, unsigned start_offset,
unsigned int *caret_count /* IN/OUT */, unsigned *caret_count /* IN/OUT */,
hb_position_t *caret_array /* OUT */) const hb_position_t *caret_array /* OUT */) const
{ {
if (caret_count) if (caret_count)
{ {
hb_array_t <const OffsetTo<CaretValue>> array = carets.sub_array (start_offset, caret_count); + carets.sub_array (start_offset, caret_count)
unsigned int count = array.length; | hb_map (hb_add (this))
for (unsigned int i = 0; i < count; i++) | hb_map ([&] (const CaretValue &value) { return value.get_caret_value (font, direction, glyph_id, var_store); })
caret_array[i] = (this+array[i]).get_caret_value (font, direction, glyph_id, var_store); | hb_sink (hb_array (caret_array, *caret_count))
;
} }
return carets.len; return carets.len;
@ -294,7 +295,7 @@ struct LigGlyph
return_trace (bool (out->carets)); return_trace (bool (out->carets));
} }
void collect_variation_indices (hb_collect_variation_indices_context_t *c) const void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
{ {
for (const OffsetTo<CaretValue>& offset : carets.iter ()) for (const OffsetTo<CaretValue>& offset : carets.iter ())
@ -585,7 +586,7 @@ struct GDEF
{ {
if (version.to_int () < 0x00010003u || !varStore) return; if (version.to_int () < 0x00010003u || !varStore) return;
if (layout_variation_indices->is_empty ()) return; if (layout_variation_indices->is_empty ()) return;
unsigned new_major = 0, new_minor = 0; unsigned new_major = 0, new_minor = 0;
unsigned last_major = (layout_variation_indices->get_min ()) >> 16; unsigned last_major = (layout_variation_indices->get_min ()) >> 16;
for (unsigned idx : layout_variation_indices->iter ()) for (unsigned idx : layout_variation_indices->iter ())