From 8801b80d724d36f9e6547b7975aaf1cc1a355734 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Tue, 2 Apr 2019 13:10:36 -0700
Subject: [PATCH] refix: orig_points must be saved before any adjustment

---
 src/hb-ot-var-gvar-table.hh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh
index a8c3d2f2f..40c0fa128 100644
--- a/src/hb-ot-var-gvar-table.hh
+++ b/src/hb-ot-var-gvar-table.hh
@@ -596,6 +596,12 @@ struct gvar
 					     &iterator))
 	return false;
 
+      /* Save original points for inferred delta calculation */
+      contour_point_vector_t orig_points;
+      orig_points.resize (points.length);
+      for (unsigned int i = 0; i < orig_points.length; i++)
+	orig_points[i] = points[i];
+
       contour_point_vector_t	deltas;	/* flag is used to indicate referenced point */
       deltas.resize (points.length);
 
@@ -636,11 +642,6 @@ struct gvar
 	}
 
 	/* infer deltas for unreferenced points */
-	contour_point_vector_t orig_points;
-	orig_points.resize (points.length);
-	for (unsigned int i = 0; i < orig_points.length; i++)
-	  orig_points[i] = points[i];
-
 	unsigned int start_point = 0;
 	for (unsigned int c = 0; c < end_points.length; c++)
 	{