changeset 4579:f147294d1b42

7050826: Hebrew characters are not rendered on OEL 5.6 Reviewed-by: bae, jgodinez
author prr
date Thu, 08 Sep 2011 11:00:33 -0700
parents a141f7ccdc5b
children 5fad895e81d0
files src/solaris/native/sun/awt/fontpath.c
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/sun/awt/fontpath.c	Wed Sep 07 15:57:12 2011 +0400
+++ b/src/solaris/native/sun/awt/fontpath.c	Thu Sep 08 11:00:33 2011 -0700
@@ -1191,8 +1191,16 @@
 
             fontformat = NULL;
             (*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
-            if (fontformat != NULL && strcmp((char*)fontformat, "TrueType")
-                != 0) {
+            /* We only want TrueType fonts but some Linuxes still depend
+             * on Type 1 fonts for some Locale support, so we'll allow
+             * them there.
+             */
+            if (fontformat != NULL
+                && (strcmp((char*)fontformat, "TrueType") != 0)
+#ifdef __linux__
+                && (strcmp((char*)fontformat, "Type 1") != 0)
+#endif
+             ) {
                 continue;
             }
             result = (*FcPatternGetCharSet)(fontPattern,