Index: search.c =================================================================== --- search.c (revision 21737) +++ search.c (revision 21738) @@ -698,7 +698,7 @@ line.Point1.Y = line.Point2.Y = Y1; line.Point1.X = X1; line.Point2.X = X2; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* upper-right to lower-right corner */ @@ -705,7 +705,7 @@ line.Point1.X = X2; line.Point1.Y = Y1; line.Point2.Y = Y2; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* lower-right to lower-left corner */ @@ -712,7 +712,7 @@ line.Point1.Y = Y2; line.Point1.X = X1; line.Point2.X = X2; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* lower-left to upper-left corner */ @@ -719,7 +719,7 @@ line.Point2.X = X1; line.Point1.Y = Y1; line.Point2.Y = Y2; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; return pcb_false; @@ -776,25 +776,25 @@ line.Point1.Y = p[0].Y; line.Point2.X = p[1].X; line.Point2.Y = p[1].Y; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* upper-right to lower-right corner */ line.Point1.X = p[2].X; line.Point1.Y = p[2].Y; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* lower-right to lower-left corner */ line.Point2.X = p[3].X; line.Point2.Y = p[3].Y; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; /* lower-left to upper-left corner */ line.Point1.X = p[0].X; line.Point1.Y = p[0].Y; - if (pcb_intersect_line_line(&line, Line)) + if (pcb_isc_line_line(&line, Line)) return pcb_true; return pcb_false; @@ -827,7 +827,7 @@ line.Point1.Y = line.Point2.Y = Y1; line.Point1.X = X1; line.Point2.X = X2; - if (pcb_intersect_line_arc(&line, Arc)) + if (pcb_isc_line_arc(&line, Arc)) return pcb_true; /* upper-right to lower-right corner */ @@ -834,7 +834,7 @@ line.Point1.X = line.Point2.X = X2; line.Point1.Y = Y1; line.Point2.Y = Y2; - if (pcb_intersect_line_arc(&line, Arc)) + if (pcb_isc_line_arc(&line, Arc)) return pcb_true; /* lower-right to lower-left corner */ @@ -841,7 +841,7 @@ line.Point1.Y = line.Point2.Y = Y2; line.Point1.X = X1; line.Point2.X = X2; - if (pcb_intersect_line_arc(&line, Arc)) + if (pcb_isc_line_arc(&line, Arc)) return pcb_true; /* lower-left to upper-left corner */ @@ -848,7 +848,7 @@ line.Point1.X = line.Point2.X = X1; line.Point1.Y = Y1; line.Point2.Y = Y2; - if (pcb_intersect_line_arc(&line, Arc)) + if (pcb_isc_line_arc(&line, Arc)) return pcb_true; return pcb_false;