From acfea4ddd9ba75cf207a922146b5fbef7fddb71b Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 6 Mar 2002 12:38:15 +0000 Subject: [PATCH] * 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 ! --- ChangeLog | 6 ++++++ src/cid/cidobjs.c | 4 ++-- src/type1/t1objs.c | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 916cdc5d5..81308c2b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-03-06 David Turner + + * 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 ! + 2002-03-06 Werner Lemberg * src/pshinter/pshglob.h (PSH_DimensionRec): s/std/stdw/. diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 8cd91f3a4..1c7207ee8 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -390,8 +390,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 4f3e73202..7c36a6fae 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;