Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 3, 2020
2 parents 125d6b4 + f23c983 commit ee282bf04d599c73401d8d296b68ca6335eec1e6
@@ -353,6 +353,9 @@ public Void run() {

String[] fontInfo = getDefaultPlatformFont();
defaultFontName = fontInfo[0];
if (defaultFontName == null && FontUtilities.debugFonts()) {
FontUtilities.getLogger().warning("defaultFontName is null");
}
defaultFontFileName = fontInfo[1];

String extraFontPath = fontConfig.getExtraFontPath();
@@ -1888,6 +1891,7 @@ private Font2D findFontFromPlatform(String lcName, int style) {
* may be able to emulate the required style.
*/
public Font2D findFont2D(String name, int style, int fallback) {
if (name == null) return null;
String lowerCaseName = name.toLowerCase(Locale.ENGLISH);
String mapName = lowerCaseName + dotStyleStr(style);

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,8 @@ public FontConfiguration createFontConfiguration(boolean preferLocaleFonts,
*/
if (info[0] == null) {
if (fontConfigFonts != null && fontConfigFonts.length > 0 &&
fontConfigFonts[0].firstFont.fontFile != null) {
fontConfigFonts[0].firstFont.fontFile != null &&
fontConfigFonts[0].firstFont.fullName != null) {
info[0] = fontConfigFonts[0].firstFont.fullName;
info[1] = fontConfigFonts[0].firstFont.fontFile;
} else {

0 comments on commit ee282bf

Please sign in to comment.
You can’t perform that action at this time.