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

Add buffer->allocate_lig_id()

This commit is contained in:
Behdad Esfahbod 2010-05-12 23:13:39 -04:00
parent 1ce4dc95db
commit 8951fc2c82
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,8 @@ struct _hb_buffer_t {
/* Other stuff */ /* Other stuff */
unsigned int max_lig_id; unsigned int max_lig_id;
inline unsigned int allocate_lig_id (void) { return max_lig_id++; }
}; };
@ -127,9 +129,6 @@ HB_INTERNAL void
_hb_buffer_replace_glyph (hb_buffer_t *buffer, _hb_buffer_replace_glyph (hb_buffer_t *buffer,
hb_codepoint_t glyph_index); hb_codepoint_t glyph_index);
HB_INTERNAL unsigned short
_hb_buffer_allocate_lig_id (hb_buffer_t *buffer);
#ifndef BUFFER #ifndef BUFFER
#define BUFFER buffer #define BUFFER buffer

6
src/hb-buffer.cc
View File

@ -450,12 +450,6 @@ _hb_buffer_replace_glyph (hb_buffer_t *buffer,
_hb_buffer_add_output_glyph (buffer, glyph_index, 0xFFFF, 0xFFFF); _hb_buffer_add_output_glyph (buffer, glyph_index, 0xFFFF, 0xFFFF);
} }
unsigned short
_hb_buffer_allocate_lig_id (hb_buffer_t *buffer)
{
return ++buffer->max_lig_id;
}
unsigned int unsigned int
hb_buffer_get_length (hb_buffer_t *buffer) hb_buffer_get_length (hb_buffer_t *buffer)

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

@ -404,10 +404,10 @@ struct Ligature
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 : _hb_buffer_allocate_lig_id (context->buffer)); 0xFFFF : context->buffer->allocate_lig_id ());
else else
{ {
unsigned int lig_id = _hb_buffer_allocate_lig_id (context->buffer); unsigned int lig_id = context->buffer->allocate_lig_id ();
_hb_buffer_add_output_glyph (context->buffer, ligGlyph, 0xFFFF, lig_id); _hb_buffer_add_output_glyph (context->buffer, 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