stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6989370: Windows platform fonts may be incorrectly marked as ineligible for the native rasteriser

Browse Source 
Reviewed-by: igor, jgodinez
This commit is contained in:
Phil Race 2011-01-14 11:43:36 -08:00
parent 06c1663385
commit 8d30a7a642
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/sun/font/SunFontManager.java
View File

@ -1576,7 +1576,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
.info("Trying to resolve file " + fullPath); .info("Trying to resolve file " + fullPath);
} }
do { do {
ttf = new TrueTypeFont(fullPath, null, fn++, true); ttf = new TrueTypeFont(fullPath, null, fn++, false);
// prefer the font's locale name. // prefer the font's locale name.
String fontName = ttf.getFontName(l).toLowerCase(); String fontName = ttf.getFontName(l).toLowerCase();
if (unmappedFonts.contains(fontName)) { if (unmappedFonts.contains(fontName)) {

7
jdk/src/windows/classes/sun/awt/Win32FontManager.java
View File

@ -63,7 +63,7 @@ public class Win32FontManager extends SunFontManager {
if (eudcFile != null) { if (eudcFile != null) {
try { try {
eudcFont = new TrueTypeFont(eudcFile, null, 0, eudcFont = new TrueTypeFont(eudcFile, null, 0,
true); false);
} catch (FontFormatException e) { } catch (FontFormatException e) {
} }
} }
@ -137,6 +137,7 @@ public class Win32FontManager extends SunFontManager {
try { try {
while (!found && parser.hasMoreTokens()) { while (!found && parser.hasMoreTokens()) {
String newPath = parser.nextToken(); String newPath = parser.nextToken();
boolean isJREFont = newPath.equals(jreFontDirName);
File theFile = new File(newPath, fontFileName); File theFile = new File(newPath, fontFileName);
if (theFile.canRead()) { if (theFile.canRead()) {
found = true; found = true;
@ -144,11 +145,11 @@ public class Win32FontManager extends SunFontManager {
if (defer) { if (defer) {
registerDeferredFont(fontFileName, path, registerDeferredFont(fontFileName, path,
nativeNames, nativeNames,
fontFormat, true, fontFormat, isJREFont,
fontRank); fontRank);
} else { } else {
registerFontFile(path, nativeNames, registerFontFile(path, nativeNames,
fontFormat, true, fontFormat, isJREFont,
fontRank); fontRank);
} }
break; break;