I'm only the proxy here but I created the webrev from the changesets that I pushed. I don't see any difference.

t4 $diff LCMSTransform.java.webrev jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
t4 $

regards,
Sean.

On 07/03/2013 10:59, Andrew Hughes wrote:
----- Original Message -----
February CPU pushes completed as reviewed in last round of webrevs.

I'd like to push 2 extra fixes now for issues addressed in
yesterday's
JDK releases.

webrev : http://cr.openjdk.java.net/~coffeys/webrev.6open.mar5/

Good to push ?

regards,
Sean.

On 05/03/2013 18:44, Omair Majid wrote:
On 03/05/2013 10:52 AM, Edvard Wendelin wrote:
Hi,

The change in JAXP can be viewed here:
http://cr.openjdk.java.net/~joehw/jdk8/8001235/webrev/ While it's
generated against JDK 8, the change in 6 is identical.
The JAXP changes look identical to what was pushed to jdk7u. Looks
all
good to me!

I plan to push the changes today.
Thank you. It will be great to have all the security fixes in!

Cheers,
Omair


I notice that what was finally committed differs from this webrev (in a positive
way).  The version posted from the webrev failed to compile:

1. ERROR in ../../../src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 
(at line 580)
         LCMS.colorConvert(this, srcIL, dstIL);
                                 ^^^^^
srcIL cannot be resolved to a variable
----------
2. ERROR in ../../../src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 
(at line 580)
         LCMS.colorConvert(this, srcIL, dstIL);
                                        ^^^^^
dstIL cannot be resolved to a variable
----------
3. ERROR in ../../../src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 
(at line 606)
         LCMS.colorConvert(this, srcIL, dstIL);
                                 ^^^^^
srcIL cannot be resolved to a variable
----------
4. ERROR in ../../../src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java 
(at line 606)
         LCMS.colorConvert(this, srcIL, dstIL);
                                        ^^^^^
dstIL cannot be resolved to a variable

but this seems to have been fixed in the committed version, presumably due to:

-        try {
-            LCMSImageLayout srcIL = new LCMSImageLayout(
-                src, src.length/getNumInComponents(),
-                LCMSImageLayout.CHANNELS_SH(getNumInComponents()) |
-                LCMSImageLayout.BYTES_SH(1), getNumInComponents());
-
-            LCMSImageLayout dstIL = new LCMSImageLayout(
-                dst, dst.length/getNumOutComponents(),
-                LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) |
-                LCMSImageLayout.BYTES_SH(1), getNumOutComponents());
-        } catch (ImageLayoutException e) {
-            throw new CMMException("Unable to convert data");
-        }
+        LCMSImageLayout srcIL = new LCMSImageLayout(
+            src, src.length/getNumInComponents(),
+            LCMSImageLayout.CHANNELS_SH(getNumInComponents()) |
+            LCMSImageLayout.BYTES_SH(1), getNumInComponents());
+
+        LCMSImageLayout dstIL = new LCMSImageLayout(
+            dst, dst.length/getNumOutComponents(),
+            LCMSImageLayout.CHANNELS_SH(getNumOutComponents()) |
+            LCMSImageLayout.BYTES_SH(1), getNumOutComponents());

so srcIL and dstIL are now declared at a wider scope.  I'll use the committed 
versions
in IcedTea6 HEAD.

Cheers,

Reply via email to