diff --git a/src/hb-ot-var-fvar-table.hh b/src/hb-ot-var-fvar-table.hh index aebb6e6d5..f8d37092a 100644 --- a/src/hb-ot-var-fvar-table.hh +++ b/src/hb-ot-var-fvar-table.hh @@ -146,10 +146,9 @@ struct fvar { if (axes_count) { - hb_array_t arr = hb_array (&(this+firstAxis), axisCount).sub_array (start_offset, axes_count); - const AxisRecord *axes = get_axes (); + hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) - axes[start_offset + i].get_axis_deprecated (&axes_array[i]); + arr[i].get_axis_deprecated (&axes_array[i]); } return axisCount; } @@ -161,10 +160,9 @@ struct fvar { if (axes_count) { - hb_array_t arr = hb_array (&(this+firstAxis), axisCount).sub_array (start_offset, axes_count); - const AxisRecord *axes = get_axes (); + hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) - axes[start_offset + i].get_axis_info (start_offset + i, &axes_array[i]); + arr[i].get_axis_info (start_offset + i, &axes_array[i]); } return axisCount; }