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

[ot] Simplify form_clusters()

This commit is contained in:
Behdad Esfahbod 2015-07-22 15:42:20 +01:00
parent 7b8b63adc5
commit 701112dad9
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,14 @@ struct hb_buffer_t {
unsigned int cluster_end); unsigned int cluster_end);
HB_INTERNAL void merge_clusters (unsigned int start, HB_INTERNAL void merge_clusters (unsigned int start,
unsigned int end); unsigned int end)
{
if (end - start < 2)
return;
merge_clusters_impl (start, end);
}
HB_INTERNAL void merge_clusters_impl (unsigned int start,
unsigned int end);
HB_INTERNAL void merge_out_clusters (unsigned int start, HB_INTERNAL void merge_out_clusters (unsigned int start,
unsigned int end); unsigned int end);
/* Merge clusters for deleting current glyph, and skip it. */ /* Merge clusters for deleting current glyph, and skip it. */

7
src/hb-buffer.cc
View File

@ -504,16 +504,13 @@ hb_buffer_t::reverse_clusters (void)
} }
void void
hb_buffer_t::merge_clusters (unsigned int start, hb_buffer_t::merge_clusters_impl (unsigned int start,
unsigned int end) unsigned int end)
{ {
#ifdef HB_NO_MERGE_CLUSTERS #ifdef HB_NO_MERGE_CLUSTERS
return; return;
#endif #endif
if (unlikely (end - start < 2))
return;
unsigned int cluster = info[start].cluster; unsigned int cluster = info[start].cluster;
for (unsigned int i = start + 1; i < end; i++) for (unsigned int i = start + 1; i < end; i++)

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

@ -264,11 +264,18 @@ hb_insert_dotted_circle (hb_buffer_t *buffer, hb_font_t *font)
static void static void
hb_form_clusters (hb_buffer_t *buffer) hb_form_clusters (hb_buffer_t *buffer)
{ {
unsigned int base = 0;
unsigned int count = buffer->len; unsigned int count = buffer->len;
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
for (unsigned int i = 1; i < count; i++) for (unsigned int i = 1; i < count; i++)
if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&info[i]))) {
buffer->merge_clusters (i - 1, i + 1); if (likely (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&info[i]))))
{
buffer->merge_clusters (base, i);
base = i;
}
}
buffer->merge_clusters (base, count);
} }
static void static void