commit 8ecf308d8ffcca73b79eac33ac86ec7f6313af87
author Mario Torre <neugens@openjdk.org> Mon Oct 30 13:15:08 2017 +0100
committer Mario Torre <neugens@openjdk.org> Mon Oct 30 13:15:08 2017 +0100
tree d446706d5af27dc510505dbbeffc3e503e8ddb66
parent fab3dea7117c0161aa3a07c99789d0e5e6cabbb0

8188030: AWT java apps fail to start when some minimal fonts are present

Allow using CFF fonts as valid fonts when they are returned by fontconfig during font initialisation.

Reviewed-by: prr, serb

src/java.desktop/unix/native/common/awt/fontpath.c

diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 6d264a3..9ae443e 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1254,6 +1254,7 @@
                 && (strcmp((char*)fontformat, "TrueType") != 0)
 #if defined(__linux__) || defined(_AIX)
                 && (strcmp((char*)fontformat, "Type 1") != 0)
+                && (strcmp((char*)fontformat, "CFF") != 0)
 #endif
              ) {
                 continue;