6989370: Windows platform fonts may be incorrectly marked as ineligible for the native rasteriser
Reviewed-by: igor, jgodinez
This commit is contained in:
parent
06c1663385
commit
8d30a7a642
@ -1576,7 +1576,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
|
||||
.info("Trying to resolve file " + fullPath);
|
||||
}
|
||||
do {
|
||||
ttf = new TrueTypeFont(fullPath, null, fn++, true);
|
||||
ttf = new TrueTypeFont(fullPath, null, fn++, false);
|
||||
// prefer the font's locale name.
|
||||
String fontName = ttf.getFontName(l).toLowerCase();
|
||||
if (unmappedFonts.contains(fontName)) {
|
||||
|
@ -63,7 +63,7 @@ public class Win32FontManager extends SunFontManager {
|
||||
if (eudcFile != null) {
|
||||
try {
|
||||
eudcFont = new TrueTypeFont(eudcFile, null, 0,
|
||||
true);
|
||||
false);
|
||||
} catch (FontFormatException e) {
|
||||
}
|
||||
}
|
||||
@ -137,6 +137,7 @@ public class Win32FontManager extends SunFontManager {
|
||||
try {
|
||||
while (!found && parser.hasMoreTokens()) {
|
||||
String newPath = parser.nextToken();
|
||||
boolean isJREFont = newPath.equals(jreFontDirName);
|
||||
File theFile = new File(newPath, fontFileName);
|
||||
if (theFile.canRead()) {
|
||||
found = true;
|
||||
@ -144,11 +145,11 @@ public class Win32FontManager extends SunFontManager {
|
||||
if (defer) {
|
||||
registerDeferredFont(fontFileName, path,
|
||||
nativeNames,
|
||||
fontFormat, true,
|
||||
fontFormat, isJREFont,
|
||||
fontRank);
|
||||
} else {
|
||||
registerFontFile(path, nativeNames,
|
||||
fontFormat, true,
|
||||
fontFormat, isJREFont,
|
||||
fontRank);
|
||||
}
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user