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

[OT] Match struct with HB's

This commit is contained in:
Behdad Esfahbod 2009-08-01 22:25:04 -04:00
parent 11fbb5487d
commit 6d5bb18e93
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-buffer.c
View File

@ -172,7 +172,7 @@ hb_buffer_add_glyph (hb_buffer_t *buffer,
glyph->cluster = cluster; glyph->cluster = cluster;
glyph->component = 0; glyph->component = 0;
glyph->ligID = 0; glyph->ligID = 0;
glyph->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN; glyph->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
buffer->in_length++; buffer->in_length++;
} }
@ -285,7 +285,7 @@ _hb_buffer_add_output_glyphs (hb_buffer_t *buffer,
info->cluster = cluster; info->cluster = cluster;
info->component = component; info->component = component;
info->ligID = ligID; info->ligID = ligID;
info->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN; info->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
} }
buffer->in_pos += num_in; buffer->in_pos += num_in;
@ -316,7 +316,7 @@ _hb_buffer_add_output_glyph (hb_buffer_t *buffer,
info->component = component; info->component = component;
if (ligID != 0xFFFF) if (ligID != 0xFFFF)
info->ligID = ligID; info->ligID = ligID;
info->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN; info->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
buffer->in_pos++; buffer->in_pos++;
buffer->out_pos++; buffer->out_pos++;

2
src/hb-buffer.h
View File

@ -49,7 +49,7 @@ typedef struct _hb_glyph_info_t {
unsigned int cluster; unsigned int cluster;
unsigned short component; unsigned short component;
unsigned short ligID; unsigned short ligID;
unsigned short gproperty; unsigned int internal;
} hb_glyph_info_t; } hb_glyph_info_t;
typedef struct _hb_glyph_position_t { typedef struct _hb_glyph_position_t {

12
src/hb-ot-layout.cc
View File

@ -182,9 +182,9 @@ _hb_ot_layout_check_glyph_property (hb_ot_layout_t *layout,
{ {
unsigned int property; unsigned int property;
if (ginfo->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN) if (ginfo->internal == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
ginfo->gproperty = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex); ginfo->internal = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
property = ginfo->gproperty; property = ginfo->internal;
if (property_out) if (property_out)
*property_out = property; *property_out = property;
@ -221,9 +221,9 @@ _hb_ot_layout_skip_mark (hb_ot_layout_t *layout,
{ {
unsigned int property; unsigned int property;
if (ginfo->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN) if (ginfo->internal == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
ginfo->gproperty = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex); ginfo->internal = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
property = ginfo->gproperty; property = ginfo->internal;
if (property_out) if (property_out)
*property_out = property; *property_out = property;