walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the IN_MASK() macro

This commit is contained in:
Behdad Esfahbod 2010-05-14 20:30:07 -04:00
parent 89e2834dab
commit d63a1e089a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-buffer-private.hh
View File

@ -161,7 +161,6 @@ struct _hb_buffer_t {
#define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint) #define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint)
#define IN_NEXTGLYPH() (BUFFER->in_string[BUFFER->in_pos + 1].codepoint) #define IN_NEXTGLYPH() (BUFFER->in_string[BUFFER->in_pos + 1].codepoint)
#define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos]) #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) #define IN_CLUSTER(pos) (BUFFER->in_string[(pos)].cluster)
HB_END_DECLS HB_END_DECLS

2
src/hb-ot-layout-gpos-private.hh
View File

@ -1544,7 +1544,7 @@ struct PosLookup : Lookup
while (buffer->in_pos < buffer->in_length) while (buffer->in_pos < buffer->in_length)
{ {
bool done; 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); done = apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL);
ret |= done; ret |= done;

4
src/hb-ot-layout-gsub-private.hh
View File

@ -836,7 +836,7 @@ struct SubstLookup : Lookup
buffer->in_pos = 0; buffer->in_pos = 0;
while (buffer->in_pos < buffer->in_length) 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)) apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL))
ret = true; ret = true;
else else
@ -852,7 +852,7 @@ struct SubstLookup : Lookup
buffer->in_pos = buffer->in_length - 1; buffer->in_pos = buffer->in_length - 1;
do 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)) apply_once (layout, buffer, NO_CONTEXT, MAX_NESTING_LEVEL))
ret = true; ret = true;
else else