diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-06-10 11:29:24 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-06-10 11:29:24 +0200 |
| commit | 5f2a72cbc716703cd1e38f21e4cc52624a819e18 (patch) | |
| tree | fcbbcc591a403e4a9176443f8614fb765bc8c669 | |
| parent | 2c4fba9c91d31cacd7db3a684acee34276c8b5b5 (diff) | |
| download | freetype2-5f2a72cbc716703cd1e38f21e4cc52624a819e18.tar.gz | |
[truetype] Fix TT_Set_Var_Design.
Reported by Nikolaus Waxweiler <madigens@gmail.com>.
* src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the
case where we have less input coordinates than axes.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/truetype/ttgxvar.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2017-06-10 Werner Lemberg <wl@gnu.org> + [truetype] Fix TT_Set_Var_Design. + + Reported by Nikolaus Waxweiler <madigens@gmail.com>. + + * src/truetype/ttgxvar.c (TT_Set_Var_Design): Correctly handle the + case where we have less input coordinates than axes. + +2017-06-10 Werner Lemberg <wl@gnu.org> + * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo. Bug introduced 2017-05-28. diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 16a2e56ba..f2049796d 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -2640,7 +2640,7 @@ num_coords * sizeof ( FT_Fixed ) ); a = mmvar->axis + num_coords; - c = coords + num_coords; + c = blend->coords + num_coords; for ( i = num_coords; i < mmvar->num_axis; i++, a++, c++ ) *c = a->def; @@ -2650,7 +2650,7 @@ if ( !face->blend->avar_loaded ) ft_var_load_avar( face ); - ft_var_to_normalized( face, num_coords, coords, normalized ); + ft_var_to_normalized( face, num_coords, blend->coords, normalized ); error = tt_set_mm_blend( face, mmvar->num_axis, normalized, 0 ); |