Fix a few more -Wshadow-local warnings
https://bugzilla.mozilla.org/show_bug.cgi?id=1215894
This commit is contained in:
parent
b90cb366d7
commit
6f932bc8f9
|
@ -1251,10 +1251,10 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
|
||||||
{
|
{
|
||||||
last_syllable = syllable;
|
last_syllable = syllable;
|
||||||
|
|
||||||
hb_glyph_info_t info = dottedcircle;
|
hb_glyph_info_t ginfo = dottedcircle;
|
||||||
info.cluster = buffer->cur().cluster;
|
ginfo.cluster = buffer->cur().cluster;
|
||||||
info.mask = buffer->cur().mask;
|
ginfo.mask = buffer->cur().mask;
|
||||||
info.syllable() = buffer->cur().syllable();
|
ginfo.syllable() = buffer->cur().syllable();
|
||||||
/* TODO Set glyph_props? */
|
/* TODO Set glyph_props? */
|
||||||
|
|
||||||
/* Insert dottedcircle after possible Repha. */
|
/* Insert dottedcircle after possible Repha. */
|
||||||
|
@ -1263,7 +1263,7 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
|
||||||
buffer->cur().indic_category() == OT_Repha)
|
buffer->cur().indic_category() == OT_Repha)
|
||||||
buffer->next_glyph ();
|
buffer->next_glyph ();
|
||||||
|
|
||||||
buffer->output_info (info);
|
buffer->output_info (ginfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
buffer->next_glyph ();
|
buffer->next_glyph ();
|
||||||
|
|
|
@ -455,12 +455,12 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
|
||||||
{
|
{
|
||||||
last_syllable = syllable;
|
last_syllable = syllable;
|
||||||
|
|
||||||
hb_glyph_info_t info = dottedcircle;
|
hb_glyph_info_t ginfo = dottedcircle;
|
||||||
info.cluster = buffer->cur().cluster;
|
ginfo.cluster = buffer->cur().cluster;
|
||||||
info.mask = buffer->cur().mask;
|
ginfo.mask = buffer->cur().mask;
|
||||||
info.syllable() = buffer->cur().syllable();
|
ginfo.syllable() = buffer->cur().syllable();
|
||||||
|
|
||||||
buffer->output_info (info);
|
buffer->output_info (ginfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
buffer->next_glyph ();
|
buffer->next_glyph ();
|
||||||
|
|
|
@ -513,10 +513,10 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
|
||||||
{
|
{
|
||||||
last_syllable = syllable;
|
last_syllable = syllable;
|
||||||
|
|
||||||
hb_glyph_info_t info = dottedcircle;
|
hb_glyph_info_t ginfo = dottedcircle;
|
||||||
info.cluster = buffer->cur().cluster;
|
ginfo.cluster = buffer->cur().cluster;
|
||||||
info.mask = buffer->cur().mask;
|
ginfo.mask = buffer->cur().mask;
|
||||||
info.syllable() = buffer->cur().syllable();
|
ginfo.syllable() = buffer->cur().syllable();
|
||||||
/* TODO Set glyph_props? */
|
/* TODO Set glyph_props? */
|
||||||
|
|
||||||
/* Insert dottedcircle after possible Repha. */
|
/* Insert dottedcircle after possible Repha. */
|
||||||
|
@ -525,7 +525,7 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
|
||||||
buffer->cur().use_category() == USE_R)
|
buffer->cur().use_category() == USE_R)
|
||||||
buffer->next_glyph ();
|
buffer->next_glyph ();
|
||||||
|
|
||||||
buffer->output_info (info);
|
buffer->output_info (ginfo);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
buffer->next_glyph ();
|
buffer->next_glyph ();
|
||||||
|
|
Loading…
Reference in New Issue