changeset in /hg/icedtea6: * patches/icedtea-stroker-finish.patc...

[Mark Wielaard]

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

diffstat:

4 files changed, 30 insertions(+)
ChangeLog                            |    7 +++++++
HACKING                              |    2 ++
Makefile.am                          |    1 +
patches/icedtea-stroker-finish.patch |   20 ++++++++++++++++++++

diffs (62 lines):

diff -r 16d57d401734 -r b8307e2d80a5 ChangeLog
--- a/ChangeLog	Fri Nov 21 15:23:16 2008 -0500
+++ b/ChangeLog	Fri Nov 21 22:48:56 2008 +0100
@@ -1,4 +1,11 @@ 2008-11-21  Deepak Bhole  <dbhole at redhat
+2008-11-21  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-stroker-finish.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-21  Deepak Bhole  <dbhole at redhat.com>
+
 	* IcedTeaPlugin.cc: Handle memory address->string encoding correctly
 	depending on arch/word size.
 	* plugin/icedtea/netscape/javascript/JSObject.java: Use only long for
diff -r 16d57d401734 -r b8307e2d80a5 HACKING
--- a/HACKING	Fri Nov 21 15:23:16 2008 -0500
+++ b/HACKING	Fri Nov 21 22:48:56 2008 +0100
@@ -63,6 +63,8 @@ The following patches are currently appl
 * 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.
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
+* icedtea-stroker-finish.patch: Make sure cap calculation doesn't result in
+  divide by zero on tiny paths.
 * icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
 * icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
diff -r 16d57d401734 -r b8307e2d80a5 Makefile.am
--- a/Makefile.am	Fri Nov 21 15:23:16 2008 -0500
+++ b/Makefile.am	Fri Nov 21 22:48:56 2008 +0100
@@ -533,6 +533,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-stroker-finish.patch \
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-f2i-overflow.patch \
diff -r 16d57d401734 -r b8307e2d80a5 patches/icedtea-stroker-finish.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-stroker-finish.patch	Fri Nov 21 22:48:56 2008 +0100
@@ -0,0 +1,20 @@
+--- openjdk6/jdk/src/share/classes/sun/java2d/pisces/Stroker.java
++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Stroker.java
+@@ -695,7 +695,7 @@
+             long ldx = (long)(px0 - x0);
+             long ldy = (long)(py0 - y0);
+             long llen = lineLength(ldx, ldy);
+-            long s = (long)lineWidth2*65536/llen;
++            long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen;
+ 
+             int capx = x0 - (int)(ldx*s >> 16);
+             int capy = y0 - (int)(ldy*s >> 16);
+@@ -717,7 +717,7 @@
+             long ldx = (long)(sx1 - sx0);
+             long ldy = (long)(sy1 - sy0);
+             long llen = lineLength(ldx, ldy);
+-            long s = (long)lineWidth2*65536/llen;
++            long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen;
+ 
+             int capx = sx0 - (int)(ldx*s >> 16);
+             int capy = sy0 - (int)(ldy*s >> 16);