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

Remove the IN_CURINFO() macro

This commit is contained in:
Behdad Esfahbod 2010-05-14 21:37:18 -04:00
parent 281f59b4fb
commit d784da1923
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,6 @@ struct _hb_buffer_t {
/* convenience macros */ /* convenience macros */
#define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint) #define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint)
#define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos])
HB_END_DECLS HB_END_DECLS

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

@ -1517,7 +1517,7 @@ struct PosLookup : Lookup
c->nesting_level_left = nesting_level_left; c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag (); 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; return false;
for (unsigned int i = 0; i < get_subtable_count (); i++) for (unsigned int i = 0; i < get_subtable_count (); i++)

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

@ -419,7 +419,7 @@ struct Ligature
for ( i = 1; i < count; i++ ) 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->add_output_glyph (IN_CURGLYPH (), i, lig_id);
(c->buffer->in_pos)++; (c->buffer->in_pos)++;
@ -793,7 +793,7 @@ struct SubstLookup : Lookup
c->nesting_level_left = nesting_level_left; c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag (); 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; return false;
if (unlikely (lookup_type == SubstLookupSubTable::Extension)) if (unlikely (lookup_type == SubstLookupSubTable::Extension))

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

@ -203,7 +203,7 @@ static inline bool apply_lookup (hb_apply_context_t *c,
*/ */
for (unsigned int i = 0; i < count; /* NOP */) 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)) if (unlikely (c->buffer->in_pos == end))
return true; return true;