From c0e62cff317bc600301048f365437159657af726 Mon Sep 17 00:00:00 2001 From: Andrew Brygin Date: Mon, 15 Apr 2013 14:11:32 +0400 Subject: [PATCH] 8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris Reviewed-by: prr, vadim --- jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c | 10 +++++----- jdk/test/java/awt/image/mlib/MlibOpsTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c index 66741e7df2d..2e81b63d352 100644 --- a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c +++ b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c @@ -1308,13 +1308,17 @@ Java_sun_awt_image_ImagingLib_lookupByteBI(JNIEnv *env, jobject thisLib, return 0; } + ncomponents = srcImageP->cmodel.isDefaultCompatCM + ? 4 + : srcImageP->cmodel.numComponents; + /* Make sure that color order can be used for * re-ordering of lookup arrays. */ for (i = 0; i < nbands; i++) { int idx = srcImageP->hints.colorOrder[i]; - if (idx < 0 || idx >= nbands) { + if (idx < 0 || idx >= ncomponents) { awt_freeParsedImage(srcImageP, TRUE); awt_freeParsedImage(dstImageP, TRUE); return 0; @@ -1323,10 +1327,6 @@ Java_sun_awt_image_ImagingLib_lookupByteBI(JNIEnv *env, jobject thisLib, lut_nbands = (*env)->GetArrayLength(env, jtableArrays); - ncomponents = srcImageP->cmodel.isDefaultCompatCM - ? 4 - : srcImageP->cmodel.numComponents; - if (lut_nbands > ncomponents) { lut_nbands = ncomponents; } diff --git a/jdk/test/java/awt/image/mlib/MlibOpsTest.java b/jdk/test/java/awt/image/mlib/MlibOpsTest.java index 458616b5e49..8f8bf7bd286 100644 --- a/jdk/test/java/awt/image/mlib/MlibOpsTest.java +++ b/jdk/test/java/awt/image/mlib/MlibOpsTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 6556332 8011992 + * @bug 6556332 8011992 8012112 * @summary Test verifies that on-demnad loading of medialib library does * not break imageing ops based on this library. * @run main MlibOpsTest