freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] * src/type1/t1afm.c (T1_Read_Metrics):


From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype][master] * src/type1/t1afm.c (T1_Read_Metrics): Validate ascender and descender.
Date: Sat, 04 Feb 2023 03:20:27 +0000

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

  • 82c131ac
    by Alexei Podtelezhnikov at 2023-02-04T03:20:25+00:00
    * src/type1/t1afm.c (T1_Read_Metrics): Validate ascender and descender.
    
    The ascender and descender are optional in the AFM specifications.
    They could be omitted or even set to zero, e.g., in the current release
    of URW++ base 35 fonts.

1 changed file:

Changes:

  • src/type1/t1afm.c
    ... ... @@ -296,9 +296,13 @@
    296 296
           t1_face->bbox.xMax = ( fi->FontBBox.xMax + 0xFFFF ) >> 16;
    
    297 297
           t1_face->bbox.yMax = ( fi->FontBBox.yMax + 0xFFFF ) >> 16;
    
    298 298
     
    
    299
    -      /* no `U' suffix here to 0x8000! */
    
    300
    -      t1_face->ascender  = (FT_Short)( ( fi->Ascender  + 0x8000 ) >> 16 );
    
    301
    -      t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 );
    
    299
    +      /* ascender and descender are optional and could both be zero */
    
    300
    +      if ( fi->Ascender || fi->Descender )
    
    301
    +      {  
    
    302
    +        /* no `U' suffix here to 0x8000! */
    
    303
    +        t1_face->ascender  = (FT_Short)( ( fi->Ascender  + 0x8000 ) >> 16 );
    
    304
    +        t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 );
    
    305
    +      }
    
    302 306
     
    
    303 307
           if ( fi->NumKernPair )
    
    304 308
           {
    


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]