X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FLine.java;fp=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FLine.java;h=14a1f6d248f0e4fa9431b1826f6a557b6ab4e7c1;hp=cafa081ff6e6e236996c4e6dad5f8c8fde0c71dc;hb=8084a784db5cd0f688d230ab9624ab6966265f39;hpb=7c73c0f732bbadef09d098b7f4542b060fdacc7d

diff --git a/src/edu/berkeley/qfat/geom/Line.java b/src/edu/berkeley/qfat/geom/Line.java
index cafa081..14a1f6d 100644
--- a/src/edu/berkeley/qfat/geom/Line.java
+++ b/src/edu/berkeley/qfat/geom/Line.java
@@ -67,8 +67,8 @@ public class Line implements AffineConstraint {
             Math.abs(this.d-line.d) <= epsilon)
             return this;
         float x = (line.c-this.c)/(this.m-line.m);
-        if (Math.abs( (m*x+c)-(line.m*x+line.c) ) > epsilon ) return null;
-        if (Math.abs( (n*x+d)-(line.n*x+line.d) ) > epsilon ) return null;
+        if (Math.abs( (m*x+c)-(line.m*x+line.c) ) > epsilon ) return AffineConstraint.NONE;
+        if (Math.abs( (n*x+d)-(line.n*x+line.d) ) > epsilon ) return AffineConstraint.NONE;
         return new Point(x, m*x+c, n*x+d);
     }