From 94ed132e5a9b47f267f8274ef547b08b0fae9005 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 19 May 2003 21:42:08 +0000 Subject: [PATCH] * src/autohint/ahhint.c (ah_hinter_load_glyph): Don't scale y_scale locally but face->size->metrics.y_scale. --- ChangeLog | 5 +++++ src/autohint/ahhint.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b9de15f0..94bef45be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-19 David Chester + + * src/autohint/ahhint.c (ah_hinter_load_glyph): Don't scale + y_scale locally but face->size->metrics.y_scale. + 2003-05-19 David Turner * src/sfnt/ttcmap0.c (tt_cmap4_char_next): Select proper start diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c index 7f3cf65d8..d27a3050a 100644 --- a/src/autohint/ahhint.c +++ b/src/autohint/ahhint.c @@ -1743,25 +1743,27 @@ */ { AH_Globals design = &face_globals->design; - FT_Pos shoot = design->blue_shoots[ AH_BLUE_SMALL_TOP ]; + FT_Pos shoot = design->blue_shoots[AH_BLUE_SMALL_TOP]; - /* the value of 'shoot' will be -1000 if the font doesn't have */ - /* small latin letters; we simply check the sign here... */ + + /* the value of 'shoot' will be -1000 if the font doesn't have */ + /* small latin letters; we simply check the sign here... */ if ( shoot > 0 ) { FT_Pos scaled = FT_MulFix( shoot, y_scale ); FT_Pos fitted = ( scaled + 32 ) & -64; + if ( scaled != fitted ) { /* adjust y_scale */ - y_scale = FT_MulDiv( y_scale, fitted, scaled ); + face->size->metrics.y_scale = FT_MulDiv( y_scale, fitted, scaled ); /* adust x_scale */ if ( fitted < scaled ) - x_scale -= x_scale/50; /* x_scale*0.98 with integers */ + face->size->metrics.x_scale -= x_scale/50; /* x_scale*0.98 */ } } } @@ -1772,7 +1774,9 @@ /* need to rescale the global metrics */ if ( face_globals->x_scale != x_scale || face_globals->y_scale != y_scale ) - ah_hinter_scale_globals( hinter, x_scale, y_scale ); + ah_hinter_scale_globals( hinter, + face->size->metrics.x_scale, + face->size->metrics.y_scale ); ah_loader_rewind( hinter->loader );