Mercurial > hg > release > icedtea7-forest-2.1 > jdk

changeset 4973:2a78c210f0e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 Reviewed-by: prr, vadim
author bae
date Fri, 12 Apr 2013 14:15:17 +0400
parents 94b16322eb0b
children 22decf80e0e8
files src/share/native/sun/awt/medialib/awt_ImagingLib.c test/java/awt/image/mlib/MlibOpsTest.java
diffstat 2 files changed, 24 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Tue Apr 09 12:39:40 2013 -0700
+++ b/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Fri Apr 12 14:15:17 2013 +0400
@@ -1302,6 +1302,29 @@
         return 0;
     }
 
+    nbands = setImageHints(env, srcImageP, dstImageP, FALSE, TRUE,
+                        FALSE, &hint);
+
+    if (nbands < 1 || nbands > srcImageP->cmodel.numComponents) {
+        /* Can't handle any custom images */
+        awt_freeParsedImage(srcImageP, TRUE);
+        awt_freeParsedImage(dstImageP, TRUE);
+        return 0;
+    }
+
+    /* 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) {
+            awt_freeParsedImage(srcImageP, TRUE);
+            awt_freeParsedImage(dstImageP, TRUE);
+            return 0;
+        }
+    }
+
     lut_nbands = (*env)->GetArrayLength(env, jtableArrays);
 
     ncomponents = srcImageP->cmodel.isDefaultCompatCM
@@ -1312,19 +1335,6 @@
         lut_nbands = ncomponents;
     }
 
-    /* Make sure that color order can be used for
-     * re-ordering of lookup arrays.
-     */
-    for (i = 0; i < ncomponents; i++) {
-        int idx = srcImageP->hints.colorOrder[i];
-
-        if (idx < 0 || idx >= ncomponents) {
-            awt_freeParsedImage(srcImageP, TRUE);
-            awt_freeParsedImage(dstImageP, TRUE);
-            return 0;
-        }
-    }
-
     tbl = NULL;
     if (SAFE_TO_ALLOC_2(ncomponents, sizeof(unsigned char *))) {
         tbl = (unsigned char **)
@@ -1367,17 +1377,6 @@
         }
     }
 
-    nbands = setImageHints(env, srcImageP, dstImageP, FALSE, TRUE,
-                        FALSE, &hint);
-    if (nbands < 1) {
-        /* Can't handle any custom images */
-        free(tbl);
-        free(jtable);
-        awt_freeParsedImage(srcImageP, TRUE);
-        awt_freeParsedImage(dstImageP, TRUE);
-        return 0;
-    }
-
     /* Allocate the arrays */
     if (allocateArray(env, srcImageP, &src, &sdata, TRUE, FALSE, FALSE) < 0) {
         /* Must be some problem */
--- a/test/java/awt/image/mlib/MlibOpsTest.java	Tue Apr 09 12:39:40 2013 -0700
+++ b/test/java/awt/image/mlib/MlibOpsTest.java	Fri Apr 12 14:15:17 2013 +0400
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     6556332
+ * @bug     6556332 8011992
  * @summary Test verifies that on-demnad loading of medialib library does
  *          not break imageing ops based on this library.
  * @run     main MlibOpsTest