From ca4ed22d2110671dc4fca371f2366bc45a1cd8d3 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 20 May 2003 04:32:54 +0000 Subject: [PATCH] * src/autohint/ahhint.c (ah_hinter_load_glyph): Oops! David's patch from yesterday has been resolved already in a different way. Reverted. --- ChangeLog | 6 ++++++ src/autohint/ahhint.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94bef45be..6de6a69d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-05-20 Werner Lemberg + + * src/autohint/ahhint.c (ah_hinter_load_glyph): Oops! David's + patch from yesterday has been resolved already in a different + way. Reverted. + 2003-05-19 David Chester * src/autohint/ahhint.c (ah_hinter_load_glyph): Don't scale diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c index d27a3050a..cd8a35197 100644 --- a/src/autohint/ahhint.c +++ b/src/autohint/ahhint.c @@ -1758,12 +1758,12 @@ { /* adjust y_scale */ - face->size->metrics.y_scale = FT_MulDiv( y_scale, fitted, scaled ); + y_scale = FT_MulDiv( y_scale, fitted, scaled ); /* adust x_scale */ if ( fitted < scaled ) - face->size->metrics.x_scale -= x_scale/50; /* x_scale*0.98 */ + x_scale -= x_scale/50; /* x_scale*0.98 with integers */ } } } @@ -1774,9 +1774,7 @@ /* need to rescale the global metrics */ if ( face_globals->x_scale != x_scale || face_globals->y_scale != y_scale ) - ah_hinter_scale_globals( hinter, - face->size->metrics.x_scale, - face->size->metrics.y_scale ); + ah_hinter_scale_globals( hinter, x_scale, y_scale ); ah_loader_rewind( hinter->loader );