# HG changeset patch # User prr # Date 1380737767 25200 # Node ID befaf108555190f93a38611339d1dbb1b56505a0 # Parent d7fe919adefb0c037fc0018637b1b23f2dc8a5ea 8025837: Extraneous changes in the fix for 8007386 Reviewed-by: jgodinez, jchen diff -r d7fe919adefb -r befaf1085551 jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c --- a/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c Wed Oct 02 10:06:28 2013 +0400 +++ b/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c Wed Oct 02 11:16:07 2013 -0700 @@ -323,11 +323,9 @@ XImage* defaultImg; jfieldID maskImgID; jlong fmt8; - jlong fmt24; jlong fmt32; jfieldID a8ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_A8", "J"); - jfieldID rgb24ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_ARGB24", "J"); jfieldID argb32ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_ARGB32", "J"); if (awt_display == (Display *)NULL) { @@ -335,11 +333,9 @@ } fmt8 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardA8)); - fmt24 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardRGB24)); fmt32 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardARGB32)); (*env)->SetStaticLongField(env, cls, a8ID, fmt8); - (*env)->SetStaticLongField(env, cls, rgb24ID, fmt24); (*env)->SetStaticLongField(env, cls, argb32ID, fmt32); maskData = (char *) malloc(32*32);