# HG changeset patch # User lana # Date 1310695075 25200 # Node ID 540429c5db45f46080a26a3b1d5763400741e441 # Parent 277fd8d9fcda719efaee4c348d79db113747ee85# Parent 0ed9dc0314596295dea109e52c31a57c196485b6 Merge diff -r 277fd8d9fcda -r 540429c5db45 .hgtags --- a/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 4a05062d8c4dfa3edec3faf1052af28baba5adff jdk7-b143 07a8728ad49ef6dfa469c3a8bf5ab1e9c80bed5c jdk7-b144 8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145 +dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 .hgtags-top-repo --- a/.hgtags-top-repo Wed Jul 13 12:24:56 2011 +0100 +++ b/.hgtags-top-repo Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143 7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 +2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- diff -r 277fd8d9fcda -r 540429c5db45 corba/.hgtags --- a/corba/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/corba/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145 +770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 corba/THIRD_PARTY_README --- a/corba/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/corba/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- diff -r 277fd8d9fcda -r 540429c5db45 jaxp/.hgtags --- a/jaxp/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/jaxp/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145 +bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 jaxp/THIRD_PARTY_README --- a/jaxp/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/jaxp/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- diff -r 277fd8d9fcda -r 540429c5db45 jaxws/.hgtags --- a/jaxws/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/jaxws/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145 +05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 jaxws/THIRD_PARTY_README --- a/jaxws/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/jaxws/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- diff -r 277fd8d9fcda -r 540429c5db45 jdk/.hgtags --- a/jdk/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/jdk/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -121,3 +121,4 @@ 23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 +f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147 diff -r 277fd8d9fcda -r 540429c5db45 jdk/THIRD_PARTY_README --- a/jdk/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/jdk/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- diff -r 277fd8d9fcda -r 540429c5db45 jdk/src/share/classes/sun/font/TrueTypeFont.java --- a/jdk/src/share/classes/sun/font/TrueTypeFont.java Wed Jul 13 12:24:56 2011 +0100 +++ b/jdk/src/share/classes/sun/font/TrueTypeFont.java Thu Jul 14 18:57:55 2011 -0700 @@ -106,7 +106,7 @@ private static Map lcidMap; - class DirectoryEntry { + static class DirectoryEntry { int tag; int offset; int length; diff -r 277fd8d9fcda -r 540429c5db45 jdk/src/share/classes/sun/java2d/loops/Blit.java --- a/jdk/src/share/classes/sun/java2d/loops/Blit.java Wed Jul 13 12:24:56 2011 +0100 +++ b/jdk/src/share/classes/sun/java2d/loops/Blit.java Thu Jul 14 18:57:55 2011 -0700 @@ -172,11 +172,11 @@ while (si.nextSpan(span)) { int w = span[2] - span[0]; int h = span[3] - span[1]; - srcRas = srcRas.createChild(srcx + span[0], srcy + span[1], - w, h, 0, 0, null); - dstRas = dstRas.createWritableChild(span[0], span[1], - w, h, 0, 0, null); - ctx.compose(srcRas, dstRas, dstRas); + Raster tmpSrcRas = srcRas.createChild(srcx + span[0], srcy + span[1], + w, h, 0, 0, null); + WritableRaster tmpDstRas = dstRas.createWritableChild(span[0], span[1], + w, h, 0, 0, null); + ctx.compose(tmpSrcRas, tmpDstRas, tmpDstRas); } ctx.dispose(); } diff -r 277fd8d9fcda -r 540429c5db45 jdk/test/sun/java2d/loops/Bug7049339.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/java2d/loops/Bug7049339.java Thu Jul 14 18:57:55 2011 -0700 @@ -0,0 +1,77 @@ +/* + * Copyright 2011 Red Hat, Inc. All Rights Reserved. + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + @test + @bug 7049339 + @summary Copying images with a non-rectangular clip and a custom composite + fails + @author Denis Lila + @run main Bug7049339 + */ + +import java.awt.Composite; +import java.awt.CompositeContext; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.Raster; +import java.awt.image.WritableRaster; + +public class Bug7049339 { + public static void main(String[] argv) { + int x = 100, y = 100; + BufferedImage src = new BufferedImage(x, y, BufferedImage.TYPE_INT_ARGB); + BufferedImage dst = new BufferedImage(x, y, BufferedImage.TYPE_3BYTE_BGR); + + Graphics2D dstg2d = dst.createGraphics(); + dstg2d.setComposite(new Composite() { + @Override + public CompositeContext createContext( + ColorModel srcColorModel, + ColorModel dstColorModel, + RenderingHints hints) + { + return new CompositeContext() { + @Override + public void compose(Raster src, Raster dstIn, + WritableRaster dstOut) + { + // do nothing + } + @Override + public void dispose() { + } + }; + } + }); + Shape clip = new Ellipse2D.Double(x/4, y/4, x/2, y/2); + dstg2d.setClip(clip); + // This will throw a RasterFormatException if the bug is present. + dstg2d.drawImage(src, 0, 0, null); + } +} diff -r 277fd8d9fcda -r 540429c5db45 langtools/.hgtags --- a/langtools/.hgtags Wed Jul 13 12:24:56 2011 +0100 +++ b/langtools/.hgtags Thu Jul 14 18:57:55 2011 -0700 @@ -120,3 +120,4 @@ 5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143 8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144 c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145 +9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 diff -r 277fd8d9fcda -r 540429c5db45 langtools/THIRD_PARTY_README --- a/langtools/THIRD_PARTY_README Wed Jul 13 12:24:56 2011 +0100 +++ b/langtools/THIRD_PARTY_README Thu Jul 14 18:57:55 2011 -0700 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------