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

Remove OUT_GLYPH() and OUT_INFO() macros

This commit is contained in:
Behdad Esfahbod 2010-05-14 20:17:50 -04:00
parent cc6ae7ff91
commit 27da6dd89a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,8 +165,6 @@ struct _hb_buffer_t {
#define IN_CLUSTER(pos) (BUFFER->in_string[(pos)].cluster) #define IN_CLUSTER(pos) (BUFFER->in_string[(pos)].cluster)
#define IN_LIGID(pos) (BUFFER->in_string[(pos)].lig_id) #define IN_LIGID(pos) (BUFFER->in_string[(pos)].lig_id)
#define IN_COMPONENT(pos) (BUFFER->in_string[(pos)].component) #define IN_COMPONENT(pos) (BUFFER->in_string[(pos)].component)
#define OUT_GLYPH(pos) (BUFFER->out_string[(pos)].codepoint)
#define OUT_INFO(pos) (&BUFFER->out_string[(pos)])
HB_END_DECLS HB_END_DECLS

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

@ -126,14 +126,14 @@ static inline bool match_backtrack (hb_apply_context_t *c,
for (unsigned int i = 0, j = c->buffer->out_pos - 1; i < count; i++, j--) for (unsigned int i = 0, j = c->buffer->out_pos - 1; i < count; i++, j--)
{ {
while (_hb_ot_layout_skip_mark (c->layout->face, OUT_INFO (j), c->lookup_flag, NULL)) while (_hb_ot_layout_skip_mark (c->layout->face, &c->buffer->out_string[j], c->lookup_flag, NULL))
{ {
if (unlikely (j + 1 == count - i)) if (unlikely (j + 1 == count - i))
return false; return false;
j--; j--;
} }
if (likely (!match_func (OUT_GLYPH (j), backtrack[i], match_data))) if (likely (!match_func (c->buffer->out_string[j].codepoint, backtrack[i], match_data)))
return false; return false;
} }