Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 21737) +++ trunk/src/find.c (revision 21738) @@ -147,9 +147,9 @@ static pcb_bool LookupLOConnectionsToPolygon(pcb_poly_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToRatEnd(pcb_point_t *, pcb_cardinal_t); -static pcb_bool IsRatPointOnLineSpec(pcb_point_t *, pcb_line_t *); -static pcb_bool IsRatPointOnPoly(pcb_point_t *Point, pcb_poly_t *polygon); -static pcb_bool IsRatPointOnArcSpec(pcb_point_t *Point, pcb_arc_t *arc); +static pcb_bool pcb_isc_rat_line(pcb_point_t *, pcb_line_t *); +static pcb_bool pcb_isc_rat_poly(pcb_point_t *Point, pcb_poly_t *polygon); +static pcb_bool pcb_isc_rat_arc(pcb_point_t *Point, pcb_arc_t *arc); static pcb_bool ArcArcIntersect(pcb_arc_t *, pcb_arc_t *); static pcb_bool pcb_print_subc_conns(pcb_subc_t *, FILE *, pcb_bool); static pcb_bool ListsEmpty(pcb_bool); Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 21737) +++ trunk/src/find.h (revision 21738) @@ -60,8 +60,8 @@ #define PCB_SILK_TYPE \ (PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY) -pcb_bool pcb_intersect_line_line(pcb_line_t *, pcb_line_t *); -pcb_bool pcb_intersect_line_arc(pcb_line_t *, pcb_arc_t *); +pcb_bool pcb_isc_line_line(pcb_line_t *, pcb_line_t *); +pcb_bool pcb_isc_line_arc(pcb_line_t *, pcb_arc_t *); pcb_bool pcb_is_poly_in_poly(pcb_poly_t *, pcb_poly_t *); void pcb_lookup_conns_to_all_elements(FILE *); void pcb_lookup_conn(pcb_coord_t, pcb_coord_t, pcb_bool, pcb_coord_t, int); @@ -78,7 +78,7 @@ void pcb_save_find_flag(int); void pcb_restore_find_flag(void); pcb_bool pcb_is_line_in_poly(pcb_line_t *, pcb_poly_t *); -pcb_bool pcb_is_arc_in_poly(pcb_arc_t *, pcb_poly_t *); +pcb_bool pcb_isc_arc_poly(pcb_arc_t *, pcb_poly_t *); pcb_bool pcb_intersect_obj_obj(pcb_any_obj_t *a, pcb_any_obj_t *b); pcb_bool_t pcb_pstk_intersect_line(pcb_pstk_t *ps, pcb_line_t *line); Index: trunk/src/find_any_isect.c =================================================================== --- trunk/src/find_any_isect.c (revision 21737) +++ trunk/src/find_any_isect.c (revision 21738) @@ -48,10 +48,10 @@ case PCB_OBJ_LINE: switch(b->type) { case PCB_OBJ_VOID: return pcb_false; - case PCB_OBJ_LINE: return pcb_intersect_line_line((pcb_line_t *)a, (pcb_line_t *)b); + case PCB_OBJ_LINE: return pcb_isc_line_line((pcb_line_t *)a, (pcb_line_t *)b); case PCB_OBJ_TEXT: return pcb_intersect_text_line((pcb_text_t *)b, (pcb_line_t *)a); case PCB_OBJ_POLY: return pcb_is_line_in_poly((pcb_line_t *)a, (pcb_poly_t *)b); - case PCB_OBJ_ARC: return pcb_intersect_line_arc((pcb_line_t *)a, (pcb_arc_t *)b); + case PCB_OBJ_ARC: return pcb_isc_line_arc((pcb_line_t *)a, (pcb_arc_t *)b); case PCB_OBJ_PSTK: return pcb_pstk_intersect_line((pcb_pstk_t *)b, (pcb_line_t *)a); default:; } @@ -74,7 +74,7 @@ case PCB_OBJ_LINE: return pcb_is_line_in_poly((pcb_line_t *)b, (pcb_poly_t *)a); case PCB_OBJ_TEXT: return pcb_intersect_text_poly((pcb_text_t *)b, (pcb_poly_t *)a); case PCB_OBJ_POLY: return pcb_is_poly_in_poly((pcb_poly_t *)a, (pcb_poly_t *)b); - case PCB_OBJ_ARC: return pcb_is_arc_in_poly((pcb_arc_t *)b, (pcb_poly_t *)a); + case PCB_OBJ_ARC: return pcb_isc_arc_poly((pcb_arc_t *)b, (pcb_poly_t *)a); case PCB_OBJ_PSTK: return pcb_pstk_intersect_poly((pcb_pstk_t *)b, (pcb_poly_t *)a); default:; } @@ -82,10 +82,10 @@ case PCB_OBJ_ARC: switch(b->type) { case PCB_OBJ_VOID: return pcb_false; - case PCB_OBJ_LINE: return pcb_intersect_line_arc((pcb_line_t *)b, (pcb_arc_t *)a); + case PCB_OBJ_LINE: return pcb_isc_line_arc((pcb_line_t *)b, (pcb_arc_t *)a); case PCB_OBJ_TEXT: return pcb_intersect_text_arc((pcb_text_t *)b, (pcb_arc_t *)a); - case PCB_OBJ_POLY: return pcb_is_arc_in_poly((pcb_arc_t *)a, (pcb_poly_t *)b); - case PCB_OBJ_ARC: return ArcArcIntersect((pcb_arc_t *)a, (pcb_arc_t *)b); + case PCB_OBJ_POLY: return pcb_isc_arc_poly((pcb_arc_t *)a, (pcb_poly_t *)b); + case PCB_OBJ_ARC: return pcb_isc_arc_arc((pcb_arc_t *)a, (pcb_arc_t *)b); case PCB_OBJ_PSTK: return pcb_pstk_intersect_arc((pcb_pstk_t *)b, (pcb_arc_t *)a); default:; } Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 21737) +++ trunk/src/find_deadcode.c (revision 21738) @@ -36,7 +36,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line)) + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_line_line(&i->line, line)) longjmp(i->env, 1); return 0; } @@ -48,7 +48,7 @@ if (!arc->Thickness) return 0; - if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc)) + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_line_arc(&i->line, arc)) longjmp(i->env, 1); return 0; } Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 21737) +++ trunk/src/find_geo.c (revision 21738) @@ -39,7 +39,7 @@ * to X,Y * * Intersection of line <--> line: - * - see the description of 'pcb_intersect_line_line()' + * - see the description of 'pcb_isc_line_line()' */ #include "macro.h" @@ -110,7 +110,7 @@ * * */ -static pcb_bool ArcArcIntersect(pcb_arc_t *Arc1, pcb_arc_t *Arc2) +static pcb_bool pcb_isc_arc_arc(pcb_arc_t *Arc1, pcb_arc_t *Arc2) { double x, y, dx, dy, r1, r2, a, d, l, t, t1, t2, dl; pcb_coord_t pdx, pdy; @@ -221,7 +221,7 @@ /* --------------------------------------------------------------------------- * Tests if point is same as line end point or center point */ -static pcb_bool IsRatPointOnLineSpec(pcb_point_t *Point, pcb_line_t *Line) +static pcb_bool pcb_isc_rat_line(pcb_point_t *Point, pcb_line_t *Line) { pcb_coord_t cx, cy; @@ -241,7 +241,7 @@ /* --------------------------------------------------------------------------- * Tests if point is same as arc end point or center point */ -static pcb_bool IsRatPointOnArcSpec(pcb_point_t *Point, pcb_arc_t *arc) +static pcb_bool pcb_isc_rat_arc(pcb_point_t *Point, pcb_arc_t *arc) { pcb_coord_t cx, cy; @@ -265,7 +265,7 @@ /* --------------------------------------------------------------------------- * Tests if rat line point is connected to a polygon */ -static pcb_bool IsRatPointOnPoly(pcb_point_t *Point, pcb_poly_t *polygon) +static pcb_bool pcb_isc_rat_poly(pcb_point_t *Point, pcb_poly_t *polygon) { pcb_coord_t cx, cy; @@ -363,7 +363,7 @@ * Also note that the denominators of eqn 1 & 2 are identical. * */ -pcb_bool pcb_intersect_line_line(pcb_line_t *Line1, pcb_line_t *Line2) +pcb_bool pcb_isc_line_line(pcb_line_t *Line1, pcb_line_t *Line2) { double s, r; double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy; @@ -373,7 +373,7 @@ return pcb_is_line_in_quadrangle(p, Line2); } /* here come only round Line1 because pcb_is_line_in_quadrangle() - calls pcb_intersect_line_line() with first argument rounded */ + calls pcb_isc_line_line() with first argument rounded */ if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line2)) { pcb_point_t p[4]; form_slanted_rectangle(p, Line2); @@ -460,7 +460,7 @@ * * The end points are hell so they are checked individually */ -pcb_bool pcb_intersect_line_arc(pcb_line_t *Line, pcb_arc_t *Arc) +pcb_bool pcb_isc_line_arc(pcb_line_t *Line, pcb_arc_t *Arc) { double dx, dy, dx1, dy1, l, d, r, r2, Radius; pcb_coord_t ex, ey; @@ -518,7 +518,7 @@ * - check the two end points of the arc. If none of them matches * - check all segments of the polygon against the arc. */ -pcb_bool pcb_is_arc_in_poly(pcb_arc_t *Arc, pcb_poly_t *Polygon) +pcb_bool pcb_isc_arc_poly(pcb_arc_t *Arc, pcb_poly_t *Polygon) { pcb_box_t *Box = (pcb_box_t *) Arc; @@ -539,7 +539,7 @@ return pcb_false; } -pcb_bool pcb_is_arc_in_polyarea(pcb_arc_t *Arc, pcb_polyarea_t *pa) +pcb_bool pcb_isc_arc_polyarea(pcb_arc_t *Arc, pcb_polyarea_t *pa) { pcb_box_t *Box = (pcb_box_t *) Arc; pcb_bool res = pcb_false; @@ -750,7 +750,7 @@ { pcb_line_t tmp; shape_line_to_pcb_line(ps, shape->data.line, tmp); - return pcb_intersect_line_line(line, &tmp); + return pcb_isc_line_line(line, &tmp); } case PCB_PSSH_CIRC: { @@ -791,7 +791,7 @@ if (shape->data.poly.pa == NULL) pcb_pstk_shape_update_pa(&shape->data.poly); - return pcb_is_arc_in_polyarea(&tmp, shape->data.poly.pa); + return pcb_isc_arc_polyarea(&tmp, shape->data.poly.pa); } case PCB_PSSH_LINE: @@ -798,7 +798,7 @@ { pcb_line_t tmp; shape_line_to_pcb_line(ps, shape->data.line, tmp); - return pcb_intersect_line_arc(&tmp, arc); + return pcb_isc_line_arc(&tmp, arc); } case PCB_PSSH_CIRC: return pcb_is_point_on_arc(shape->data.circ.x + ps->x, shape->data.circ.y + ps->y, shape->data.circ.dia/2, arc); @@ -930,7 +930,7 @@ pcb_line_t tmp1, tmp2; shape_line_to_pcb_line(ps1, shape1->data.line, tmp1); shape_line_to_pcb_line(ps2, shape2->data.line, tmp2); - return pcb_intersect_line_line(&tmp1, &tmp2); + return pcb_isc_line_line(&tmp1, &tmp2); } case PCB_PSSH_CIRC: return pstk_shape_int_circ_line(ps1, shape1, ps2, shape2); Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 21737) +++ trunk/src/find_lookup.c (revision 21738) @@ -616,7 +616,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_arc(line, &i->arc) && !INOCN(line, &i->arc)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_line_arc(line, &i->arc) && !INOCN(line, &i->arc)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER, i->orig_arc)) longjmp(i->env, 1); } @@ -630,7 +630,7 @@ if (!arc->Thickness) return 0; - if (!PCB_FLAG_TEST(TheFlag, arc) && ArcArcIntersect(&i->arc, arc) && !INOCN(&i->arc, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_arc_arc(&i->arc, arc) && !INOCN(&i->arc, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER, i->orig_arc)) longjmp(i->env, 1); } @@ -644,12 +644,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) - && IsRatPointOnArcSpec(&rat->Point1, &i->arc)) { + && pcb_isc_rat_arc(&rat->Point1, &i->arc)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT, i->orig_arc)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) - && IsRatPointOnArcSpec(&rat->Point2, &i->arc)) { + && pcb_isc_rat_arc(&rat->Point2, &i->arc)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT, i->orig_arc)) longjmp(i->env, 1); } @@ -705,7 +705,7 @@ pcb_box_t *b; for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) { pcb_poly_t *polygon = (pcb_poly_t *)b; - if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_arc_in_poly(Arc, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_isc_arc_poly(Arc, polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_ARC, Arc, PCB_FCT_COPPER, Arc)) return pcb_true; } @@ -721,7 +721,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line) && !INOCN(&i->line, line)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_line_line(&i->line, line) && !INOCN(&i->line, line)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER, i->orig_line)) longjmp(i->env, 1); } @@ -735,7 +735,7 @@ if (!arc->Thickness) return 0; - if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc) && !INOCN(&i->line, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_line_arc(&i->line, arc) && !INOCN(&i->line, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER, i->orig_line)) longjmp(i->env, 1); } @@ -749,12 +749,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) - && IsRatPointOnLineSpec(&rat->Point1, &i->line)) { + && pcb_isc_rat_line(&rat->Point1, &i->line)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT, i->orig_line)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) - && IsRatPointOnLineSpec(&rat->Point2, &i->line)) { + && pcb_isc_rat_line(&rat->Point2, &i->line)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT, i->orig_line)) longjmp(i->env, 1); } @@ -828,7 +828,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, line) && IsRatPointOnLineSpec(i->Point, line)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_rat_line(i->Point, line)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -840,7 +840,7 @@ pcb_arc_t *arc = (pcb_arc_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, arc) && IsRatPointOnArcSpec(i->Point, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_rat_arc(i->Point, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -852,7 +852,7 @@ pcb_poly_t *polygon = (pcb_poly_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && IsRatPointOnPoly(i->Point, polygon)) { + if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && pcb_isc_rat_poly(i->Point, polygon)) { if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -910,7 +910,7 @@ if (!arc->Thickness) return 0; - if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon) && !INOCN(arc, &i->polygon)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_arc_poly(arc, &i->polygon) && !INOCN(arc, &i->polygon)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER, i->orig_polygon)) longjmp(i->env, 1); } @@ -923,8 +923,8 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, rat)) { - if (((rat->group1 == i->layer) && IsRatPointOnPoly(&rat->Point1, &i->polygon)) - || ((rat->group2 == i->layer) && IsRatPointOnPoly(&rat->Point2, &i->polygon))) { + if (((rat->group1 == i->layer) && pcb_isc_rat_poly(&rat->Point1, &i->polygon)) + || ((rat->group2 == i->layer) && pcb_isc_rat_poly(&rat->Point2, &i->polygon))) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_POLY, &i->polygon, PCB_FCT_RAT, i->orig_polygon)) longjmp(i->env, 1); } Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 21737) +++ trunk/src/obj_line_drcenf.c (revision 21738) @@ -222,7 +222,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_intersect_line_line(line, i->line)) + if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_isc_line_line(line, i->line)) longjmp(i->env, 1); return PCB_R_DIR_FOUND_CONTINUE; } @@ -232,7 +232,7 @@ pcb_arc_t *arc = (pcb_arc_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_intersect_line_arc(i->line, arc)) + if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_isc_line_arc(i->line, arc)) longjmp(i->env, 1); return PCB_R_DIR_FOUND_CONTINUE; } Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 21737) +++ trunk/src/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;