shithub: freetype+ttf2subf

Download patch

ref: 55d6abea5d734c47243a854e867444652c1b7aa1
parent: 20b3e34846f39a423108a8745f07682fd74dc25d
author: Werner Lemberg <[email protected]>
date: Wed Jan 3 14:01:15 EST 2018 

* src/truetype/ttgxvar.c (ft_var_to_design): Remove dead code.

This is a better fix than the previous commit, which is now
reverted.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-03  Werner Lemberg  <[email protected]>
+
+	* src/truetype/ttgxvar.c (ft_var_to_design): Remove dead code.
+
+	This is a better fix than the previous commit, which is now
+	reverted.
+
 2018-01-03  Alexei Podtelezhnikov  <[email protected]>
 
 	Move internal LCD-related declarations.
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -1829,16 +1829,8 @@
       nc = blend->num_axis;
     }
 
-    if ( face->doblend )
-    {
-      for ( i = 0; i < nc; i++ )
-        design[i] = coords[i];
-    }
-    else
-    {
-      for ( i = 0; i < nc; i++ )
-        design[i] = 0;
-    }
+    for ( i = 0; i < nc; i++ )
+      design[i] = coords[i];
 
     for ( ; i < num_coords; i++ )
       design[i] = 0;
@@ -2493,13 +2485,13 @@
                  coords,
                  num_coords * sizeof ( FT_Fixed ) );
 
-    face->doblend = TRUE;
-
     if ( set_design_coords )
       ft_var_to_design( face,
                         all_design_coords ? blend->num_axis : num_coords,
                         blend->normalizedcoords,
                         blend->coords );
+
+    face->doblend = TRUE;
 
     if ( face->cvt )
     {