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

Optimize positioning direction calculations 

It makes the binary smaller AND faster.  Yumm!
This commit is contained in:
Behdad Esfahbod 2015-11-04 19:28:17 -08:00
parent e3e4bb011a
commit bee901b38e
2 changed files with 68 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hb-font-private.hh
View File

@ -298,6 +298,26 @@ struct hb_font_t {
} }
} }
inline void add_glyph_h_origin (hb_codepoint_t glyph,
hb_position_t *x, hb_position_t *y)
{
hb_position_t origin_x, origin_y;
get_glyph_h_origin (glyph, &origin_x, &origin_y);
*x += origin_x;
*y += origin_y;
}
inline void add_glyph_v_origin (hb_codepoint_t glyph,
hb_position_t *x, hb_position_t *y)
{
hb_position_t origin_x, origin_y;
get_glyph_v_origin (glyph, &origin_x, &origin_y);
*x += origin_x;
*y += origin_y;
}
inline void add_glyph_origin_for_direction (hb_codepoint_t glyph, inline void add_glyph_origin_for_direction (hb_codepoint_t glyph,
hb_direction_t direction, hb_direction_t direction,
hb_position_t *x, hb_position_t *y) hb_position_t *x, hb_position_t *y)
@ -310,6 +330,26 @@ struct hb_font_t {
*y += origin_y; *y += origin_y;
} }
inline void subtract_glyph_h_origin (hb_codepoint_t glyph,
hb_position_t *x, hb_position_t *y)
{
hb_position_t origin_x, origin_y;
get_glyph_h_origin (glyph, &origin_x, &origin_y);
*x -= origin_x;
*y -= origin_y;
}
inline void subtract_glyph_v_origin (hb_codepoint_t glyph,
hb_position_t *x, hb_position_t *y)
{
hb_position_t origin_x, origin_y;
get_glyph_v_origin (glyph, &origin_x, &origin_y);
*x -= origin_x;
*y -= origin_y;
}
inline void subtract_glyph_origin_for_direction (hb_codepoint_t glyph, inline void subtract_glyph_origin_for_direction (hb_codepoint_t glyph,
hb_direction_t direction, hb_direction_t direction,
hb_position_t *x, hb_position_t *y) hb_position_t *x, hb_position_t *y)

37
src/hb-ot-shape.cc
View File

@ -650,17 +650,26 @@ hb_ot_position_default (hb_ot_shape_context_t *c)
unsigned int count = c->buffer->len; unsigned int count = c->buffer->len;
hb_glyph_info_t *info = c->buffer->info; hb_glyph_info_t *info = c->buffer->info;
hb_glyph_position_t *pos = c->buffer->pos; hb_glyph_position_t *pos = c->buffer->pos;
if (HB_DIRECTION_IS_HORIZONTAL (direction))
{
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
c->font->get_glyph_advance_for_direction (info[i].codepoint, pos[i].x_advance = c->font->get_glyph_h_advance (info[i].codepoint);
direction, c->font->subtract_glyph_h_origin (info[i].codepoint,
&pos[i].x_advance,
&pos[i].y_advance);
c->font->subtract_glyph_origin_for_direction (info[i].codepoint,
direction,
&pos[i].x_offset, &pos[i].x_offset,
&pos[i].y_offset); &pos[i].y_offset);
}
}
else
{
for (unsigned int i = 0; i < count; i++)
{
pos[i].y_advance = c->font->get_glyph_v_advance (info[i].codepoint);
c->font->subtract_glyph_v_origin (info[i].codepoint,
&pos[i].x_offset,
&pos[i].y_offset);
}
} }
if (c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK) if (c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK)
_hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer); _hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer);
@ -708,23 +717,19 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
hb_glyph_info_t *info = c->buffer->info; hb_glyph_info_t *info = c->buffer->info;
hb_glyph_position_t *pos = c->buffer->pos; hb_glyph_position_t *pos = c->buffer->pos;
/* Change glyph origin to what GPOS expects, apply GPOS, change it back. */ /* Change glyph origin to what GPOS expects (horizontal), apply GPOS, change it back. */
for (unsigned int i = 0; i < count; i++) { for (unsigned int i = 0; i < count; i++)
c->font->add_glyph_origin_for_direction (info[i].codepoint, c->font->add_glyph_h_origin (info[i].codepoint,
HB_DIRECTION_LTR,
&pos[i].x_offset, &pos[i].x_offset,
&pos[i].y_offset); &pos[i].y_offset);
}
c->plan->position (c->font, c->buffer); c->plan->position (c->font, c->buffer);
for (unsigned int i = 0; i < count; i++) { for (unsigned int i = 0; i < count; i++)
c->font->subtract_glyph_origin_for_direction (info[i].codepoint, c->font->subtract_glyph_h_origin (info[i].codepoint,
HB_DIRECTION_LTR,
&pos[i].x_offset, &pos[i].x_offset,
&pos[i].y_offset); &pos[i].y_offset);
}
ret = true; ret = true;
} }