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

[unsafe-to-break] Be careful with flag propagation when merging clusters

This commit is contained in:
Behdad Esfahbod 2017-08-10 20:10:12 -07:00
parent f2868c2008
commit e2a2b5b229
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,6 +288,19 @@ struct hb_buffer_t {
return ret; return ret;
} }
HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0); HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
static inline void
set_cluster (hb_glyph_info_t &info, unsigned int cluster, unsigned int mask = 0)
{
if (info.cluster != cluster)
{
if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
info.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
else
info.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
}
info.cluster = cluster;
}
}; };

17
src/hb-buffer.cc
View File

@ -552,7 +552,7 @@ hb_buffer_t::merge_clusters_impl (unsigned int start,
if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS) if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS)
return; return;
uint32_t 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++)
cluster = MIN (cluster, info[i].cluster); cluster = MIN (cluster, info[i].cluster);
@ -568,10 +568,10 @@ hb_buffer_t::merge_clusters_impl (unsigned int start,
/* If we hit the start of buffer, continue in out-buffer. */ /* If we hit the start of buffer, continue in out-buffer. */
if (idx == start) if (idx == start)
for (unsigned int i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--) for (unsigned int i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--)
out_info[i - 1].cluster = cluster; set_cluster (out_info[i - 1], cluster);
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)
info[i].cluster = cluster; set_cluster (info[i], cluster);
} }
void void
hb_buffer_t::merge_out_clusters (unsigned int start, hb_buffer_t::merge_out_clusters (unsigned int start,
@ -583,7 +583,7 @@ hb_buffer_t::merge_out_clusters (unsigned int start,
if (unlikely (end - start < 2)) if (unlikely (end - start < 2))
return; return;
uint32_t cluster = out_info[start].cluster; unsigned int cluster = out_info[start].cluster;
for (unsigned int i = start + 1; i < end; i++) for (unsigned int i = start + 1; i < end; i++)
cluster = MIN (cluster, out_info[i].cluster); cluster = MIN (cluster, out_info[i].cluster);
@ -599,14 +599,16 @@ hb_buffer_t::merge_out_clusters (unsigned int start,
/* If we hit the end of out-buffer, continue in buffer. */ /* If we hit the end of out-buffer, continue in buffer. */
if (end == out_len) if (end == out_len)
for (unsigned int i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++) for (unsigned int i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++)
info[i].cluster = cluster; set_cluster (info[i], cluster);
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)
out_info[i].cluster = cluster; set_cluster (out_info[i], cluster);
} }
void void
hb_buffer_t::delete_glyph () hb_buffer_t::delete_glyph ()
{ {
/* The logic here is duplicated in hb_ot_hide_default_ignorables(). */
unsigned int cluster = info[idx].cluster; unsigned int cluster = info[idx].cluster;
if (idx + 1 < len && cluster == info[idx + 1].cluster) if (idx + 1 < len && cluster == info[idx + 1].cluster)
{ {
@ -619,9 +621,10 @@ hb_buffer_t::delete_glyph ()
/* Merge cluster backward. */ /* Merge cluster backward. */
if (cluster < out_info[out_len - 1].cluster) if (cluster < out_info[out_len - 1].cluster)
{ {
unsigned int mask = info[idx].mask;
unsigned int old_cluster = out_info[out_len - 1].cluster; unsigned int old_cluster = out_info[out_len - 1].cluster;
for (unsigned i = out_len; i && out_info[i - 1].cluster == old_cluster; i--) for (unsigned i = out_len; i && out_info[i - 1].cluster == old_cluster; i--)
out_info[i - 1].cluster = cluster; set_cluster (out_info[i - 1], cluster, mask);
} }
goto done; goto done;
} }

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

@ -509,9 +509,10 @@ hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c)
/* Merge cluster backward. */ /* Merge cluster backward. */
if (cluster < info[j - 1].cluster) if (cluster < info[j - 1].cluster)
{ {
unsigned int mask = info[i].mask;
unsigned int old_cluster = info[j - 1].cluster; unsigned int old_cluster = info[j - 1].cluster;
for (unsigned k = j; k && info[k - 1].cluster == old_cluster; k--) for (unsigned k = j; k && info[k - 1].cluster == old_cluster; k--)
info[k - 1].cluster = cluster; buffer->set_cluster (info[k - 1], cluster, mask);
} }
continue; continue;
} }