[aarch64-port-dev ] /hg/icedtea7-forest-aarch64/jdk: 7 new changesets
adinn at icedtea.classpath.org
adinn at icedtea.classpath.org
Tue Jan 13 14:47:37 UTC 2015
changeset 6dd583aadca8 in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=6dd583aadca8
author: andrew
date: Fri Dec 12 04:45:32 2014 +0000
Bump to icedtea-2.6.0pre15
changeset 124b6842138b in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=124b6842138b
author: andrew
date: Fri Dec 12 06:37:57 2014 +0000
Added tag icedtea-2.6pre15 for changeset 6dd583aadca8
changeset 6e96282e913f in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=6e96282e913f
author: andrew
date: Fri Dec 12 16:55:22 2014 +0000
PR2145, RH114622: Printing to Postscript doesn't support dieresis
Contributed-by: philip.race at oracle.com
changeset e3df2e31e33f in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=e3df2e31e33f
author: prr
date: Fri Sep 27 13:06:47 2013 -0700
8020190, PR2160, RH1176718: Fatal: Bug in native code: jfieldID must match object
Reviewed-by: jgodinez, vadim
changeset 2e8f3cd07f14 in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=2e8f3cd07f14
author: andrew
date: Tue Dec 23 18:39:55 2014 +0000
Bump to icedtea-2.6.0pre16
changeset a97c208d888a in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=a97c208d888a
author: andrew
date: Tue Dec 30 21:41:18 2014 +0000
Added tag icedtea-2.6pre16 for changeset 2e8f3cd07f14
changeset 6bbc52d40754 in /hg/icedtea7-forest-aarch64/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jdk?cmd=changeset;node=6bbc52d40754
author: adinn
date: Tue Jan 13 14:46:15 2015 +0000
merge
diffstat:
.hgtags | 2 ++
make/jdk_generic_profile.sh | 2 +-
src/share/classes/sun/font/FreetypeFontScaler.java | 8 ++++----
src/share/native/sun/font/freetypeScaler.c | 9 +++++----
src/solaris/classes/sun/font/FcFontConfiguration.java | 2 +-
5 files changed, 13 insertions(+), 10 deletions(-)
diffs (104 lines):
diff -r 0799319cc6be -r 6bbc52d40754 .hgtags
--- a/.hgtags Wed Dec 10 06:03:01 2014 +0000
+++ b/.hgtags Tue Jan 13 14:46:15 2015 +0000
@@ -535,3 +535,5 @@
3620a98d0295f2b5ba4483483e61bfc386e734c1 icedtea-2.6pre12
13bd267f397d41749dcd08576a80f368cf3aaad7 icedtea-2.6pre13
ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14
+6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15
+2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16
diff -r 0799319cc6be -r 6bbc52d40754 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Wed Dec 10 06:03:01 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 0799319cc6be -r 6bbc52d40754 src/share/classes/sun/font/FreetypeFontScaler.java
--- a/src/share/classes/sun/font/FreetypeFontScaler.java Wed Dec 10 06:03:01 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 0799319cc6be -r 6bbc52d40754 src/share/native/sun/font/freetypeScaler.c
--- a/src/share/native/sun/font/freetypeScaler.c Wed Dec 10 06:03:01 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 0799319cc6be -r 6bbc52d40754 src/solaris/classes/sun/font/FcFontConfiguration.java
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java Wed Dec 10 06:03:01 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;
More information about the aarch64-port-dev
mailing list