/hg/icedtea6: 2 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Fri Jul 15 05:53:57 PDT 2011
changeset 523bbe184992 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=523bbe184992
author: dlila
date: Fri Jul 15 08:46:37 2011 -0400
Backport anyblit fix.
changeset 406c0d434ca3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=406c0d434ca3
author: dlila
date: Fri Jul 15 08:53:07 2011 -0400
Merge
diffstat:
ChangeLog | 14 +
Makefile.am | 4 +-
NEWS | 2 +
patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch | 89 ++++++++
patches/openjdk/7049339-anyblit-broken.patch | 109 ++++++++++
5 files changed, 217 insertions(+), 1 deletions(-)
diffs (257 lines):
diff -r 3d5ae12b32b7 -r 406c0d434ca3 ChangeLog
--- a/ChangeLog Wed Jul 13 21:28:45 2011 +0100
+++ b/ChangeLog Fri Jul 15 08:53:07 2011 -0400
@@ -1,3 +1,17 @@
+2011-07-15 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Added patch.
+ * NEWS: Added backport.
+ * patches/openjdk/7049339-anyblit-broken.patch:
+ Backport of S7049339.
+
+2011-07-15 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch:
+ Backport of 6613904.
+
2011-07-13 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add b23 changes.
diff -r 3d5ae12b32b7 -r 406c0d434ca3 Makefile.am
--- a/Makefile.am Wed Jul 13 21:28:45 2011 +0100
+++ b/Makefile.am Fri Jul 15 08:53:07 2011 -0400
@@ -363,7 +363,9 @@
patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch \
patches/jtreg-7020373-add-ignore-tag.patch \
patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch \
- patches/jtreg-ConstructDeflaterInput-fix.patch
+ patches/jtreg-ConstructDeflaterInput-fix.patch \
+ patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch \
+ patches/openjdk/7049339-anyblit-broken.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 3d5ae12b32b7 -r 406c0d434ca3 NEWS
--- a/NEWS Wed Jul 13 21:28:45 2011 +0100
+++ b/NEWS Fri Jul 15 08:53:07 2011 -0400
@@ -356,6 +356,8 @@
- S7016856: fix dashing performance regression. Improve other rendering performance.
- S6934977: MappedByteBuffer.load crashes with SIGBUS.
- S6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage
+ - S7049339: Image copy operations with a custom composite and a complex clip fail.
+ - S6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- Threadlist & threadobject improvements.
diff -r 3d5ae12b32b7 -r 406c0d434ca3 patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch Fri Jul 15 08:53:07 2011 -0400
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User rupashka
+# Date 1289665358 -10800
+# Node ID d385b33c0db056aa722f93eed1970f70f0b8f119
+# Parent 286b14273037644c62e7f263d1d9249f4308783b
+6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
+Reviewed-by: peterz
+
+diff -r 286b14273037 -r d385b33c0db0 src/share/classes/javax/swing/GroupLayout.java
+--- openjdk.orig/jdk/src/share/classes/javax/swing/GroupLayout.java Sat Nov 13 13:04:47 2010 +0300
++++ openjdk/jdk/src/share/classes/javax/swing/GroupLayout.java Sat Nov 13 19:22:38 2010 +0300
+@@ -653,6 +653,10 @@
+ */
+ public ParallelGroup createParallelGroup(Alignment alignment,
+ boolean resizable){
++ if (alignment == null) {
++ throw new IllegalArgumentException("alignment must be non null");
++ }
++
+ if (alignment == Alignment.BASELINE) {
+ return new BaselineGroup(resizable);
+ }
+diff -r 286b14273037 -r d385b33c0db0 test/javax/swing/GroupLayout/6613904/bug6613904.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/javax/swing/GroupLayout/6613904/bug6613904.java Sat Nov 13 19:22:38 2010 +0300
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2010, 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 6613904
++ * @summary javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
++ * @author Pavel Porvatov
++ */
++
++import javax.swing.*;
++
++public class bug6613904 {
++ public static void main(String[] args) {
++ SwingUtilities.invokeLater(new Runnable() {
++ public void run() {
++ GroupLayout groupLayout = new GroupLayout(new JPanel());
++
++ try {
++ groupLayout.createParallelGroup(null);
++
++ throw new RuntimeException("groupLayout.createParallelGroup(null) doesn't throw IAE");
++ } catch (IllegalArgumentException e) {
++ // Ok
++ }
++
++ try {
++ groupLayout.createParallelGroup(null, true);
++
++ throw new RuntimeException("groupLayout.createParallelGroup(null, true) doesn't throw IAE");
++ } catch (IllegalArgumentException e) {
++ // Ok
++ }
++
++ try {
++ groupLayout.createParallelGroup(null, false);
++
++ throw new RuntimeException("groupLayout.createParallelGroup(null, false) doesn't throw IAE");
++ } catch (IllegalArgumentException e) {
++ // Ok
++ }
++ }
++ });
++ }
++}
diff -r 3d5ae12b32b7 -r 406c0d434ca3 patches/openjdk/7049339-anyblit-broken.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7049339-anyblit-broken.patch Fri Jul 15 08:53:07 2011 -0400
@@ -0,0 +1,111 @@
+# HG changeset patch
+# User dlila
+# Date 1308946970 14400
+# Node ID 73d420a7199bcae55fe98f2d31662a7bc1e23920
+# Parent 685a01aa8cd204901853e08425df85e0f0894b3e
+7049339: AnyBlit is broken with non-rectangular clips.
+Reviewed-by: flar
+
+diff -r 685a01aa8cd2 -r 73d420a7199b src/share/classes/sun/java2d/loops/Blit.java
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/loops/Blit.java Wed May 25 19:53:08 2011 -0700
++++ openjdk/jdk/src/share/classes/sun/java2d/loops/Blit.java Fri Jun 24 16:22:50 2011 -0400
+@@ -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 685a01aa8cd2 -r 73d420a7199b test/sun/java2d/loops/Bug7049339.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/sun/java2d/loops/Bug7049339.java Fri Jun 24 16:22:50 2011 -0400
+@@ -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 <dlila at redhat.com>
++ @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);
++ }
++}
+exporting patch:
+<fdopen>
More information about the distro-pkg-dev
mailing list