Commit a3b61253a7001a664c68ce0233047bd121330534
2016-07-16T08:16:16
[truetype] Fix GX delta tracing. * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Trace relative point movements.
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 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/ChangeLog b/ChangeLog
index 9ae3ce6..5b9df4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2016-07-14 Behdad Esfahbod <behdad@behdad.org>
+2016-07-16 Werner Lemberg <wl@gnu.org>
+
+ [truetype] Fix GX delta tracing.
+
+ * src/truetype/ttgxvar.c (TT_Vary_Apply_Glyph_Deltas): Trace
+ relative point movements.
+
+2016-07-16 Behdad Esfahbod <behdad@behdad.org>
[truetype] More fixes for GX.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 1a57153..1ddaa0d 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2018,22 +2018,20 @@
/* this means that there are deltas for every point in the glyph */
for ( j = 0; j < n_points; j++ )
{
-#ifdef FT_DEBUG_LEVEL_TRACE
- FT_Vector point_org = points_org[j];
-#endif
+ FT_Pos delta_x = FT_MulFix( deltas_x[j], apply );
+ FT_Pos delta_y = FT_MulFix( deltas_y[j], apply );
- outline->points[j].x += FT_MulFix( deltas_x[j], apply );
- outline->points[j].y += FT_MulFix( deltas_y[j], apply );
+ outline->points[j].x += delta_x;
+ outline->points[j].y += delta_y;
#ifdef FT_DEBUG_LEVEL_TRACE
- if ( ( point_org.x != outline->points[j].x ) ||
- ( point_org.y != outline->points[j].y ) )
+ if ( delta_x || delta_y )
{
FT_TRACE7(( " %d: (%d, %d) -> (%d, %d)\n",
j,
- point_org.x,
- point_org.y,
+ outline->points[j].x - delta_x,
+ outline->points[j].y - delta_y,
outline->points[j].x,
outline->points[j].y ));
count++;
@@ -2086,30 +2084,32 @@
points_org,
has_delta );
+ FT_TRACE7(( " point deltas:\n" ));
+
for ( j = 0; j < n_points; j++ )
{
- outline->points[j].x += points_out[j].x - points_org[j].x;
- outline->points[j].y += points_out[j].y - points_org[j].y;
- }
+ FT_Pos delta_x = points_out[j].x - points_org[j].x;
+ FT_Pos delta_y = points_out[j].y - points_org[j].y;
-#ifdef FT_DEBUG_LEVEL_TRACE
- FT_TRACE7(( " point deltas:\n" ));
- for ( j = 0; j < n_points; j++)
- {
- if ( ( points_org[j].x != outline->points[j].x ) ||
- ( points_org[j].y != outline->points[j].y ) )
+ outline->points[j].x += delta_x;
+ outline->points[j].y += delta_y;
+
+#ifdef FT_DEBUG_LEVEL_TRACE
+ if ( delta_x || delta_y )
{
FT_TRACE7(( " %d: (%d, %d) -> (%d, %d)\n",
j,
- points_org[j].x,
- points_org[j].y,
+ outline->points[j].x - delta_x,
+ outline->points[j].y - delta_y,
outline->points[j].x,
outline->points[j].y ));
count++;
}
+#endif
}
+#ifdef FT_DEBUG_LEVEL_TRACE
if ( !count )
FT_TRACE7(( " none\n" ));
#endif