infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-10 19:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris

Browse Source 
Reviewed-by: prr, vadim
This commit is contained in:
Andrew Brygin 2013-04-15 14:11:32 +04:00
parent 36ef0217a6
commit c0e62cff31
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
View File

@ -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;
}

2
jdk/test/java/awt/image/mlib/MlibOpsTest.java
View File

@ -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