[coretext] Use input clusters

Before, this shaper was returning UTF-16 cluster indices instead of
returning whatever cluster values the user had had set up in the buffer.
Ouch!
This commit is contained in:
Behdad Esfahbod 2014-08-11 15:11:59 -04:00
parent a6b8dc8742
commit 3c41ccb535
1 changed files with 2 additions and 4 deletions

View File

@ -758,9 +758,7 @@ retry:
}
info->codepoint = notdef;
/* TODO We have to fixup clusters later. See vis_clusters in
* hb-uniscribe.cc for example. */
info->cluster = j;
info->cluster = log_clusters[j];
info->mask = advance;
info->var1.u32 = 0;
@ -820,7 +818,7 @@ retry:
hb_glyph_info_t *info = &buffer->info[buffer->len];
info->codepoint = glyphs[j];
info->cluster = string_indices[j];
info->cluster = log_clusters[string_indices[j]];
/* Currently, we do all x-positioning by setting the advance, we never use x-offset. */
info->mask = advance;