* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfread.c

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

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 )
         {

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;