summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2003-07-07 07:35:15 +0000
committerWerner Lemberg <wl@gnu.org>2003-07-07 07:35:15 +0000
commit27a825e50386fd8c1539a494792c2bf3b2605a43 (patch)
tree2d5b18ff5f23cf81b1e8596a24f4dd892ce9ec22
parent5a79a46339572be7757fded3120137c9d284dfc7 (diff)
downloadfreetype2-27a825e50386fd8c1539a494792c2bf3b2605a43.tar.gz
* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfread.c
(pcf_load_font): Fix computation of height if PIXEL_SIZE property is missing.
-rw-r--r--ChangeLog6
-rw-r--r--src/bdf/bdfdrivr.c3
-rw-r--r--src/pcf/pcfread.c3
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 <wl@gnu.org>
+
+ * 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 <wl@gnu.org>
* 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;