commit 514564f5444b8ad2f210b1e3d7d66378f7275317
author Behdad Esfahbod <behdad@behdad.org> Thu Jan 29 13:48:48 2015 +0100
committer Behdad Esfahbod <behdad@behdad.org> Wed Feb 25 15:43:27 2015 -0800
tree abc4d70d29b138f490611b37c5e1f3a43d3bb3f5
parent b051be542a8945ec14b0192bbc285f3e1a78c8f1

[layout] Move skippy_iter setup from constructor into init()

src/hb-ot-layout-gsubgpos-private.hh

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 3bdf10c..254abb6 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -337,23 +337,22 @@
 
   struct skipping_iterator_t
   {
-    inline skipping_iterator_t (hb_apply_context_t *c_,
-				bool context_match = false) :
-				 idx (0),
-				 c (c_),
-				 match_glyph_data (NULL),
-				 num_items (0),
-				 end (0)
+    inline void init (hb_apply_context_t *c_, bool context_match = false)
     {
+      c = c_;
+      match_glyph_data = NULL,
+      matcher.set_match_func (NULL, NULL);
       matcher.set_lookup_props (c->lookup_props);
       /* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */
       matcher.set_ignore_zwnj (context_match || c->table_index == 1);
       /* Ignore ZWJ if we are matching GSUB context, or matching GPOS, or if asked to. */
       matcher.set_ignore_zwj (context_match || c->table_index == 1 || c->auto_zwj);
-      if (!context_match)
-	matcher.set_mask (c->lookup_mask);
+      matcher.set_mask (context_match ? -1 : c->lookup_mask);
     }
-    inline void set_lookup_props (unsigned int lookup_props) { matcher.set_lookup_props (lookup_props); }
+    inline void set_lookup_props (unsigned int lookup_props)
+    {
+      matcher.set_lookup_props (lookup_props);
+    }
     inline void set_match_func (matcher_t::match_func_t match_func,
 				const void *match_data,
 				const USHORT glyph_data[])
@@ -705,7 +704,8 @@
 
   hb_buffer_t *buffer = c->buffer;
 
-  hb_apply_context_t::skipping_iterator_t skippy_iter (c);
+  hb_apply_context_t::skipping_iterator_t skippy_iter;
+  skippy_iter.init (c);
   skippy_iter.reset (buffer->idx, count - 1);
   skippy_iter.set_match_func (match_func, match_data, input);
 
@@ -874,7 +874,8 @@
 {
   TRACE_APPLY (NULL);
 
-  hb_apply_context_t::skipping_iterator_t skippy_iter (c, true);
+  hb_apply_context_t::skipping_iterator_t skippy_iter;
+  skippy_iter.init (c, true);
   skippy_iter.reset (c->buffer->backtrack_len (), count);
   skippy_iter.set_match_func (match_func, match_data, backtrack);
 
@@ -894,7 +895,8 @@
 {
   TRACE_APPLY (NULL);
 
-  hb_apply_context_t::skipping_iterator_t skippy_iter (c, true);
+  hb_apply_context_t::skipping_iterator_t skippy_iter;
+  skippy_iter.init (c, true);
   skippy_iter.reset (c->buffer->idx + offset - 1, count);
   skippy_iter.set_match_func (match_func, match_data, lookahead);