diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2023-02-04 03:20:25 +0000 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2023-02-04 03:20:25 +0000 |
| commit | 82c131accbd68c71cce0a87474b836a43ce2beef (patch) | |
| tree | c5580310663f23883c7b78ff1a1e002c376b1ffb | |
| parent | 646cc8ef8d3956c46c245d1809e520803a1a41a0 (diff) | |
| download | freetype2-82c131accbd68c71cce0a87474b836a43ce2beef.tar.gz | |
* 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.
| -rw-r--r-- | src/type1/t1afm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 45e52cb94..f55810157 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -296,9 +296,13 @@ t1_face->bbox.xMax = ( fi->FontBBox.xMax + 0xFFFF ) >> 16; t1_face->bbox.yMax = ( fi->FontBBox.yMax + 0xFFFF ) >> 16; - /* no `U' suffix here to 0x8000! */ - t1_face->ascender = (FT_Short)( ( fi->Ascender + 0x8000 ) >> 16 ); - t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 ); + /* ascender and descender are optional and could both be zero */ + if ( fi->Ascender || fi->Descender ) + { + /* no `U' suffix here to 0x8000! */ + t1_face->ascender = (FT_Short)( ( fi->Ascender + 0x8000 ) >> 16 ); + t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 ); + } if ( fi->NumKernPair ) { |