Rename variable

This commit is contained in:
Behdad Esfahbod 2022-01-12 15:07:34 -07:00
parent 96c969c820
commit 9408e0d6d1
1 changed files with 10 additions and 10 deletions

View File

@ -717,33 +717,33 @@ struct hb_ot_apply_context_t :
bool ligature = false, bool ligature = false,
bool component = false) const bool component = false) const
{ {
unsigned int add_in = _hb_glyph_info_get_glyph_props (&buffer->cur()); unsigned int props = _hb_glyph_info_get_glyph_props (&buffer->cur());
add_in |= HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED; props |= HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED;
if (ligature) if (ligature)
{ {
add_in |= HB_OT_LAYOUT_GLYPH_PROPS_LIGATED; props |= HB_OT_LAYOUT_GLYPH_PROPS_LIGATED;
/* In the only place that the MULTIPLIED bit is used, Uniscribe /* In the only place that the MULTIPLIED bit is used, Uniscribe
* seems to only care about the "last" transformation between * seems to only care about the "last" transformation between
* Ligature and Multiple substitutions. Ie. if you ligate, expand, * Ligature and Multiple substitutions. Ie. if you ligate, expand,
* and ligate again, it forgives the multiplication and acts as * and ligate again, it forgives the multiplication and acts as
* if only ligation happened. As such, clear MULTIPLIED bit. * if only ligation happened. As such, clear MULTIPLIED bit.
*/ */
add_in &= ~HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED; props &= ~HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED;
} }
if (component) if (component)
add_in |= HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED; props |= HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED;
if (likely (has_glyph_classes)) if (likely (has_glyph_classes))
{ {
add_in &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE; props &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE;
_hb_glyph_info_set_glyph_props (&buffer->cur(), add_in | gdef.get_glyph_props (glyph_index)); _hb_glyph_info_set_glyph_props (&buffer->cur(), props | gdef.get_glyph_props (glyph_index));
} }
else if (class_guess) else if (class_guess)
{ {
add_in &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE; props &= HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE;
_hb_glyph_info_set_glyph_props (&buffer->cur(), add_in | class_guess); _hb_glyph_info_set_glyph_props (&buffer->cur(), props | class_guess);
} }
else else
_hb_glyph_info_set_glyph_props (&buffer->cur(), add_in); _hb_glyph_info_set_glyph_props (&buffer->cur(), props);
} }
void replace_glyph (hb_codepoint_t glyph_index) const void replace_glyph (hb_codepoint_t glyph_index) const