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

[coretext] Always compute log_clusters 

To be used soon.
This commit is contained in:
Behdad Esfahbod 2014-08-11 13:25:43 -04:00
parent 15c633dd1f
commit 9b3c60c88b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/hb-coretext.cc
View File

@ -614,6 +614,17 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
#undef utf16_index #undef utf16_index
ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len);
chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++)
{
hb_codepoint_t c = buffer->info[i].codepoint;
unsigned int cluster = buffer->info[i].cluster;
log_clusters[chars_len++] = cluster;
if (hb_in_range (c, 0x10000u, 0x10FFFFu))
log_clusters[chars_len++] = cluster; /* Surrogates. */
}
CFStringRef string_ref = CFStringCreateWithCharactersNoCopy (NULL, CFStringRef string_ref = CFStringCreateWithCharactersNoCopy (NULL,
pchars, chars_len, pchars, chars_len,
kCFAllocatorNull); kCFAllocatorNull);
@ -625,19 +636,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
if (num_features) if (num_features)
{ {
ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len);
/* Need log_clusters to assign features. */
chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++)
{
hb_codepoint_t c = buffer->info[i].codepoint;
unsigned int cluster = buffer->info[i].cluster;
log_clusters[chars_len++] = cluster;
if (hb_in_range (c, 0x10000u, 0x10FFFFu))
log_clusters[chars_len++] = cluster; /* Surrogates. */
}
unsigned int start = 0; unsigned int start = 0;
range_record_t *last_range = &range_records[0]; range_record_t *last_range = &range_records[0];
for (unsigned int k = 0; k < chars_len; k++) for (unsigned int k = 0; k < chars_len; k++)