Commit 11367bcce7961b39bd298c0ecd79a538758a040c
2003-05-19T21:42:08
* src/autohint/ahhint.c (ah_hinter_load_glyph): Don't scale y_scale locally but face->size->metrics.y_scale.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/ChangeLog b/ChangeLog
index 7b9de15..94bef45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-19 David Chester <davidchester@qmx.net>
+
+ * 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 <david@freetype.org>
* src/sfnt/ttcmap0.c (tt_cmap4_char_next): Select proper start
diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c
index 7f3cf65..d27a305 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 );