OpenJDK / amber / amber
changeset 10407:4f389b57b475
7050826: Hebrew characters are not rendered on OEL 5.6
Reviewed-by: bae, jgodinez
| author | prr |
|---|---|
| date | Tue, 06 Sep 2011 13:40:31 -0700 |
| parents | 70c2151d530b |
| children | 8785d4808ab1 |
| files | jdk/src/solaris/native/sun/awt/fontpath.c |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/solaris/native/sun/awt/fontpath.c Fri Sep 02 04:28:49 2011 -0700 +++ b/jdk/src/solaris/native/sun/awt/fontpath.c Tue Sep 06 13:40:31 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,