From 27a825e50386fd8c1539a494792c2bf3b2605a43 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 7 Jul 2003 07:35:15 +0000 Subject: [PATCH] * src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfread.c (pcf_load_font): Fix computation of height if PIXEL_SIZE property is missing. --- ChangeLog | 6 ++++++ src/bdf/bdfdrivr.c | 3 +-- src/pcf/pcfread.c | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748d7c762..b4c1c16f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-07-06 Werner Lemberg + + * src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfread.c + (pcf_load_font): Fix computation of height if PIXEL_SIZE property is + missing. + 2003-07-01 Werner Lemberg * src/cache/ftcsbits.c (ftc_sbit_node_compare): Only add `size' if diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index fab1450d0..3582a0fb1 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -336,8 +336,7 @@ THE SOFTWARE. (FT_Pos)( ( prop->value.int32 * bsize->size + 36 ) / 72 ); if ( bsize->height == 0 ) - bsize->height = - (FT_Short)( ( bsize->size * bsize->y_ppem + 2048 ) / 64 / 64 ); + bsize->height = (FT_Short)( ( bsize->y_ppem + 32 ) / 64 ); if ( bsize->height == 0 ) { diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index df8f5fd29..ee65ae5d6 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -1014,8 +1014,7 @@ THE SOFTWARE. (FT_Pos)( ( prop->value.integer * bsize->size + 36 ) / 72 ); if ( bsize->height == 0 ) - bsize->height = - (FT_Short)( ( bsize->size * bsize->y_ppem + 2048 ) / 64 / 64 ); + bsize->height = (FT_Short)( ( bsize->y_ppem + 32 ) / 64 ); if ( bsize->height == 0 ) bsize->height = 12;