[truetype] Fix gxvar delta interpolation. The coordinates of the base font should be used for interpolation purposes, NOT the current points (i.e., the result of accumulation of previous deltas). * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Initialize `points_org' before looping over all tuples.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/ChangeLog b/ChangeLog
index a3d78f6..40560ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-14 Behdad Esfahbod <behdad@behdad.org>
+
+ [truetype] Fix gxvar delta interpolation.
+
+ The coordinates of the base font should be used for interpolation
+ purposes, NOT the current points (i.e., the result of accumulation
+ of previous deltas).
+
+ * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Initialize
+ `points_org' before looping over all tuples.
+
2016-07-12 Werner Lemberg <wl@gnu.org>
* Version 2.6.5 released.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 9a02c5a..d771569 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -1922,6 +1922,9 @@
FT_TRACE5(( "gvar: there are %d tuples:\n",
tupleCount & GX_TC_TUPLE_COUNT_MASK ));
+ for ( j = 0; j < n_points; j++ )
+ points_org[j] = outline->points[j];
+
for ( i = 0; i < ( tupleCount & GX_TC_TUPLE_COUNT_MASK ); i++ )
{
FT_UInt tupleDataSize;
@@ -2057,10 +2060,7 @@
/* we have to interpolate the missing deltas similar to the */
/* IUP bytecode instruction */
for ( j = 0; j < n_points; j++ )
- {
- points_org[j] = outline->points[j];
has_delta[j] = FALSE;
- }
for ( j = 0; j < point_count; j++ )
{