From b8bae640cd1b8bfc1357dd07fd40a702d8780c5d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 28 Nov 2003 22:01:02 +0000 Subject: [PATCH] Fix ChangeLog. Formatting. --- ChangeLog | 5 +++-- src/pfr/pfrdrivr.c | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f751afa7..98e733ad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 2003-11-27 David Turner - * src/pfr/pfrdrivr.c (pfr_get_metrics): reverting to previous - behaviour. Werner's "fix" was incorrect !! + * src/pfr/pfrdrivr.c (pfr_get_metrics): Revert incorrect change of + 2003-11-23: For PFR fonts, metrics->x_scale and metrics->y_scale are + the scaling values for outline units, not for metric units. 2003-11-25 Werner Lemberg diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c index 6a72d09bb..4e0d6fdb4 100644 --- a/src/pfr/pfrdrivr.c +++ b/src/pfr/pfrdrivr.c @@ -62,12 +62,12 @@ static FT_Error pfr_get_advance( PFR_Face face, FT_UInt gindex, - FT_Pos *aadvance ) + FT_Pos *anadvance ) { FT_Error error = PFR_Err_Bad_Argument; - *aadvance = 0; + *anadvance = 0; if ( face ) { PFR_PhyFont phys = &face->phy_font; @@ -75,7 +75,7 @@ if ( gindex < phys->num_chars ) { - *aadvance = phys->chars[gindex].advance; + *anadvance = phys->chars[gindex].advance; error = 0; } } @@ -86,7 +86,7 @@ static FT_Error pfr_get_metrics( PFR_Face face, - FT_UInt *aoutline_resolution, + FT_UInt *anoutline_resolution, FT_UInt *ametrics_resolution, FT_Fixed *ametrics_x_scale, FT_Fixed *ametrics_y_scale ) @@ -96,8 +96,8 @@ FT_Size size = face->root.size; - if ( aoutline_resolution ) - *aoutline_resolution = phys->outline_resolution; + if ( anoutline_resolution ) + *anoutline_resolution = phys->outline_resolution; if ( ametrics_resolution ) *ametrics_resolution = phys->metrics_resolution;