summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <david@freetype.org>2002-03-06 12:05:35 +0000
committerDavid Turner <david@freetype.org>2002-03-06 12:05:35 +0000
commit2ca9e7e13475715049c28c395a59493c24d672e3 (patch)
tree04e35fad79a5a39b560889bb6c7cd4d77cd21e3c
parentb0e641312e5ec57bce88b91b6b6c0c3cc2df4b55 (diff)
downloadfreetype2-2ca9e7e13475715049c28c395a59493c24d672e3.tar.gz
* src/type1/t1objs.c (T1_Face_Init), src/cid/cidobjs.c (CID_Face_Init):
fixed another bug related to the ascender/descender/text height of Postscript fonts. Damn, this should have been fixed on 2002-03-04 !
-rw-r--r--src/cid/cidobjs.c4
-rw-r--r--src/type1/t1objs.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 1a43e759f..80dbb6cbf 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -389,8 +389,8 @@
if ( !root->units_per_EM )
root->units_per_EM = 1000;
- root->ascender = (FT_Short)( face->cid.font_bbox.yMax );
- root->descender = (FT_Short)( face->cid.font_bbox.yMin );
+ root->ascender = (FT_Short)( root->bbox.yMax );
+ root->descender = (FT_Short)( root->bbox.yMin );
root->height = (FT_Short)(
( ( root->ascender + root->descender ) * 12 ) / 10 );
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index e9a5c405b..90361aae4 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -413,14 +413,14 @@
if ( !root->units_per_EM )
root->units_per_EM = 1000;
- root->ascender = (FT_Short)( face->type1.font_bbox.yMax );
- root->descender = (FT_Short)( face->type1.font_bbox.yMin );
+ root->ascender = (FT_Short)( root->bbox.yMax );
+ root->descender = (FT_Short)( root->bbox.yMin );
root->height = (FT_Short)(
( ( root->ascender - root->descender ) * 12 ) / 10 );
/* now compute the maximum advance width */
root->max_advance_width =
- (FT_Short)( face->type1.font_bbox.xMax );
+ (FT_Short)( root->bbox.xMax );
{
FT_Int max_advance;