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

Remove the IN_LIGID() macro

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

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

@ -163,7 +163,6 @@ struct _hb_buffer_t {
#define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos]) #define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos])
#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)
HB_END_DECLS HB_END_DECLS

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

@ -1203,7 +1203,7 @@ 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) && c->buffer->in_string[c->buffer->in_pos].component) if (c->buffer->in_string[j].lig_id && c->buffer->in_string[j].lig_id == c->buffer->in_string[c->buffer->in_pos].lig_id && c->buffer->in_string[c->buffer->in_pos].component)
{ {
comp_index = c->buffer->in_string[c->buffer->in_pos].component - 1; comp_index = c->buffer->in_string[c->buffer->in_pos].component - 1;
if (comp_index >= comp_count) if (comp_index >= comp_count)
@ -1309,7 +1309,7 @@ struct MarkMarkPosFormat1
* 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 ((c->buffer->in_string[j].component != c->buffer->in_string[c->buffer->in_pos].component) || if ((c->buffer->in_string[j].component != c->buffer->in_string[c->buffer->in_pos].component) ||
(c->buffer->in_string[j].component && IN_LIGID (j) != IN_LIGID (c->buffer->in_pos))) (c->buffer->in_string[j].component && c->buffer->in_string[j].lig_id != c->buffer->in_string[c->buffer->in_pos].lig_id))
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) && !c->buffer->in_string[c->buffer->in_pos].component ? c->buffer->in_string[c->buffer->in_pos].lig_id && !c->buffer->in_string[c->buffer->in_pos].component ?
0xFFFF : c->buffer->allocate_lig_id ()); 0xFFFF : c->buffer->allocate_lig_id ());
else else
{ {