Commit 614a8f17c7bd931e99ebbf70308fe75ee27eb8e7

Werner Lemberg 2016-03-21T19:39:14

* src/autofit/afhints.c (af_glyph_hints_reload): Thinko. This fixes the previous commit to this file.

diff --git a/ChangeLog b/ChangeLog
index 67a0150..5f25e3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-21  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/afhints.c (af_glyph_hints_reload): Thinko.
+
+	This fixes the previous commit to this file.
+
 2016-03-21  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[smooth] Partly revert recent changes.
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index dadeccb..6c3d032 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -831,9 +831,6 @@
         FT_Int      contour_index = 0;
 
 
-        end->fx = (FT_Short)vec[endpoint].x;
-        end->fy = (FT_Short)vec[endpoint].y;
-
         for ( point = points; point < point_limit; point++, vec++, tag++ )
         {
           FT_Pos  out_x, out_y;
@@ -847,6 +844,9 @@
           point->ox = point->x = FT_MulFix( vec->x, x_scale ) + x_delta;
           point->oy = point->y = FT_MulFix( vec->y, y_scale ) + y_delta;
 
+          end->fx = (FT_Short)outline->points[endpoint].x;
+          end->fy = (FT_Short)outline->points[endpoint].y;
+
           switch ( FT_CURVE_TAG( *tag ) )
           {
           case FT_CURVE_TAG_CONIC:
@@ -874,12 +874,8 @@
             if ( ++contour_index < outline->n_contours )
             {
               endpoint = outline->contours[contour_index];
-
-              end  = points + endpoint;
-              prev = end;
-
-              end->fx = (FT_Short)vec[endpoint].x;
-              end->fy = (FT_Short)vec[endpoint].y;
+              end      = points + endpoint;
+              prev     = end;
             }
           }
         }