Skip to content

Commit 5182ea1

Browse files
committed
8322251: [Linux] JavaFX is not displaying CJK on Ubuntu 23.10 and later
Reviewed-by: aghaisas, angorya
1 parent d03b002 commit 5182ea1

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

modules/javafx.graphics/src/main/native-font/fontpath_linux.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,13 @@ Java_com_sun_javafx_font_FontConfigManager_getFontConfig
410410

411411
fontformat = NULL;
412412
(*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
413-
/* We only want TrueType fonts for Java FX */
414-
if (fontformat != NULL
415-
&& (strcmp((char*)fontformat, "TrueType") != 0)) {
413+
/* We only want OpenType fonts for Java FX :
414+
* ie TrueType and CFF format fonts.
415+
*/
416+
if ((fontformat != NULL) &&
417+
((strcmp((char*)fontformat, "TrueType") != 0) &&
418+
(strcmp((char*)fontformat, "CFF") != 0)))
419+
{
416420
continue;
417421
}
418422
result = (*FcPatternGetCharSet)(fontPattern,

0 commit comments

Comments
 (0)