From 27da6dd89a359f7ef340c646c4cb79373782261d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 14 May 2010 20:17:50 -0400 Subject: [PATCH] Remove OUT_GLYPH() and OUT_INFO() macros --- src/hb-buffer-private.hh | 2 -- src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh index 6d2eec093..42d2476f9 100644 --- a/src/hb-buffer-private.hh +++ b/src/hb-buffer-private.hh @@ -165,8 +165,6 @@ struct _hb_buffer_t { #define IN_CLUSTER(pos) (BUFFER->in_string[(pos)].cluster) #define IN_LIGID(pos) (BUFFER->in_string[(pos)].lig_id) #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 diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 8f339883c..d8aa25225 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -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--) { - 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)) return false; 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; }