Minor rename

diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index 211eb61..527596a 100644 (file)
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -48,7 +48,7 @@ struct SingleSubstFormat1
   {
     for (auto it = (this+coverage).iter (); it; ++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
@@ -137,7 +137,7 @@ struct SingleSubstFormat2
   {
     for (auto it = hb_zip (this+coverage, substitute); it; ++it)
       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
@@ -276,7 +276,7 @@ struct Sequence
   {
     unsigned int count = substitute.len;
     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
@@ -456,7 +456,7 @@ struct AlternateSet
   {
     unsigned int count = alternates.len;
     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
@@ -642,7 +642,7 @@ struct Ligature
     for (unsigned int i = 1; i < count; i++)
       if (!c->glyphs->has (component[i]))
         return;
-    c->out->add (ligGlyph);
+    c->output->add (ligGlyph);
   }
 
   void collect_glyphs (hb_collect_glyphs_context_t *c) const
@@ -1012,7 +1012,7 @@ struct ReverseChainSingleSubstFormat1
     const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
     for (auto it = hb_zip (this+coverage, substitute); it; ++it)
       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

diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 2ce87f9..048486f 100644 (file)
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -92,7 +92,7 @@ struct hb_closure_context_t :
 
   hb_face_t *face;
   hb_set_t *glyphs;
-  hb_set_t out[1];
+  hb_set_t output[1];
   recurse_func_t recurse_func;
   unsigned int nesting_level_left;
   unsigned int debug_depth;
@@ -114,8 +114,8 @@ struct hb_closure_context_t :
 
   void flush ()
   {
-    hb_set_union (glyphs, out);
-    hb_set_clear (out);
+    hb_set_union (glyphs, output);
+    hb_set_clear (output);
   }
 
   private: