# HG changeset patch
# User adinn
# Date 1421160375 0
# Node ID 6bbc52d407549748ee34ebadfd640b5838c16cd6
# Parent  51677c32c36079dcae0d24f5bcabd9b883e215a7# Parent  a97c208d888aabe0cf8885e7166e2676ac9ec789
merge

diff -r 51677c32c360 -r 6bbc52d40754 .hgtags
--- a/.hgtags	Thu Dec 11 16:21:55 2014 +0000
+++ b/.hgtags	Tue Jan 13 14:46:15 2015 +0000
@@ -535,4 +535,5 @@
 3620a98d0295f2b5ba4483483e61bfc386e734c1 icedtea-2.6pre12
 13bd267f397d41749dcd08576a80f368cf3aaad7 icedtea-2.6pre13
 ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14
-0799319cc6bed65b1d6f86ad9fbb720708d8d835 jdk8u40-b12-aarch64-1263
+6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15
+2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16
diff -r 51677c32c360 -r 6bbc52d40754 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Thu Dec 11 16:21:55 2014 +0000
+++ b/make/jdk_generic_profile.sh	Tue Jan 13 14:46:15 2015 +0000
@@ -625,7 +625,7 @@
 
 # IcedTea versioning
 export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.0pre14"
+export PACKAGE_VERSION="2.6.0pre16"
 export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
 echo "Building ${DERIVATIVE_ID}"
 
diff -r 51677c32c360 -r 6bbc52d40754 src/share/classes/sun/font/FreetypeFontScaler.java
--- a/src/share/classes/sun/font/FreetypeFontScaler.java	Thu Dec 11 16:21:55 2014 +0000
+++ b/src/share/classes/sun/font/FreetypeFontScaler.java	Tue Jan 13 14:46:15 2015 +0000
@@ -169,7 +169,7 @@
 
     public synchronized void dispose() {
         if (nativeScaler != 0L) {
-            disposeNativeScaler(nativeScaler);
+            disposeNativeScaler(font.get(), nativeScaler);
             nativeScaler = 0L;
         }
     }
@@ -190,7 +190,7 @@
 
     synchronized int getGlyphCode(char charCode) throws FontScalerException {
         if (nativeScaler != 0L) {
-            return getGlyphCodeNative(nativeScaler, charCode);
+            return getGlyphCodeNative(font.get(), nativeScaler, charCode);
         }
         return FontScaler.getNullScaler().getGlyphCode(charCode);
     }
@@ -245,9 +245,9 @@
 
     private native long getLayoutTableCacheNative(long pScaler);
 
-    private native void disposeNativeScaler(long pScaler);
+    private native void disposeNativeScaler(Font2D font2D, long pScaler);
 
-    private native int getGlyphCodeNative(long pScaler, char charCode);
+    private native int getGlyphCodeNative(Font2D font, long pScaler, char charCode);
     private native int getNumGlyphsNative(long pScaler);
     private native int getMissingGlyphCodeNative(long pScaler);
 
diff -r 51677c32c360 -r 6bbc52d40754 src/share/native/sun/font/freetypeScaler.c
--- a/src/share/native/sun/font/freetypeScaler.c	Thu Dec 11 16:21:55 2014 +0000
+++ b/src/share/native/sun/font/freetypeScaler.c	Tue Jan 13 14:46:15 2015 +0000
@@ -1038,13 +1038,13 @@
  */
 JNIEXPORT void JNICALL
 Java_sun_font_FreetypeFontScaler_disposeNativeScaler(
-        JNIEnv *env, jobject scaler, jlong pScaler) {
+        JNIEnv *env, jobject scaler, jobject font2D, jlong pScaler) {
     FTScalerInfo* scalerInfo = (FTScalerInfo *) jlong_to_ptr(pScaler);
 
     /* Freetype functions *may* cause callback to java
        that can use cached values. Make sure our cache is up to date.
        NB: scaler context is not important at this point, can use NULL. */
-    int errCode = setupFTContext(env, scaler, scalerInfo, NULL);
+    int errCode = setupFTContext(env, font2D, scalerInfo, NULL);
     if (errCode) {
         return;
     }
@@ -1093,7 +1093,8 @@
  */
 JNIEXPORT jint JNICALL
 Java_sun_font_FreetypeFontScaler_getGlyphCodeNative(
-        JNIEnv *env, jobject scaler, jlong pScaler, jchar charCode) {
+        JNIEnv *env, jobject scaler,
+        jobject font2D, jlong pScaler, jchar charCode) {
 
     FTScalerInfo* scalerInfo = (FTScalerInfo *) jlong_to_ptr(pScaler);
     int errCode;
@@ -1106,7 +1107,7 @@
     /* Freetype functions *may* cause callback to java
        that can use cached values. Make sure our cache is up to date.
        Scaler context is not important here, can use NULL. */
-    errCode = setupFTContext(env, scaler, scalerInfo, NULL);
+    errCode = setupFTContext(env, font2D, scalerInfo, NULL);
     if (errCode) {
         return 0;
     }
diff -r 51677c32c360 -r 6bbc52d40754 src/solaris/classes/sun/font/FcFontConfiguration.java
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java	Thu Dec 11 16:21:55 2014 +0000
+++ b/src/solaris/classes/sun/font/FcFontConfiguration.java	Tue Jan 13 14:46:15 2015 +0000
@@ -180,7 +180,7 @@
         String[] componentFaceNames = cfi[idx].getComponentFaceNames();
         FontDescriptor[] ret = new FontDescriptor[componentFaceNames.length];
         for (int i = 0; i < componentFaceNames.length; i++) {
-            ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.UTF_8.newEncoder(), new int[0]);
+            ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.ISO_8859_1.newEncoder(), new int[0]);
         }
 
         return ret;