[freetype2] master 1bbec9e99: * src/type1/t1afm.c (T1_Read_Metrics): Reaffirm ascender and descender.

[Werner Lemberg]

branch: master
commit 1bbec9e9939d5f351becd0b01f86a20482749719
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/type1/t1afm.c (T1_Read_Metrics): Reaffirm ascender and descender.
---
 src/type1/t1afm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index f55810157..787aa92c9 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -297,7 +297,8 @@
       t1_face->bbox.yMax = ( fi->FontBBox.yMax + 0xFFFF ) >> 16;
 
       /* ascender and descender are optional and could both be zero */
-      if ( fi->Ascender || fi->Descender )
+      /* check if values are meaningful before overriding defaults  */
+      if ( fi->Ascender > fi->Descender )
       {  
         /* no `U' suffix here to 0x8000! */
         t1_face->ascender  = (FT_Short)( ( fi->Ascender  + 0x8000 ) >> 16 );