[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 1e9229f: [cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 1e9229f: [cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts (#57023). |
Date: |
Wed, 9 Oct 2019 09:38:06 -0400 (EDT) |
branch: master
commit 1e9229f0fcb46fd4cd8e0fdc48fb4a44ddb7a8a1
Author: John Tytgat <address@hidden>
Commit: Werner Lemberg <address@hidden>
[cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts (#57023).
* src/cff/cffobjs.c (cff_face_init): Don't set FT_FACE_FLAG_GLYPH_NAMES
for CFF2 based fonts.
---
ChangeLog | 7 +++++++
src/cff/cffobjs.c | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eaaa21e..8fad2ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-09 John Tytgat <address@hidden>
+
+ [cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts (#57023).
+
+ * src/cff/cffobjs.c (cff_face_init): Don't set FT_FACE_FLAG_GLYPH_NAMES
+ for CFF2 based fonts.
+
2019-10-08 Werner Lemberg <address@hidden>
[woff2] Fix SFNT table checks.
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index f76245f..2aad363 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -1018,9 +1018,9 @@
}
#ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES
- /* CID-keyed CFF fonts don't have glyph names -- the SFNT loader */
- /* has unset this flag because of the 3.0 `post' table. */
- if ( dict->cid_registry == 0xFFFFU )
+ /* CID-keyed CFF or CFF2 fonts don't have glyph names -- the SFNT */
+ /* loader has unset this flag because of the 3.0 `post' table. */
+ if ( dict->cid_registry == 0xFFFFU && !cff2 )
cffface->face_flags |= FT_FACE_FLAG_GLYPH_NAMES;
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 1e9229f: [cff] Fix FT_FACE_FLAG_GLYPH_NAMES for CFF2 based fonts (#57023).,
Werner LEMBERG <=