Minor
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 3140ee4..a3f250d 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -1639,9 +1639,12 @@
/**
* hb_font_set_var_coords_normalized:
*
+ * Return value is valid as long as variation coordinates of the font
+ * are not modified.
+ *
* Since: 1.4.2
*/
-int *
+const int *
hb_font_get_var_coords_normalized (hb_font_t *font,
unsigned int *length)
{
diff --git a/src/hb-font.h b/src/hb-font.h
index fce4206..e2e5979 100644
--- a/src/hb-font.h
+++ b/src/hb-font.h
@@ -618,7 +618,7 @@
const int *coords, /* 2.14 normalized */
unsigned int coords_length);
-HB_EXTERN int *
+HB_EXTERN const int *
hb_font_get_var_coords_normalized (hb_font_t *font,
unsigned int *length);
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 496fff2..48d6a0e 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -742,7 +742,7 @@
}
unsigned int num_coords;
- int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
+ const int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
if (num_coords)
{
FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed));
diff --git a/util/helper-cairo.cc b/util/helper-cairo.cc
index df5173b..2e2952b 100644
--- a/util/helper-cairo.cc
+++ b/util/helper-cairo.cc
@@ -104,13 +104,17 @@
else
{
unsigned int num_coords;
- int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
+ const int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
if (num_coords)
{
- FT_Fixed ft_coords[num_coords];
- for (unsigned int i = 0; i < num_coords; i++)
- ft_coords[i] = coords[i] << 2;
- FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords);
+ FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed));
+ if (ft_coords)
+ {
+ for (unsigned int i = 0; i < num_coords; i++)
+ ft_coords[i] = coords[i] << 2;
+ FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords);
+ free (ft_coords);
+ }
}
cairo_face = cairo_ft_font_face_create_for_ft_face (ft_face, 0);
