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

[var] Remove use of variable-length arrays

This commit is contained in:
Behdad Esfahbod 2017-01-21 15:36:35 -08:00
parent 2491134b38
commit 64fe92bf2d
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hb-font.cc
View File

@ -1540,6 +1540,17 @@ hb_font_get_ppem (hb_font_t *font,
* Variations * Variations
*/ */
static void
_hb_font_adopt_var_coords_normalized (hb_font_t *font,
int *coords, /* 2.14 normalized */
unsigned int coords_length)
{
free (font->coords);
font->coords = coords;
font->num_coords = coords_length;
}
void void
hb_font_set_var_coords (hb_font_t *font, hb_font_set_var_coords (hb_font_t *font,
const hb_var_coord_t *coords, const hb_var_coord_t *coords,
@ -1557,10 +1568,12 @@ hb_font_set_var_coords (hb_font_t *font,
hb_face_t *face = font->face; hb_face_t *face = font->face;
unsigned int length = hb_ot_var_get_axis_count (face); unsigned int length = hb_ot_var_get_axis_count (face);
int normalized[length]; // XXX Remove variable-length array use...
memset (normalized, 0, length * sizeof (normalized[0])); int *normalized = length ? (int *) calloc (length, sizeof (int)) : NULL;
if (unlikely (length && !normalized))
return;
/* normalized is filled with zero already. */
for (unsigned int i = 0; i < coords_length; i++) for (unsigned int i = 0; i < coords_length; i++)
{ {
unsigned int axis_index; unsigned int axis_index;
@ -1568,7 +1581,7 @@ hb_font_set_var_coords (hb_font_t *font,
normalized[axis_index] = hb_ot_var_normalize_axis_value (face, axis_index, coords[i].value); normalized[axis_index] = hb_ot_var_normalize_axis_value (face, axis_index, coords[i].value);
} }
hb_font_set_var_coords_normalized (font, normalized, coords_length); _hb_font_adopt_var_coords_normalized (font, normalized, coords_length);
} }
void void
@ -1579,13 +1592,15 @@ hb_font_set_var_coords_design (hb_font_t *font,
if (font->immutable) if (font->immutable)
return; return;
int normalized[coords_length]; // XXX Remove variable-length array use... int *normalized = coords_length ? (int *) calloc (coords_length, sizeof (int)) : NULL;
if (unlikely (coords_length && !normalized))
return;
hb_face_t *face = font->face; hb_face_t *face = font->face;
for (unsigned int i = 0; i < coords_length; i++) for (unsigned int i = 0; i < coords_length; i++)
normalized[i] = hb_ot_var_normalize_axis_value (face, i, coords[i]); normalized[i] = hb_ot_var_normalize_axis_value (face, i, coords[i]);
hb_font_set_var_coords_normalized (font, normalized, coords_length); _hb_font_adopt_var_coords_normalized (font, normalized, coords_length);
} }
void void
@ -1603,10 +1618,7 @@ hb_font_set_var_coords_normalized (hb_font_t *font,
if (coords_length) if (coords_length)
memcpy (copy, coords, coords_length * sizeof (coords[0])); memcpy (copy, coords, coords_length * sizeof (coords[0]));
free (font->coords); _hb_font_adopt_var_coords_normalized (font, copy, coords_length);
font->coords = copy;
font->num_coords = coords_length;
} }
int * int *