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

Add a few more buffer convenience methods

This commit is contained in:
Behdad Esfahbod 2010-05-13 13:22:24 -04:00
parent 11a81612e5
commit 72071a8afa
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,18 @@ struct _hb_buffer_t {
inline void swap (void) { _hb_buffer_swap (this); } inline void swap (void) { _hb_buffer_swap (this); }
inline void clear_output (void) { _hb_buffer_clear_output (this); } inline void clear_output (void) { _hb_buffer_clear_output (this); }
inline void next_glyph (void) { _hb_buffer_next_glyph (this); } inline void next_glyph (void) { _hb_buffer_next_glyph (this); }
inline void add_output_glyphs (unsigned int num_in,
unsigned int num_out,
const hb_codepoint_t *glyph_data,
unsigned short component,
unsigned short ligID)
{ _hb_buffer_add_output_glyphs (this, num_in, num_out, glyph_data, component, ligID); }
inline void add_output_glyphs_be16 (unsigned int num_in,
unsigned int num_out,
const uint16_t *glyph_data_be,
unsigned short component,
unsigned short ligID)
{ _hb_buffer_add_output_glyphs_be16 (this, num_in, num_out, glyph_data_be, component, ligID); }
inline void add_output_glyph (hb_codepoint_t glyph_index, inline void add_output_glyph (hb_codepoint_t glyph_index,
unsigned short component = 0xFFFF, unsigned short component = 0xFFFF,
unsigned short ligID = 0xFFFF) unsigned short ligID = 0xFFFF)

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

@ -166,9 +166,9 @@ struct Sequence
if (unlikely (!substitute.len)) if (unlikely (!substitute.len))
return false; return false;
_hb_buffer_add_output_glyphs_be16 (context->buffer, 1, context->buffer->add_output_glyphs_be16 (1,
substitute.len, (const uint16_t *) substitute.array, substitute.len, (const uint16_t *) substitute.array,
0xFFFF, 0xFFFF); 0xFFFF, 0xFFFF);
/* This is a guess only ... */ /* This is a guess only ... */
if (_hb_ot_layout_has_new_glyph_classes (context->layout->face)) if (_hb_ot_layout_has_new_glyph_classes (context->layout->face))
@ -400,15 +400,15 @@ struct Ligature
if (j == context->buffer->in_pos + i) /* No input glyphs skipped */ if (j == context->buffer->in_pos + i) /* No input glyphs skipped */
/* We don't use a new ligature ID if there are no skipped /* We don't use a new ligature ID if there are no skipped
glyphs and the ligature already has an ID. */ glyphs and the ligature already has an ID. */
_hb_buffer_add_output_glyphs_be16 (context->buffer, i, context->buffer->add_output_glyphs_be16 (i,
1, (const uint16_t *) &ligGlyph, 1, (const uint16_t *) &ligGlyph,
0, 0,
IN_LIGID (context->buffer->in_pos) && !IN_COMPONENT (context->buffer->in_pos) ? IN_LIGID (context->buffer->in_pos) && !IN_COMPONENT (context->buffer->in_pos) ?
0xFFFF : context->buffer->allocate_lig_id ()); 0xFFFF : context->buffer->allocate_lig_id ());
else else
{ {
unsigned int lig_id = context->buffer->allocate_lig_id (); unsigned int lig_id = context->buffer->allocate_lig_id ();
_hb_buffer_add_output_glyph (context->buffer, ligGlyph, 0xFFFF, lig_id); context->buffer->add_output_glyph (ligGlyph, 0xFFFF, lig_id);
/* Now we must do a second loop to copy the skipped glyphs to /* Now we must do a second loop to copy the skipped glyphs to
`out' and assign component values to it. We start with the `out' and assign component values to it. We start with the
@ -420,7 +420,7 @@ struct Ligature
for ( i = 1; i < count; i++ ) for ( i = 1; i < count; i++ )
{ {
while (_hb_ot_layout_skip_mark (context->layout->face, IN_CURINFO (), context->lookup_flag, NULL)) while (_hb_ot_layout_skip_mark (context->layout->face, IN_CURINFO (), context->lookup_flag, NULL))
_hb_buffer_add_output_glyph (context->buffer, IN_CURGLYPH (), i, lig_id); context->buffer->add_output_glyph (IN_CURGLYPH (), i, lig_id);
(context->buffer->in_pos)++; (context->buffer->in_pos)++;
} }