/hg/icedtea6: Backport of 6699843 fix.
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Jun 24 08:42:03 PDT 2011
changeset de842a17c6d5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=de842a17c6d5
author: ptisnovs
date: Fri Jun 24 17:41:56 2011 +0200
Backport of 6699843 fix.
diffstat:
ChangeLog | 7 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/6699843-IllegalArgumentException_drawString.patch | 131 ++++++++++
4 files changed, 141 insertions(+), 1 deletions(-)
diffs (175 lines):
diff -r 58c56aeb3e79 -r de842a17c6d5 ChangeLog
--- a/ChangeLog Fri Jun 24 09:07:40 2011 +0200
+++ b/ChangeLog Fri Jun 24 17:41:56 2011 +0200
@@ -1,3 +1,10 @@
+2011-06-24 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/6699843-IllegalArgumentException_drawString.patch:
+ Backport of 6699843 fix.
+
2011-06-24 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r 58c56aeb3e79 -r de842a17c6d5 Makefile.am
--- a/Makefile.am Fri Jun 24 09:07:40 2011 +0200
+++ b/Makefile.am Fri Jun 24 17:41:56 2011 +0200
@@ -364,7 +364,8 @@
patches/openjdk/6818312-com.sun.awt.SecurityWarning.getSize.patch \
patches/jtreg-MappedByteBuffer-Basic.patch \
patches/openjdk/7008106-WindowOpacity.patch \
- patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch
+ patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch \
+ patches/openjdk/6699843-IllegalArgumentException_drawString.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 58c56aeb3e79 -r de842a17c6d5 NEWS
--- a/NEWS Fri Jun 24 09:07:40 2011 +0200
+++ b/NEWS Fri Jun 24 17:41:56 2011 +0200
@@ -36,6 +36,7 @@
- S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
- S7008106: com/sun/awt/Translucency/WindowOpacity.java test fails.
- S6956668: misbehavior of XOR operator (^) with int
+ - S6699843: IllegalArgumentException when using Graphics.drawString( "", 0, 0 )
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r 58c56aeb3e79 -r de842a17c6d5 patches/openjdk/6699843-IllegalArgumentException_drawString.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6699843-IllegalArgumentException_drawString.patch Fri Jun 24 17:41:56 2011 +0200
@@ -0,0 +1,133 @@
+# HG changeset patch
+# User prr
+# Date 1210720710 25200
+# Node ID fb61ff1cc5fd6850289e94b69b5308dadafc0bf9
+# Parent 55e6548451dfdc5e9c8b00a39930d53c70b578a0
+6699843: IllegalArgumentException when using Graphics.drawString( "", 0, 0 )
+Reviewed-by: igor, tdv
+
+diff -r 55e6548451df -r fb61ff1cc5fd src/share/classes/sun/java2d/SunGraphics2D.java
+--- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed Apr 30 13:10:39 2008 -0700
++++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Tue May 13 16:18:30 2008 -0700
+@@ -2805,6 +2805,9 @@
+ }
+
+ if (font.hasLayoutAttributes()) {
++ if (str.length() == 0) {
++ return;
++ }
+ new TextLayout(str, font, getFontRenderContext()).draw(this, x, y);
+ return;
+ }
+@@ -2831,6 +2834,9 @@
+ }
+
+ if (font.hasLayoutAttributes()) {
++ if (str.length() == 0) {
++ return;
++ }
+ new TextLayout(str, font, getFontRenderContext()).draw(this, x, y);
+ return;
+ }
+@@ -2856,6 +2862,9 @@
+ if (iterator == null) {
+ throw new NullPointerException("AttributedCharacterIterator is null");
+ }
++ if (iterator.getBeginIndex() == iterator.getEndIndex()) {
++ return; /* nothing to draw */
++ }
+ TextLayout tl = new TextLayout(iterator, getFontRenderContext());
+ tl.draw(this, (float) x, (float) y);
+ }
+@@ -2865,6 +2874,9 @@
+ if (iterator == null) {
+ throw new NullPointerException("AttributedCharacterIterator is null");
+ }
++ if (iterator.getBeginIndex() == iterator.getEndIndex()) {
++ return; /* nothing to draw */
++ }
+ TextLayout tl = new TextLayout(iterator, getFontRenderContext());
+ tl.draw(this, x, y);
+ }
+@@ -2900,6 +2912,9 @@
+ throw new ArrayIndexOutOfBoundsException("bad offset/length");
+ }
+ if (font.hasLayoutAttributes()) {
++ if (data.length == 0) {
++ return;
++ }
+ new TextLayout(new String(data, offset, length),
+ font, getFontRenderContext()).draw(this, x, y);
+ return;
+@@ -2934,6 +2949,9 @@
+ chData[i] = (char)(data[i+offset] & 0xff);
+ }
+ if (font.hasLayoutAttributes()) {
++ if (data.length == 0) {
++ return;
++ }
+ new TextLayout(new String(chData),
+ font, getFontRenderContext()).draw(this, x, y);
+ return;
+diff -r 55e6548451df -r fb61ff1cc5fd test/java/awt/Graphics2D/DrawString/EmptyAttrString.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java Tue May 13 16:18:30 2008 -0700
+@@ -0,0 +1,58 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/**
++ * @test
++ * @bug 6699843
++ * @summary IllegalArgumentException when using Graphics.drawString( "", 0, 0 )
++ */
++
++import java.awt.*;
++import java.awt.font.*;
++import java.awt.image.*;
++import java.text.*;
++import java.util.*;
++
++public class EmptyAttrString {
++
++ public static void main(String[] args) {
++ BufferedImage bi =
++ new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
++ Graphics2D g = bi.createGraphics();
++ Font f = new Font( "Dialog", Font.PLAIN, 12 );
++ Map map = new HashMap();
++ map.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);
++ f = f.deriveFont(map);
++ g.setFont(f);
++ g.drawString("", 50, 50);
++ g.drawString("", 50f, 50f);
++ char[] chs = { } ;
++ g.drawChars(chs, 0, 0, 50, 50);
++ byte[] bytes = { } ;
++ g.drawBytes(bytes, 0, 0, 50, 50);
++ AttributedString astr = new AttributedString("");
++ g.drawString(astr.getIterator(), 50, 50);
++ g.drawString(astr.getIterator(), 50f, 50f);
++ return;
++ }
++}
More information about the distro-pkg-dev
mailing list