* src/truetype/ttgxvar.c (ft_var_to_design): Remove dead code.
This is a better fix than the previous commit, which is now reverted.
This commit is contained in:
parent
20b3e34846
commit
55d6abea5d
|
@ -1,3 +1,10 @@
|
||||||
|
2018-01-03 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* 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 <apodtele@gmail.com>
|
2018-01-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
Move internal LCD-related declarations.
|
Move internal LCD-related declarations.
|
||||||
|
|
|
@ -1829,16 +1829,8 @@
|
||||||
nc = blend->num_axis;
|
nc = blend->num_axis;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( face->doblend )
|
for ( i = 0; i < nc; i++ )
|
||||||
{
|
design[i] = coords[i];
|
||||||
for ( i = 0; i < nc; i++ )
|
|
||||||
design[i] = coords[i];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for ( i = 0; i < nc; i++ )
|
|
||||||
design[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( ; i < num_coords; i++ )
|
for ( ; i < num_coords; i++ )
|
||||||
design[i] = 0;
|
design[i] = 0;
|
||||||
|
@ -2493,14 +2485,14 @@
|
||||||
coords,
|
coords,
|
||||||
num_coords * sizeof ( FT_Fixed ) );
|
num_coords * sizeof ( FT_Fixed ) );
|
||||||
|
|
||||||
face->doblend = TRUE;
|
|
||||||
|
|
||||||
if ( set_design_coords )
|
if ( set_design_coords )
|
||||||
ft_var_to_design( face,
|
ft_var_to_design( face,
|
||||||
all_design_coords ? blend->num_axis : num_coords,
|
all_design_coords ? blend->num_axis : num_coords,
|
||||||
blend->normalizedcoords,
|
blend->normalizedcoords,
|
||||||
blend->coords );
|
blend->coords );
|
||||||
|
|
||||||
|
face->doblend = TRUE;
|
||||||
|
|
||||||
if ( face->cvt )
|
if ( face->cvt )
|
||||||
{
|
{
|
||||||
switch ( manageCvt )
|
switch ( manageCvt )
|
||||||
|
|
Loading…
Reference in New Issue