7050826: Hebrew characters are not rendered on OEL 5.6

Reviewed-by: bae, jgodinez
This commit is contained in:
Phil Race 2011-09-06 13:40:31 -07:00
parent aeec78ab37
commit b3aa4cdcba

View File

@ -1191,8 +1191,16 @@ Java_sun_font_FontConfigManager_getFontConfig
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,