From d63a1e089acad9ab9f80addd936d36b6d38fb46a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 14 May 2010 20:30:07 -0400 Subject: [PATCH] Remove the IN_MASK() macro --- src/hb-buffer-private.hh | 1 - src/hb-ot-layout-gpos-private.hh | 2 +- src/hb-ot-layout-gsub-private.hh | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh index 008c90e81..bc08a2548 100644 --- 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 4e8ba5665..3b77f60d3 100644 --- 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 54c057d30..e57eb9790 100644 --- 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