changeset in /hg/icedtea6: * patches/icedtea-renderer-crossing.p...

[Mark Wielaard]

changeset fda32eba4b37 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fda32eba4b37
description:
	* patches/icedtea-renderer-crossing.patch: New patch.
	        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	        * HACKING: Document new patch.

diffstat:

4 files changed, 25 insertions(+), 1 deletion(-)
ChangeLog                               |    6 ++++++
HACKING                                 |    2 ++
Makefile.am                             |    3 ++-
patches/icedtea-renderer-crossing.patch |   15 +++++++++++++++

diffs (57 lines):

diff -r 55a7a736bf3d -r fda32eba4b37 ChangeLog
--- a/ChangeLog	Mon Oct 27 12:05:29 2008 +0100
+++ b/ChangeLog	Mon Oct 27 15:52:37 2008 +0100
@@ -1,3 +1,9 @@ 2008-10-27  Matthias Klose  <doko at ubuntu
+2008-10-27  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-renderer-crossing.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-10-27  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-uname.dpatch: Only call dpkg-architecture if it is
diff -r 55a7a736bf3d -r fda32eba4b37 HACKING
--- a/HACKING	Mon Oct 27 12:05:29 2008 +0100
+++ b/HACKING	Mon Oct 27 15:52:37 2008 +0100
@@ -62,6 +62,8 @@ The following patches are currently appl
 * icedtea-arch.patch: Add support for additional architectures.
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
+* patches/icedtea-renderer-crossing.patch: Check whether crossing is
+  initialized in Pisces Renderer.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 55a7a736bf3d -r fda32eba4b37 Makefile.am
--- a/Makefile.am	Mon Oct 27 12:05:29 2008 +0100
+++ b/Makefile.am	Mon Oct 27 15:52:37 2008 +0100
@@ -533,7 +533,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-6open-6756202.patch \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
-	patches/icedtea-xjc.patch
+	patches/icedtea-xjc.patch \
+	patches/icedtea-renderer-crossing.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 55a7a736bf3d -r fda32eba4b37 patches/icedtea-renderer-crossing.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-renderer-crossing.patch	Mon Oct 27 15:52:37 2008 +0100
@@ -0,0 +1,15 @@
+--- openjdk6/jdk/src/share/classes/sun/java2d/pisces/Renderer.java	2008-08-28 10:14:15.000000000 +0200
++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Renderer.java	2008-10-27 13:54:25.000000000 +0100
+@@ -775,10 +775,10 @@
+ 
+     // Free sorting arrays if larger than maximum size
+     private void crossingListFinished() {
+-        if (crossings.length > DEFAULT_CROSSINGS_SIZE) {
++        if (crossings != null && crossings.length > DEFAULT_CROSSINGS_SIZE) {
+             crossings = new int[DEFAULT_CROSSINGS_SIZE];
+         }
+-        if (crossingIndices.length > DEFAULT_INDICES_SIZE) {
++        if (crossingIndices != null && crossingIndices.length > DEFAULT_INDICES_SIZE) {
+             crossingIndices = new int[DEFAULT_INDICES_SIZE];
+         }
+     }