From b74c65bf0feaedbc6e5e8cf7b1461de50b54f5e9 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Tue, 25 Oct 2016 09:56:40 -0700 Subject: [PATCH] 8168288: Dubious FontMetrics values from NullFontScaler Reviewed-by: serb, bpb --- .../java.desktop/share/classes/sun/font/NullFontScaler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java b/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java index 3e0ecb3a55d..c0f4197b829 100644 --- a/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java +++ b/jdk/src/java.desktop/share/classes/sun/font/NullFontScaler.java @@ -36,8 +36,8 @@ class NullFontScaler extends FontScaler { boolean supportsCJK, int filesize) {} StrikeMetrics getFontMetrics(long pScalerContext) { - return new StrikeMetrics(0xf0,0xf0,0xf0,0xf0,0xf0,0xf0, - 0xf0,0xf0,0xf0,0xf0); + return new StrikeMetrics(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f); } float getGlyphAdvance(long pScalerContext, int glyphCode) { @@ -71,7 +71,7 @@ class NullFontScaler extends FontScaler { return getNullScalerContext(); } - void invalidateScalerContext(long ppScalerContext) { + void invalidateScalerContext(long pScalerContext) { //nothing to do }