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

[cairo] Fix cluster conversion

This commit is contained in:
Behdad Esfahbod 2022-12-27 17:26:39 -07:00
parent 326db329f8
commit 8f62b8c6bb
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hb-cairo.cc
View File

@ -779,8 +779,7 @@ hb_cairo_font_face_get_scale_factor (cairo_font_face_t *font_face)
* passed to cairo_show_text_glyphs() or cairo_show_glyphs(). * passed to cairo_show_text_glyphs() or cairo_show_glyphs().
* This API is modeled after cairo_scaled_font_text_to_glyphs(). * This API is modeled after cairo_scaled_font_text_to_glyphs().
* *
* If @utf8 is provided, then cluster fields must also be provided and * If cluster information is requested, @utf8 must be provided.
* they will be returned.
* *
* See hb_cairo_font_face_set_scale_factor() for the details of * See hb_cairo_font_face_set_scale_factor() for the details of
* the @scale_factor argument. * the @scale_factor argument.
@ -813,7 +812,7 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
hb_glyph_position_t *hb_position = hb_buffer_get_glyph_positions (buffer, nullptr); hb_glyph_position_t *hb_position = hb_buffer_get_glyph_positions (buffer, nullptr);
*glyphs = cairo_glyph_allocate (*num_glyphs + 1); *glyphs = cairo_glyph_allocate (*num_glyphs + 1);
if (utf8) if (clusters)
{ {
*num_clusters = *num_glyphs ? 1 : 0; *num_clusters = *num_glyphs ? 1 : 0;
for (unsigned int i = 1; i < *num_glyphs; i++) for (unsigned int i = 1; i < *num_glyphs; i++)
@ -821,12 +820,6 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
(*num_clusters)++; (*num_clusters)++;
*clusters = cairo_text_cluster_allocate (*num_clusters); *clusters = cairo_text_cluster_allocate (*num_clusters);
} }
else if (clusters)
{
*clusters = nullptr;
*num_clusters = 0;
*cluster_flags = (cairo_text_cluster_flags_t) 0;
}
if ((*num_glyphs && !*glyphs) || if ((*num_glyphs && !*glyphs) ||
(clusters && *num_clusters && !*clusters)) (clusters && *num_clusters && !*clusters))
@ -864,7 +857,7 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
(*glyphs)[i].x = round (hx * iscale); (*glyphs)[i].x = round (hx * iscale);
(*glyphs)[i].y = round (hy * iscale); (*glyphs)[i].y = round (hy * iscale);
if (*num_clusters) if (clusters && *num_clusters)
{ {
memset ((void *) *clusters, 0, *num_clusters * sizeof ((*clusters)[0])); memset ((void *) *clusters, 0, *num_clusters * sizeof ((*clusters)[0]));
hb_bool_t backward = HB_DIRECTION_IS_BACKWARD (hb_buffer_get_direction (buffer)); hb_bool_t backward = HB_DIRECTION_IS_BACKWARD (hb_buffer_get_direction (buffer));