提交 ede1a71b 编写于 作者: B Behdad Esfahbod

Minor rename

上级 93551669
...@@ -48,7 +48,7 @@ struct SingleSubstFormat1 ...@@ -48,7 +48,7 @@ struct SingleSubstFormat1
{ {
for (auto it = (this+coverage).iter (); it; ++it) for (auto it = (this+coverage).iter (); it; ++it)
if (c->glyphs->has (*it)) if (c->glyphs->has (*it))
c->out->add ((*it + deltaGlyphID) & 0xFFFFu); c->output->add ((*it + deltaGlyphID) & 0xFFFFu);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
...@@ -137,7 +137,7 @@ struct SingleSubstFormat2 ...@@ -137,7 +137,7 @@ struct SingleSubstFormat2
{ {
for (auto it = hb_zip (this+coverage, substitute); it; ++it) for (auto it = hb_zip (this+coverage, substitute); it; ++it)
if (c->glyphs->has (it->first)) if (c->glyphs->has (it->first))
c->out->add (it->second); c->output->add (it->second);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
...@@ -276,7 +276,7 @@ struct Sequence ...@@ -276,7 +276,7 @@ struct Sequence
{ {
unsigned int count = substitute.len; unsigned int count = substitute.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
c->out->add (substitute[i]); c->output->add (substitute[i]);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
...@@ -456,7 +456,7 @@ struct AlternateSet ...@@ -456,7 +456,7 @@ struct AlternateSet
{ {
unsigned int count = alternates.len; unsigned int count = alternates.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
c->out->add (alternates[i]); c->output->add (alternates[i]);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
...@@ -642,7 +642,7 @@ struct Ligature ...@@ -642,7 +642,7 @@ struct Ligature
for (unsigned int i = 1; i < count; i++) for (unsigned int i = 1; i < count; i++)
if (!c->glyphs->has (component[i])) if (!c->glyphs->has (component[i]))
return; return;
c->out->add (ligGlyph); c->output->add (ligGlyph);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
...@@ -1012,7 +1012,7 @@ struct ReverseChainSingleSubstFormat1 ...@@ -1012,7 +1012,7 @@ struct ReverseChainSingleSubstFormat1
const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead); const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
for (auto it = hb_zip (this+coverage, substitute); it; ++it) for (auto it = hb_zip (this+coverage, substitute); it; ++it)
if (c->glyphs->has (it->first)) if (c->glyphs->has (it->first))
c->out->add (it->second); c->output->add (it->second);
} }
void collect_glyphs (hb_collect_glyphs_context_t *c) const void collect_glyphs (hb_collect_glyphs_context_t *c) const
......
...@@ -92,7 +92,7 @@ struct hb_closure_context_t : ...@@ -92,7 +92,7 @@ struct hb_closure_context_t :
hb_face_t *face; hb_face_t *face;
hb_set_t *glyphs; hb_set_t *glyphs;
hb_set_t out[1]; hb_set_t output[1];
recurse_func_t recurse_func; recurse_func_t recurse_func;
unsigned int nesting_level_left; unsigned int nesting_level_left;
unsigned int debug_depth; unsigned int debug_depth;
...@@ -114,8 +114,8 @@ struct hb_closure_context_t : ...@@ -114,8 +114,8 @@ struct hb_closure_context_t :
void flush () void flush ()
{ {
hb_set_union (glyphs, out); hb_set_union (glyphs, output);
hb_set_clear (out); hb_set_clear (output);
} }
private: private:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册