[Commit] tess ChangeLog,1.5,1.6 bentley.5c,1.6,1.7

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/tess
In directory home.keithp.com:/tmp/cvs-serv3156

Modified Files:
	ChangeLog bentley.5c 
Log Message:

        * bentley.5c (bentley_ottman): Cosmetic changes: Rename
        insert_event_if_intersect to
        insert_event_if_intersect_below_current_y and use more descriptive
        left,right in place of a,b.


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/tess/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	7 Jul 2004 19:20:09 -0000	1.5
+++ ChangeLog	7 Jul 2004 19:26:59 -0000	1.6
@@ -1,5 +1,12 @@
 2004-07-07  Carl Worth  <cworth at isi.edu>
 
+	* bentley.5c (bentley_ottman): Cosmetic changes: Rename
+	insert_event_if_intersect to
+	insert_event_if_intersect_below_current_y and use more descriptive
+	left,right in place of a,b.
+
+2004-07-07  Carl Worth  <cworth at isi.edu>
+
 	* bentley.5c: Add multi test showing several segments with a
 	common intersection.
 	(bentley_ottman): Fix to skip processing of intersection event if

Index: bentley.5c
===================================================================
RCS file: /local/src/CVS/tess/bentley.5c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bentley.5c	7 Jul 2004 19:20:09 -0000	1.6
+++ bentley.5c	7 Jul 2004 19:26:59 -0000	1.7
@@ -359,28 +359,28 @@
 
     EdgePtr sweep_line = Sortlist::List.nil;
 
-    void insert_event_if_intersect (EdgePtr a, EdgePtr b) {
+    void insert_event_if_intersect_below_current_y (EdgePtr left, EdgePtr right) {
 
-	if (a == Sortlist::List.nil || b == Sortlist::List.nil)
+	if (left == Sortlist::List.nil || right == Sortlist::List.nil)
 	    return;
 
 	RationalPoint intersection;
 	try {
-	    intersection = intersect_lines (*a.elt, *b.elt);
+	    intersection = intersect_lines (*left.elt, *right.elt);
 	} catch parallel () {
 	    return;
 	}
 
 	if (intersection.y > current_y
-	    && intersection.y < a.elt->bottom.y 
-	    && intersection.y < b.elt->bottom.y
+	    && intersection.y < left.elt->bottom.y 
+	    && intersection.y < right.elt->bottom.y
 	    )
 	{
 	    Sortlist::insert (&event_queue,
 			      (EventPtr.elt) &(Event) {
 		                  type = EventType.Intersect,
-				      e1 = a,
-				      e2 = b,
+				      e1 = left,
+				      e2 = right,
 				      point = {
 					  x = floor (intersection.x + 0.5),
 					  y = floor (intersection.y + 0.5)
@@ -415,8 +415,8 @@
 	    Sortlist::insert (&sweep_line, edge, edge_greater);
 	    left = edge.elt->prev;
 	    right = edge.elt->next;
-	    insert_event_if_intersect (left, edge);
-	    insert_event_if_intersect (edge, right);
+	    insert_event_if_intersect_below_current_y (left, edge);
+	    insert_event_if_intersect_below_current_y (edge, right);
 	    break;
 	case Stop:
 	    EdgePtr edge, left, right;
@@ -430,7 +430,7 @@
 	    left = edge.elt->prev;
 	    right = edge.elt->next;
 	    Sortlist::delete (&sweep_line, edge);
-	    insert_event_if_intersect (left, right);
+	    insert_event_if_intersect_below_current_y (left, right);
 	    break;
 	case Intersect:
 	    EdgePtr e1, e2, left, right;
@@ -457,11 +457,11 @@
 	    /* after the swap e2 is left of e1 */
 	    e2 = event.elt->e2;
 	    left = e2.elt->prev;
-	    insert_event_if_intersect (left, e2);
+	    insert_event_if_intersect_below_current_y (left, e2);
 
 	    e1 = event.elt->e1;
 	    right = e1.elt->next;
-	    insert_event_if_intersect (e1, right);
+	    insert_event_if_intersect_below_current_y (e1, right);
 	    break;
 	}
     }