From 55d6abea5d734c47243a854e867444652c1b7aa1 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 3 Jan 2018 19:01:15 +0100 Subject: [PATCH] * src/truetype/ttgxvar.c (ft_var_to_design): Remove dead code. This is a better fix than the previous commit, which is now reverted. --- ChangeLog | 7 +++++++ src/truetype/ttgxvar.c | 16 ++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 759e5b371..b62b173ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-01-03 Werner Lemberg + + * 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 Move internal LCD-related declarations. diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 5378852c6..6f456cf8c 100644 --- 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,14 +2485,14 @@ 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 ) { switch ( manageCvt )