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

Minor

This commit is contained in:
Behdad Esfahbod 2012-04-14 20:47:14 -04:00
parent b9f199c8e3
commit 683b503f30
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hb-ot-shape-normalize.cc
View File

@ -68,12 +68,19 @@
* matra for the Indic shaper. * matra for the Indic shaper.
*/ */
static inline void
set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
{
info->general_category() = hb_unicode_general_category (unicode, info->codepoint);
info->combining_class() = _hb_unicode_modified_combining_class (unicode, info->codepoint);
}
static void static void
output_glyph (hb_font_t *font, hb_buffer_t *buffer, output_glyph (hb_font_t *font, hb_buffer_t *buffer,
hb_codepoint_t glyph) hb_codepoint_t glyph)
{ {
buffer->output_glyph (glyph); buffer->output_glyph (glyph);
hb_glyph_info_set_unicode_props (&buffer->out_info[buffer->out_len - 1], buffer->unicode); set_unicode_props (&buffer->out_info[buffer->out_len - 1], buffer->unicode);
} }
static bool static bool
@ -262,7 +269,7 @@ _hb_ot_shape_normalize (hb_font_t *font, hb_buffer_t *buffer,
{ {
/* Composes. Modify starter and carry on. */ /* Composes. Modify starter and carry on. */
buffer->out_info[starter].codepoint = composed; buffer->out_info[starter].codepoint = composed;
hb_glyph_info_set_unicode_props (&buffer->out_info[starter], buffer->unicode); set_unicode_props (&buffer->out_info[starter], buffer->unicode);
buffer->skip_glyph (); buffer->skip_glyph ();
continue; continue;

9
src/hb-ot-shape-private.hh
View File

@ -47,19 +47,10 @@ struct hb_ot_shape_plan_t
static inline void
hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
{
info->general_category() = hb_unicode_general_category (unicode, info->codepoint);
info->combining_class() = _hb_unicode_modified_combining_class (unicode, info->codepoint);
}
HB_INTERNAL hb_bool_t HB_INTERNAL hb_bool_t
_hb_ot_shape (hb_font_t *font, _hb_ot_shape (hb_font_t *font,
hb_buffer_t *buffer, hb_buffer_t *buffer,
const hb_feature_t *features, const hb_feature_t *features,
unsigned int num_features); unsigned int num_features);
#include "hb-ot-shape-complex-private.hh"
#endif /* HB_OT_SHAPE_PRIVATE_HH */ #endif /* HB_OT_SHAPE_PRIVATE_HH */

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

@ -169,12 +169,19 @@ hb_ot_shape_setup_masks (hb_ot_shape_context_t *c)
/* Prepare */ /* Prepare */
static inline void
set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
{
info->general_category() = hb_unicode_general_category (unicode, info->codepoint);
info->combining_class() = _hb_unicode_modified_combining_class (unicode, info->codepoint);
}
static void static void
hb_set_unicode_props (hb_buffer_t *buffer) hb_set_unicode_props (hb_buffer_t *buffer)
{ {
unsigned int count = buffer->len; unsigned int count = buffer->len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
hb_glyph_info_set_unicode_props (&buffer->info[i], buffer->unicode); set_unicode_props (&buffer->info[i], buffer->unicode);
} }
static void static void