From 3caa42a4a7b4879162d19273441c2cc8b44e3142 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 9 Dec 2022 14:48:41 -0700 Subject: [PATCH] Fix build after rebase --- src/OT/glyf/Glyph.hh | 2 +- src/OT/glyf/VarCompositeGlyph.hh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OT/glyf/Glyph.hh b/src/OT/glyf/Glyph.hh index a3fa0982e..1b63517db 100644 --- a/src/OT/glyf/Glyph.hh +++ b/src/OT/glyf/Glyph.hh @@ -369,7 +369,7 @@ struct Glyph for (unsigned int i = 0; i < PHANTOM_COUNT; i++) phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i]; - all_points.extend (comp_points.sub_array (0, comp_points.length - PHANTOM_COUNT)); + all_points.extend (comp_points.as_array ().sub_array (0, comp_points.length - PHANTOM_COUNT)); points_left += item.get_num_points (); } diff --git a/src/OT/glyf/VarCompositeGlyph.hh b/src/OT/glyf/VarCompositeGlyph.hh index 489fb911d..043ba645a 100644 --- a/src/OT/glyf/VarCompositeGlyph.hh +++ b/src/OT/glyf/VarCompositeGlyph.hh @@ -166,7 +166,7 @@ struct VarCompositeGlyphRecord const F2DOT14 *q = (const F2DOT14 *) (axes_size + &StructAfter (num_axes)); - hb_array_t axis_points = points.sub_array (points.length - get_num_points ()); + hb_array_t axis_points = points.as_array ().sub_array (points.length - get_num_points ()); unsigned count = num_axes; for (unsigned i = 0; i < count; i++) axis_points[i].x = *q++; @@ -186,7 +186,7 @@ struct VarCompositeGlyphRecord if ((flags & UNIFORM_SCALE) && !(flags & HAVE_SCALE_Y)) scaleY = scaleX; - hb_array_t t = points.sub_array (points.length - NUM_TRANSFORM_POINTS); + hb_array_t t = points.as_array ().sub_array (points.length - NUM_TRANSFORM_POINTS); t[0].x = translateX; t[0].y = translateY; t[1].x = rotation;