Commit a77f713db59603661334348906207d9702e5c811
2003-11-27T21:01:24
* src/pfr/pfrdrivr.c (pfr_get_metrics): reverting to previous behaviour. Werner's "fix" was incorrect !!
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 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/ChangeLog b/ChangeLog
index aeea128..2f751af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-27 David Turner <david@freetype.org>
+
+ * src/pfr/pfrdrivr.c (pfr_get_metrics): reverting to previous
+ behaviour. Werner's "fix" was incorrect !!
+
2003-11-25 Werner Lemberg <wl@gnu.org>
* src/base/ftcalc.c, include/freetype/internal/ftcalc.h
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index c5f5530..6a72d09 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 *anadvance )
+ FT_Pos *aadvance )
{
FT_Error error = PFR_Err_Bad_Argument;
- *anadvance = 0;
+ *aadvance = 0;
if ( face )
{
PFR_PhyFont phys = &face->phy_font;
@@ -75,7 +75,7 @@
if ( gindex < phys->num_chars )
{
- *anadvance = phys->chars[gindex].advance;
+ *aadvance = phys->chars[gindex].advance;
error = 0;
}
}
@@ -86,7 +86,7 @@
static FT_Error
pfr_get_metrics( PFR_Face face,
- FT_UInt *anoutline_resolution,
+ FT_UInt *aoutline_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 ( anoutline_resolution )
- *anoutline_resolution = phys->outline_resolution;
+ if ( aoutline_resolution )
+ *aoutline_resolution = phys->outline_resolution;
if ( ametrics_resolution )
*ametrics_resolution = phys->metrics_resolution;
@@ -107,8 +107,11 @@
if ( size )
{
- x_scale = size->metrics.x_scale;
- y_scale = size->metrics.y_scale;
+ x_scale = FT_DivFix( size->metrics.x_ppem << 6,
+ phys->metrics_resolution );
+
+ y_scale = FT_DivFix( size->metrics.y_ppem << 6,
+ phys->metrics_resolution );
}
if ( ametrics_x_scale )