From c2e71a0234e0bae2a2624cc8d93ac5ba6937d7a3 Mon Sep 17 00:00:00 2001 From: Dmitrii Morskii Date: Mon, 18 Sep 2023 12:56:24 +0200 Subject: [PATCH] JBR-6044 handle absence of fontConfig library in setupRenderingFontHints (cherry picked from commit 6d41e07ffa2cb2cfd792104c5596143829152e5d) --- src/java.desktop/unix/native/libawt/awt/fontconfigmanager.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/java.desktop/unix/native/libawt/awt/fontconfigmanager.c b/src/java.desktop/unix/native/libawt/awt/fontconfigmanager.c index 7587e28d5e30..7c00c8b55236 100644 --- a/src/java.desktop/unix/native/libawt/awt/fontconfigmanager.c +++ b/src/java.desktop/unix/native/libawt/awt/fontconfigmanager.c @@ -299,10 +299,13 @@ JNIEXPORT int setupRenderingFontHints FcPattern *pattern, *matchPattern; FcResult result; - if (fcName == NULL) { + if (usingFontConfig() == false) { return -1; } + if (fcName == NULL) { + return -1; + } pattern = (*fcNameParse)((FcChar8 *)fcName); if (locale != NULL) { (*fcPatternAddString)(pattern, FC_LANG, (unsigned char*)locale);