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

[buffer] Fix hb_buffer_append() pre/post-context logic 

Part of https://github.com/harfbuzz/harfbuzz/pull/3150
This commit is contained in:
Behdad Esfahbod 2021-08-25 15:20:54 -06:00
parent 33bfe9edd6
commit 4b5a81f13c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-buffer.cc
View File

@ -1758,13 +1758,20 @@ hb_buffer_append (hb_buffer_t *buffer,
if (source->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE) if (source->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE)
{ {
/* See similar logic in add_utf. */
/* pre-context */ /* pre-context */
while (start > 0 && buffer->context_len[0] < buffer->CONTEXT_LENGTH) if (!orig_len && start + source->context_len[0] > 0)
buffer->context[0][buffer->context_len[0]++] = source->info[--start].codepoint; {
for (auto i = 0u; i < source->context_len[0] && buffer->context_len[0] < buffer->CONTEXT_LENGTH; i++) buffer->clear_context (0);
buffer->context[0][buffer->context_len[0]++] = source->context[0][i]; while (start > 0 && buffer->context_len[0] < buffer->CONTEXT_LENGTH)
buffer->context[0][buffer->context_len[0]++] = source->info[--start].codepoint;
for (auto i = 0u; i < source->context_len[0] && buffer->context_len[0] < buffer->CONTEXT_LENGTH; i++)
buffer->context[0][buffer->context_len[0]++] = source->context[0][i];
}
/* post-context */ /* post-context */
buffer->clear_context (1);
while (end < source->len && buffer->context_len[1] < buffer->CONTEXT_LENGTH) while (end < source->len && buffer->context_len[1] < buffer->CONTEXT_LENGTH)
buffer->context[1][buffer->context_len[1]++] = source->info[end++].codepoint; buffer->context[1][buffer->context_len[1]++] = source->info[end++].codepoint;
for (auto i = 0u; i < source->context_len[1] && buffer->context_len[1] < buffer->CONTEXT_LENGTH; i++) for (auto i = 0u; i < source->context_len[1] && buffer->context_len[1] < buffer->CONTEXT_LENGTH; i++)