deweese 02/02/19 12:05:07
Modified: test-references/org/apache/batik/ext/awt/geom rlm.merge.in
rlm.merge.out
Log:
1) Added test for infinate loop case in rect merging.
Revision Changes Path
1.3 +13 -0
xml-batik/test-references/org/apache/batik/ext/awt/geom/rlm.merge.in
Index: rlm.merge.in
===================================================================
RCS file:
/home/cvs/xml-batik/test-references/org/apache/batik/ext/awt/geom/rlm.merge.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rlm.merge.in 19 Feb 2002 19:22:23 -0000 1.2
+++ rlm.merge.in 19 Feb 2002 20:05:07 -0000 1.3
@@ -75,3 +75,16 @@
# Should collapse (overhead overcomes)
merge 440 11
print
+
+# This reproduces a bug in the original merge code.
+# The tricky bit is that Rect 1 & 2 won't merge but
+# rects 1 & 4 will the result will merge with 2.
+# This caused an infinate loop.
+RectListManger rlm8-1
+rect 194 218 1 1
+rect 200 10 1 1
+rect 226 246 1 1
+rect 227 228 1 1
+print
+merge 1000 10
+print
1.2 +10 -0
xml-batik/test-references/org/apache/batik/ext/awt/geom/rlm.merge.out
Index: rlm.merge.out
===================================================================
RCS file:
/home/cvs/xml-batik/test-references/org/apache/batik/ext/awt/geom/rlm.merge.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rlm.merge.out 12 Feb 2002 18:17:44 -0000 1.1
+++ rlm.merge.out 19 Feb 2002 20:05:07 -0000 1.2
@@ -58,3 +58,13 @@
ID: rlm7-1 Sz: 1
java.awt.Rectangle[x=0,y=0,width=30,height=70]
+ID: rlm8-1 Sz: 4
+ java.awt.Rectangle[x=194,y=218,width=1,height=1]
+ java.awt.Rectangle[x=200,y=10,width=1,height=1]
+ java.awt.Rectangle[x=226,y=246,width=1,height=1]
+ java.awt.Rectangle[x=227,y=228,width=1,height=1]
+
+ID: rlm8-1 Sz: 2
+ java.awt.Rectangle[x=194,y=218,width=34,height=29]
+ java.awt.Rectangle[x=200,y=10,width=1,height=1]
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
