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

Remove IN_COMPONENT() macro

This commit is contained in:
Behdad Esfahbod 2010-05-14 20:25:04 -04:00
parent 27da6dd89a
commit 4a871041f4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,6 @@ struct _hb_buffer_t {
#define IN_MASK(pos) (BUFFER->in_string[(pos)].mask) #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)
#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)
HB_END_DECLS HB_END_DECLS

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

@ -1203,9 +1203,9 @@ struct MarkLigPosFormat1
* is identical to the ligature ID of the found ligature. If yes, we * is identical to the ligature ID of the found ligature. If yes, we
* can directly use the component index. If not, we attach the mark * can directly use the component index. If not, we attach the mark
* glyph to the last component of the ligature. */ * glyph to the last component of the ligature. */
if (IN_LIGID (j) && IN_LIGID (j) == IN_LIGID (c->buffer->in_pos) && IN_COMPONENT (c->buffer->in_pos)) if (IN_LIGID (j) && IN_LIGID (j) == IN_LIGID (c->buffer->in_pos) && c->buffer->in_string[c->buffer->in_pos].component)
{ {
comp_index = IN_COMPONENT (c->buffer->in_pos) - 1; comp_index = c->buffer->in_string[c->buffer->in_pos].component - 1;
if (comp_index >= comp_count) if (comp_index >= comp_count)
comp_index = comp_count - 1; comp_index = comp_count - 1;
} }
@ -1308,8 +1308,8 @@ struct MarkMarkPosFormat1
/* Two marks match only if they belong to the same base, or same component /* Two marks match only if they belong to the same base, or same component
* of the same ligature. That is, the component numbers must match, and * of the same ligature. That is, the component numbers must match, and
* if those are non-zero, the ligid number should also match. */ * if those are non-zero, the ligid number should also match. */
if ((IN_COMPONENT (j) != IN_COMPONENT (c->buffer->in_pos)) || if ((c->buffer->in_string[j].component != c->buffer->in_string[c->buffer->in_pos].component) ||
(IN_COMPONENT (j) && IN_LIGID (j) != IN_LIGID (c->buffer->in_pos))) (c->buffer->in_string[j].component && IN_LIGID (j) != IN_LIGID (c->buffer->in_pos)))
return false; return false;
unsigned int mark2_index = (this+mark2Coverage) (IN_GLYPH (j)); unsigned int mark2_index = (this+mark2Coverage) (IN_GLYPH (j));

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

@ -403,7 +403,7 @@ struct Ligature
c->buffer->add_output_glyphs_be16 (i, c->buffer->add_output_glyphs_be16 (i,
1, (const uint16_t *) &ligGlyph, 1, (const uint16_t *) &ligGlyph,
0, 0,
IN_LIGID (c->buffer->in_pos) && !IN_COMPONENT (c->buffer->in_pos) ? IN_LIGID (c->buffer->in_pos) && !c->buffer->in_string[c->buffer->in_pos].component ?
0xFFFF : c->buffer->allocate_lig_id ()); 0xFFFF : c->buffer->allocate_lig_id ());
else else
{ {