overlapSeg: rephrase the order of comparisons to avoid a -Wfloat-equal warning

Simply makes it clearer to the compiler what this code is doing.

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index 839c3d34746f0fe5b6590f3ab07b6446452c6efe..d61366d9823fe96e552f66b13a7669f6927c7588 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -621,15 +621,13 @@ overlapSeg (segment* S1, segment* S2, bend T1, bend T2)
                else if(S1->l2==T2&&S2->l1==T1) return(1);
                else return(0);
        }
-       else if(S1->p.p2==S2->p.p2) {
-               if(S2->l1==T2) return eqEndSeg (S1->l2, S2->l2, T1, T2);
-               else return -1*eqEndSeg (S2->l2, S1->l2, T1, T2);
-       }
-       else { /* S1->p.p2>S2->p.p2 */
+       if (S1->p.p2 > S2->p.p2) {
                if(S2->l1==T2&&S2->l2==T2) return(-1);
                else if (S2->l1==T1&&S2->l2==T1) return(1);
                else return(0);
        }
+       if (S2->l1 == T2) return eqEndSeg (S1->l2, S2->l2, T1, T2);
+       return -1 * eqEndSeg(S2->l2, S1->l2, T1, T2);
 }
 
 static int