shithub: freetype+ttf2subf

Download patch

ref: acfea4ddd9ba75cf207a922146b5fbef7fddb71b
parent: 9ddeee1d41420b82ac2120a3f471b9aea35c56f0
author: David Turner <[email protected]>
date: Wed Mar 6 07:38:15 EST 2002

* 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 !

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-06  David Turner    <[email protected]>
+
+        * 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  <[email protected]>
 
 	* src/pshinter/pshglob.h (PSH_DimensionRec): s/std/stdw/.
--- 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 );
 
--- 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;