7046587: Outlines in OTF/CFF fonts are misclassified as quadratic curves
Reviewed-by: igor
--- a/jdk/src/share/classes/sun/font/FileFontStrike.java Wed Jul 05 17:45:01 2017 +0200
+++ b/jdk/src/share/classes/sun/font/FileFontStrike.java Fri May 27 13:25:54 2011 -0700
@@ -180,7 +180,6 @@
pScalerContext = NullFontScaler.getNullScalerContext();
} else {
pScalerContext = fileFont.getScaler().createScalerContext(matrix,
- fileFont instanceof TrueTypeFont,
desc.aaHint, desc.fmHint,
boldness, italic, disableHinting);
}
--- a/jdk/src/share/classes/sun/font/FontScaler.java Wed Jul 05 17:45:01 2017 +0200
+++ b/jdk/src/share/classes/sun/font/FontScaler.java Fri May 27 13:25:54 2011 -0700
@@ -242,7 +242,6 @@
freed when corresponding strike is being released.
*/
abstract long createScalerContext(double[] matrix,
- boolean fontType,
int aa, int fm,
float boldness, float italic,
boolean disableHinting);
--- a/jdk/src/share/classes/sun/font/FreetypeFontScaler.java Wed Jul 05 17:45:01 2017 +0200
+++ b/jdk/src/share/classes/sun/font/FreetypeFontScaler.java Fri May 27 13:25:54 2011 -0700
@@ -210,12 +210,12 @@
return getUnitsPerEMNative(nativeScaler);
}
- long createScalerContext(double[] matrix, boolean fontType,
+ long createScalerContext(double[] matrix,
int aa, int fm, float boldness, float italic,
boolean disableHinting) {
if (nativeScaler != 0L) {
return createScalerContextNative(nativeScaler, matrix,
- fontType, aa, fm, boldness, italic);
+ aa, fm, boldness, italic);
}
return NullFontScaler.getNullScalerContext();
}
@@ -254,7 +254,7 @@
private native long getUnitsPerEMNative(long pScaler);
native long createScalerContextNative(long pScaler, double[] matrix,
- boolean fontType, int aa, int fm, float boldness, float italic);
+ int aa, int fm, float boldness, float italic);
/* Freetype scaler context does not contain any pointers that
has to be invalidated if native scaler is bad */
--- a/jdk/src/share/classes/sun/font/NullFontScaler.java Wed Jul 05 17:45:01 2017 +0200
+++ b/jdk/src/share/classes/sun/font/NullFontScaler.java Fri May 27 13:25:54 2011 -0700
@@ -66,7 +66,7 @@
long getLayoutTableCache() {return 0L;}
- long createScalerContext(double[] matrix, boolean fontType, int aa,
+ long createScalerContext(double[] matrix, int aa,
int fm, float boldness, float italic, boolean disableHinting) {
return getNullScalerContext();
}