Remove the IN_MASK() macro

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 008c90e81c78f8ad1366fe9d7adcc461e581767c..bc08a25482aaea3db3aec842024eba64dce5a61d 100644 (file)
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -161,7 +161,6 @@ struct _hb_buffer_t {
 #define IN_CURGLYPH()          (BUFFER->in_string[BUFFER->in_pos].codepoint)
 #define IN_NEXTGLYPH()         (BUFFER->in_string[BUFFER->in_pos + 1].codepoint)
 #define IN_CURINFO()           (&BUFFER->in_string[BUFFER->in_pos])
-#define IN_MASK(pos)           (BUFFER->in_string[(pos)].mask)
 #define IN_CLUSTER(pos)                (BUFFER->in_string[(pos)].cluster)
 
 HB_END_DECLS

diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index 4e8ba56658a6ce57ff3af6cedc987da94ca036cc..3b77f60d3acbd323ac13f0479f75171d8cd7e38b 100644 (file)
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -1544,7 +1544,7 @@ struct PosLookup : Lookup
     while (buffer->in_pos < buffer->in_length)
     {
       bool done;
-      if (~IN_MASK (buffer->in_pos) & mask)
+      if (~buffer->in_string[buffer->in_pos].mask & mask)
       {
          done = apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL);
          ret |= done;

diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index 54c057d30cc68bb9858de2c1ce300b7440f7237e..e57eb9790e9ff1c287f361fa53eeac189285a1af 100644 (file)
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -836,7 +836,7 @@ struct SubstLookup : Lookup
        buffer->in_pos = 0;
        while (buffer->in_pos < buffer->in_length)
        {
-         if ((~IN_MASK (buffer->in_pos) & mask) &&
+         if ((~buffer->in_string[buffer->in_pos].mask & mask) &&
              apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL))
            ret = true;
          else
@@ -852,7 +852,7 @@ struct SubstLookup : Lookup
        buffer->in_pos = buffer->in_length - 1;
        do
        {
-         if ((~IN_MASK (buffer->in_pos) & mask) &&
+         if ((~buffer->in_string[buffer->in_pos].mask & mask) &&
              apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL))
            ret = true;
          else