From d784da1923ff2ca093f8b0210449731d376b7513 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 14 May 2010 21:37:18 -0400 Subject: [PATCH] Remove the IN_CURINFO() macro --- src/hb-buffer-private.hh | 1 - src/hb-ot-layout-gpos-private.hh | 2 +- src/hb-ot-layout-gsub-private.hh | 4 ++-- src/hb-ot-layout-gsubgpos-private.hh | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh index 223f9351c..fa5ac554f 100644 --- a/src/hb-buffer-private.hh +++ b/src/hb-buffer-private.hh @@ -157,7 +157,6 @@ struct _hb_buffer_t { /* convenience macros */ #define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint) -#define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos]) HB_END_DECLS diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh index d0a01da69..0e97d9374 100644 --- a/src/hb-ot-layout-gpos-private.hh +++ b/src/hb-ot-layout-gpos-private.hh @@ -1517,7 +1517,7 @@ struct PosLookup : Lookup c->nesting_level_left = nesting_level_left; c->lookup_flag = get_flag (); - if (!_hb_ot_layout_check_glyph_property (c->layout->face, IN_CURINFO (), c->lookup_flag, &c->property)) + if (!_hb_ot_layout_check_glyph_property (c->layout->face, &c->buffer->in_string[c->buffer->in_pos], c->lookup_flag, &c->property)) return false; for (unsigned int i = 0; i < get_subtable_count (); i++) diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh index ff3a82eeb..90d5b5816 100644 --- a/src/hb-ot-layout-gsub-private.hh +++ b/src/hb-ot-layout-gsub-private.hh @@ -419,7 +419,7 @@ struct Ligature for ( i = 1; i < count; i++ ) { - while (_hb_ot_layout_skip_mark (c->layout->face, IN_CURINFO (), c->lookup_flag, NULL)) + while (_hb_ot_layout_skip_mark (c->layout->face, &c->buffer->in_string[c->buffer->in_pos], c->lookup_flag, NULL)) c->buffer->add_output_glyph (IN_CURGLYPH (), i, lig_id); (c->buffer->in_pos)++; @@ -793,7 +793,7 @@ struct SubstLookup : Lookup c->nesting_level_left = nesting_level_left; c->lookup_flag = get_flag (); - if (!_hb_ot_layout_check_glyph_property (c->layout->face, IN_CURINFO (), c->lookup_flag, &c->property)) + if (!_hb_ot_layout_check_glyph_property (c->layout->face, &c->buffer->in_string[c->buffer->in_pos], c->lookup_flag, &c->property)) return false; if (unlikely (lookup_type == SubstLookupSubTable::Extension)) diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 734020675..14e769d28 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -203,7 +203,7 @@ static inline bool apply_lookup (hb_apply_context_t *c, */ for (unsigned int i = 0; i < count; /* NOP */) { - while (_hb_ot_layout_skip_mark (c->layout->face, IN_CURINFO (), c->lookup_flag, NULL)) + while (_hb_ot_layout_skip_mark (c->layout->face, &c->buffer->in_string[c->buffer->in_pos], c->lookup_flag, NULL)) { if (unlikely (c->buffer->in_pos == end)) return true;