diff options
| author | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2017-03-24 15:25:36 +0300 |
|---|---|---|
| committer | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2017-03-24 15:26:55 +0300 |
| commit | a892824b93e5a90337862bc209c2a6112493eb79 (patch) | |
| tree | 407ecc3c7e03003615924335a31f733c905a6caf | |
| parent | a4b5646911b37a4398a7159de09ebf875546178f (diff) | |
| download | jdk8u_jdk-jb8u112-b783.3.tar.gz | |
JRE-205 Font is wrong and without anti aliasing in 2017.1 EAPjb8u112-b783.3
Do not load custom font.conf by default
(cherry picked from commit b8c38f4)
| -rw-r--r-- | src/share/classes/sun/font/FreetypeFontScaler.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/share/classes/sun/font/FreetypeFontScaler.java b/src/share/classes/sun/font/FreetypeFontScaler.java index 235fc2fd2b..dadca159fa 100644 --- a/src/share/classes/sun/font/FreetypeFontScaler.java +++ b/src/share/classes/sun/font/FreetypeFontScaler.java @@ -52,13 +52,13 @@ class FreetypeFontScaler extends FontScaler { FontManagerNativeLibrary.load(); String jreFontConfName = java.security.AccessController.doPrivileged( - (PrivilegedAction<String>) () -> ( - "false".equals(System.getProperty( + (PrivilegedAction<String>) () -> + "true".equals(System.getProperty( "java2d.font.loadFontConf", "")) ? - null : System.getProperty("java.home", "") + - File.separator + "lib") + File.separator + - "fonts" + File.separator + "font.conf"); + File.separator + "lib" + File.separator + + "fonts" + File.separator + "font.conf" : + null); initIDs(FreetypeFontScaler.class, Toolkit.class, PhysicalFont.class, jreFontConfName); |