[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 82c131acc: * src/type1/t1afm.c (T1_Read_Metrics): Val
From: |
Werner Lemberg |
Subject: |
[freetype2] master 82c131acc: * src/type1/t1afm.c (T1_Read_Metrics): Validate ascender and descender. |
Date: |
Fri, 3 Feb 2023 22:20:36 -0500 (EST) |
branch: master
commit 82c131accbd68c71cce0a87474b836a43ce2beef
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* 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.
---
src/type1/t1afm.c | 10 +++++++---
1 file 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 )
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 82c131acc: * src/type1/t1afm.c (T1_Read_Metrics): Validate ascender and descender.,
Werner Lemberg <=