Mercurial > hg > openjdk > jdk7 > jdk

changeset 4257:8d91855a1f4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7046587: Outlines in OTF/CFF fonts are misclassified as quadratic curves Reviewed-by: igor
author prr
date Fri, 27 May 2011 13:25:54 -0700
parents efbf75c24b0f
children 0b0b92707cf5
files src/share/classes/sun/font/FileFontStrike.java src/share/classes/sun/font/FontScaler.java src/share/classes/sun/font/FreetypeFontScaler.java src/share/classes/sun/font/NullFontScaler.java
diffstat 4 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/font/FileFontStrike.java	Wed May 18 18:18:04 2011 -0700
+++ b/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/src/share/classes/sun/font/FontScaler.java	Wed May 18 18:18:04 2011 -0700
+++ b/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/src/share/classes/sun/font/FreetypeFontScaler.java	Wed May 18 18:18:04 2011 -0700
+++ b/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/src/share/classes/sun/font/NullFontScaler.java	Wed May 18 18:18:04 2011 -0700
+++ b/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();
     }