Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31037) +++ trunk/src/librnd/pcb_compat.h (revision 31038) @@ -1286,3 +1286,15 @@ #define PCB_POLY_CIRC_SEGS_F RND_POLY_CIRC_SEGS_F #define PCB_POLY_CIRC_RADIUS_ADJ RND_POLY_CIRC_RADIUS_ADJ #define PCB_POLY_ENDP_EPSILON RND_POLY_ENDP_EPSILON +#define pcb_poly_square_pin_factors rnd_poly_square_pin_factors +#define pcb_poly_from_contour rnd_poly_from_contour +#define pcb_poly_from_contour_autoinv rnd_poly_from_contour_autoinv +#define pcb_poly_from_circle rnd_poly_from_circle +#define pcb_poly_from_octagon rnd_poly_from_octagon +#define pcb_poly_from_rect rnd_poly_from_rect +#define RoundRect rnd_poly_from_round_rect +#define pcb_poly_from_line rnd_poly_from_line +#define pcb_poly_from_arc rnd_poly_from_arc +#define pcb_polyarea_no_holes_dicer rnd_polyarea_no_holes_dicer +#define pcb_poly_frac_circle rnd_poly_frac_circle +#define pcb_poly_frac_circle_end rnd_poly_frac_circle_end Index: trunk/src/librnd/poly/polyarea.h =================================================================== --- trunk/src/librnd/poly/polyarea.h (revision 31037) +++ trunk/src/librnd/poly/polyarea.h (revision 31038) @@ -211,4 +211,4 @@ /*** generic geo ***/ int rnd_point_in_triangle(rnd_vector_t A, rnd_vector_t B, rnd_vector_t C, rnd_vector_t P); -#endif /* PCB_POLYAREA_H */ +#endif /* RND_POLYAREA_H */ Index: trunk/src/librnd/poly/polygon1_gen.c =================================================================== --- trunk/src/librnd/poly/polygon1_gen.c (revision 31037) +++ trunk/src/librnd/poly/polygon1_gen.c (revision 31038) @@ -59,7 +59,7 @@ } } -rnd_polyarea_t *pcb_poly_from_contour(rnd_pline_t * contour) +rnd_polyarea_t *rnd_poly_from_contour(rnd_pline_t * contour) { rnd_polyarea_t *p; rnd_poly_contour_pre(contour, rnd_true); @@ -71,7 +71,7 @@ return p; } -rnd_polyarea_t *pcb_poly_from_contour_autoinv(rnd_pline_t *contour) +rnd_polyarea_t *rnd_poly_from_contour_autoinv(rnd_pline_t *contour) { rnd_polyarea_t *p; rnd_poly_contour_pre(contour, rnd_true); @@ -137,7 +137,7 @@ /* add the round cap at the end */ if (end_caps) - pcb_poly_frac_circle(contour, endx2, endy2, v, 2); + rnd_poly_frac_circle(contour, endx2, endy2, v, 2); /* and now do the outer arc (going backwards) */ rx = (width + half) * (1 + radius_adj); @@ -164,15 +164,15 @@ /* now add other round cap */ if (end_caps) - pcb_poly_frac_circle(contour, endx1, endy1, v2, 2); + rnd_poly_frac_circle(contour, endx1, endy1, v2, 2); /* now we have the whole contour */ - if (!(np = pcb_poly_from_contour(contour))) + if (!(np = rnd_poly_from_contour(contour))) return NULL; return np; } -rnd_polyarea_t *pcb_poly_from_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2) +rnd_polyarea_t *rnd_poly_from_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2) { rnd_pline_t *contour = NULL; rnd_vector_t v; @@ -194,16 +194,16 @@ v[0] = x1; v[1] = y2; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); - return pcb_poly_from_contour(contour); + return rnd_poly_from_contour(contour); } -rnd_polyarea_t *pcb_poly_from_octagon(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius, int style) +rnd_polyarea_t *rnd_poly_from_octagon(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius, int style) { rnd_pline_t *contour = NULL; rnd_vector_t v; double xm[8], ym[8]; - pcb_poly_square_pin_factors(style, xm, ym); + rnd_poly_square_pin_factors(style, xm, ym); TODO(": rewrite this to use the same table as the square/oct pin draw function") /* point 7 */ @@ -239,7 +239,7 @@ v[0] = x + ROUND(radius * 0.5) * xm[0]; v[1] = y - ROUND(radius * RND_TAN_22_5_DEGREE_2) * ym[0]; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); - return pcb_poly_from_contour(contour); + return rnd_poly_from_contour(contour); } static void pcb_poly_frac_circle_(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range, int add_last) @@ -285,13 +285,13 @@ * 2 for a half circle * or 4 for a quarter circle */ -void pcb_poly_frac_circle(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range) +void rnd_poly_frac_circle(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range) { pcb_poly_frac_circle_(c, X, Y, v, range, 0); } /* same but adds the last vertex */ -void pcb_poly_frac_circle_end(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range) +void rnd_poly_frac_circle_end(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range) { pcb_poly_frac_circle_(c, X, Y, v, range, 1); } @@ -298,7 +298,7 @@ /* create a circle approximation from lines */ -rnd_polyarea_t *pcb_poly_from_circle(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius) +rnd_polyarea_t *rnd_poly_from_circle(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius) { rnd_pline_t *contour; rnd_vector_t v; @@ -309,16 +309,16 @@ v[1] = y; if ((contour = rnd_poly_contour_new(v)) == NULL) return NULL; - pcb_poly_frac_circle(contour, x, y, v, 1); + rnd_poly_frac_circle(contour, x, y, v, 1); contour->is_round = rnd_true; contour->cx = x; contour->cy = y; contour->radius = radius; - return pcb_poly_from_contour(contour); + return rnd_poly_from_contour(contour); } /* make a rounded-corner rectangle with radius t beyond x1,x2,y1,y2 rectangle */ -rnd_polyarea_t *RoundRect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2, rnd_coord_t t) +rnd_polyarea_t *rnd_poly_from_round_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2, rnd_coord_t t) { rnd_pline_t *contour = NULL; rnd_vector_t v; @@ -329,24 +329,24 @@ v[1] = y1; if ((contour = rnd_poly_contour_new(v)) == NULL) return NULL; - pcb_poly_frac_circle_end(contour, x1, y1, v, 4); + rnd_poly_frac_circle_end(contour, x1, y1, v, 4); v[0] = x2; v[1] = y1 - t; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); - pcb_poly_frac_circle_end(contour, x2, y1, v, 4); + rnd_poly_frac_circle_end(contour, x2, y1, v, 4); v[0] = x2 + t; v[1] = y2; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); - pcb_poly_frac_circle_end(contour, x2, y2, v, 4); + rnd_poly_frac_circle_end(contour, x2, y2, v, 4); v[0] = x1; v[1] = y2 + t; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); - pcb_poly_frac_circle_end(contour, x1, y2, v, 4); - return pcb_poly_from_contour(contour); + rnd_poly_frac_circle_end(contour, x1, y2, v, 4); + return rnd_poly_from_contour(contour); } -rnd_polyarea_t *pcb_poly_from_line(rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, rnd_bool square) +rnd_polyarea_t *rnd_poly_from_line(rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, rnd_bool square) { rnd_pline_t *contour = NULL; rnd_polyarea_t *np = NULL; @@ -360,7 +360,7 @@ d = sqrt(RND_SQUARE(x1 - x2) + RND_SQUARE(y1 - y2)); if (!square) if (d == 0) /* line is a point */ - return pcb_poly_from_circle(x1, y1, half); + return rnd_poly_from_circle(x1, y1, half); if (d != 0) { d = half / d; dx = (y1 - y2) * d; @@ -385,7 +385,7 @@ if (square) rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); else - pcb_poly_frac_circle(contour, x2, y2, v, 2); + rnd_poly_frac_circle(contour, x2, y2, v, 2); v[0] = x2 + dx; v[1] = y2 + dy; rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); @@ -394,15 +394,15 @@ if (square) rnd_poly_vertex_include(contour->head->prev, rnd_poly_node_create(v)); else - pcb_poly_frac_circle(contour, x1, y1, v, 2); + rnd_poly_frac_circle(contour, x1, y1, v, 2); /* now we have the line contour */ - if (!(np = pcb_poly_from_contour(contour))) + if (!(np = rnd_poly_from_contour(contour))) return NULL; return np; } #define MIN_CLEARANCE_BEFORE_BISECT 10. -rnd_polyarea_t *pcb_poly_from_arc(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t astart, rnd_angle_t adelta, rnd_coord_t thick) +rnd_polyarea_t *rnd_poly_from_arc(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t astart, rnd_angle_t adelta, rnd_coord_t thick) { double delta; rnd_coord_t half; @@ -420,10 +420,10 @@ tmp_arc = ArcPolyNoIntersect(cx, cy, width, height, astart, adelta, thick, 0); rnd_arc_get_endpt(cx, cy, width, height, astart, adelta, 0, &lx1, &ly1); - tmp1 = pcb_poly_from_line(lx1, ly1, lx1, ly1, thick, 0); + tmp1 = rnd_poly_from_line(lx1, ly1, lx1, ly1, thick, 0); rnd_arc_get_endpt(cx, cy, width, height, astart, adelta, 1, &lx1, &ly1); - tmp2 = pcb_poly_from_line(lx1, ly1, lx1, ly1, thick, 0); + tmp2 = rnd_poly_from_line(lx1, ly1, lx1, ly1, thick, 0); rnd_polyarea_boolean_free(tmp1, tmp2, &ends, RND_PBO_UNITE); rnd_polyarea_boolean_free(ends, tmp_arc, &res, RND_PBO_UNITE); @@ -448,7 +448,7 @@ /* set up x and y multiplier for an octa poly, depending on square pin style (used in early versions of pcb-rnd, before custom shape padstacks) */ -void pcb_poly_square_pin_factors(int style, double *xm, double *ym) +void rnd_poly_square_pin_factors(int style, double *xm, double *ym) { int i; const double factor = 2.0; @@ -488,7 +488,7 @@ rnd_polyarea_t *poly2, *left, *right; /* make a rectangle of the left region slicing through the middle of the first hole */ - poly2 = pcb_poly_from_rect(p->xmin, (p->next->xmin + p->next->xmax) / 2, p->ymin, p->ymax); + poly2 = rnd_poly_from_rect(p->xmin, (p->next->xmin + p->next->xmax) / 2, p->ymin, p->ymax); rnd_polyarea_and_subtract_free(pa, poly2, &left, &right); if (left) { rnd_polyarea_t *cur, *next; @@ -515,13 +515,13 @@ } } -void pcb_polyarea_no_holes_dicer(rnd_polyarea_t *main_contour, rnd_coord_t clipX1, rnd_coord_t clipY1, rnd_coord_t clipX2, rnd_coord_t clipY2, void (*emit)(rnd_pline_t *, void *), void *user_data) +void rnd_polyarea_no_holes_dicer(rnd_polyarea_t *main_contour, rnd_coord_t clipX1, rnd_coord_t clipY1, rnd_coord_t clipX2, rnd_coord_t clipY2, void (*emit)(rnd_pline_t *, void *), void *user_data) { rnd_polyarea_t *cur, *next; /* clip to the bounding box */ if ((clipX1 != clipX2) || (clipY1 != clipY2)) { - rnd_polyarea_t *cbox = pcb_poly_from_rect(clipX1, clipX2, clipY1, clipY2); + rnd_polyarea_t *cbox = rnd_poly_from_rect(clipX1, clipX2, clipY1, clipY2); rnd_polyarea_boolean_free(main_contour, cbox, &main_contour, RND_PBO_ISECT); } if (main_contour == NULL) Index: trunk/src/librnd/poly/polygon1_gen.h =================================================================== --- trunk/src/librnd/poly/polygon1_gen.h (revision 31037) +++ trunk/src/librnd/poly/polygon1_gen.h (revision 31038) @@ -1,30 +1,30 @@ -#ifndef PCB_POLYGON1_GEN_H -#define PCB_POLYGON1_GEN_H +#ifndef RND_POLYGON1_GEN_H +#define RND_POLYGON1_GEN_H #include #include -void pcb_poly_square_pin_factors(int style, double *xm, double *ym); +void rnd_poly_square_pin_factors(int style, double *xm, double *ym); -rnd_polyarea_t *pcb_poly_from_contour(rnd_pline_t *pl); -rnd_polyarea_t *pcb_poly_from_contour_autoinv(rnd_pline_t *pl); +rnd_polyarea_t *rnd_poly_from_contour(rnd_pline_t *pl); +rnd_polyarea_t *rnd_poly_from_contour_autoinv(rnd_pline_t *pl); -rnd_polyarea_t *pcb_poly_from_circle(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius); -rnd_polyarea_t *pcb_poly_from_octagon(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius, int style); -rnd_polyarea_t *pcb_poly_from_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2); -rnd_polyarea_t *RoundRect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2, rnd_coord_t t); +rnd_polyarea_t *rnd_poly_from_circle(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius); +rnd_polyarea_t *rnd_poly_from_octagon(rnd_coord_t x, rnd_coord_t y, rnd_coord_t radius, int style); +rnd_polyarea_t *rnd_poly_from_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2); +rnd_polyarea_t *rnd_poly_from_round_rect(rnd_coord_t x1, rnd_coord_t x2, rnd_coord_t y1, rnd_coord_t y2, rnd_coord_t t); /* generate a polygon of a round or square cap line of a given thickness */ -rnd_polyarea_t *pcb_poly_from_line(rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, rnd_bool square); +rnd_polyarea_t *rnd_poly_from_line(rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, rnd_bool square); /* generate a polygon of a round cap arc of a given thickness */ -rnd_polyarea_t *pcb_poly_from_arc(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t astart, rnd_angle_t adelta, rnd_coord_t thick); +rnd_polyarea_t *rnd_poly_from_arc(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t astart, rnd_angle_t adelta, rnd_coord_t thick); /* Slice up a polyarea-with-holes into a set of polygon islands with no holes, within the clip area. If the clip area is all-zero, do not clip. Free's main_contour. */ -void pcb_polyarea_no_holes_dicer(rnd_polyarea_t *main_contour, rnd_coord_t clipX1, rnd_coord_t clipY1, rnd_coord_t clipX2, rnd_coord_t clipY2, void (*emit)(rnd_pline_t *, void *), void *user_data); +void rnd_polyarea_no_holes_dicer(rnd_polyarea_t *main_contour, rnd_coord_t clipX1, rnd_coord_t clipY1, rnd_coord_t clipX2, rnd_coord_t clipY2, void (*emit)(rnd_pline_t *, void *), void *user_data); /* Add vertices in a fractional-circle starting from v centered at X, Y and going counter-clockwise. Does not include the first point. Last argument is: @@ -31,9 +31,9 @@ 1 for a full circle 2 for a half circle 4 for a quarter circle */ -void pcb_poly_frac_circle(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range); +void rnd_poly_frac_circle(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range); /* same but adds the last vertex */ -void pcb_poly_frac_circle_end(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range); +void rnd_poly_frac_circle_end(rnd_pline_t * c, rnd_coord_t X, rnd_coord_t Y, rnd_vector_t v, int range); #endif Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 31037) +++ trunk/src/obj_pinvia_therm.c (revision 31038) @@ -73,7 +73,7 @@ v[0] = X + x2; v[1] = Y + y1; rnd_poly_vertex_include(c->head->prev, rnd_poly_node_create(v)); - return pcb_poly_from_contour(c); + return rnd_poly_from_contour(c); } /* ThermPoly returns a rnd_polyarea_t having all of the clearance that when @@ -94,8 +94,8 @@ rnd_polyarea_t *m; rnd_coord_t t = (thickness + clearance) / 2; rnd_coord_t w = 0.5 * pcb->ThermScale * clearance; - pa = pcb_poly_from_circle(cx, cy, t); - arc = pcb_poly_from_circle(cx, cy, thickness / 2); + pa = rnd_poly_from_circle(cx, cy, t); + arc = rnd_poly_from_circle(cx, cy, thickness / 2); /* create a thin ring */ rnd_polyarea_boolean_free(pa, arc, &m, RND_PBO_SUB); /* fix me needs error checking */ @@ -103,9 +103,9 @@ /* t is the theoretically required length, but we use twice that * to avoid discretisation errors in our circle approximation. */ - pa = pcb_poly_from_rect(cx - t * 2, cx + t * 2, cy - w, cy + w); + pa = rnd_poly_from_rect(cx - t * 2, cx + t * 2, cy - w, cy + w); rnd_polyarea_boolean_free(m, pa, &arc, RND_PBO_SUB); - pa = pcb_poly_from_rect(cx - w, cx + w, cy - t * 2, cy + t * 2); + pa = rnd_poly_from_rect(cx - w, cx + w, cy - t * 2, cy + t * 2); } else { /* t is the theoretically required length, but we use twice that Index: trunk/src/obj_poly_draw_helper.c =================================================================== --- trunk/src/obj_poly_draw_helper.c (revision 31037) +++ trunk/src/obj_poly_draw_helper.c (revision 31038) @@ -161,7 +161,7 @@ return; } - clip_poly = pcb_poly_from_rect(clip_box->X1, clip_box->X2, clip_box->Y1, clip_box->Y2); + clip_poly = rnd_poly_from_rect(clip_box->X1, clip_box->X2, clip_box->Y1, clip_box->Y2); rnd_poly_contour_copy(&pl_copy, pl); piece_poly = rnd_polyarea_create(); rnd_polyarea_contour_include(piece_poly, pl_copy); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 31037) +++ trunk/src/polygon.c (revision 31038) @@ -291,12 +291,12 @@ rnd_polyarea_t *pcb_poly_from_pcb_line(pcb_line_t *L, rnd_coord_t thick) { - return pcb_poly_from_line(L->Point1.X, L->Point1.Y, L->Point2.X, L->Point2.Y, thick, PCB_FLAG_TEST(PCB_FLAG_SQUARE, L)); + return rnd_poly_from_line(L->Point1.X, L->Point1.Y, L->Point2.X, L->Point2.Y, thick, PCB_FLAG_TEST(PCB_FLAG_SQUARE, L)); } rnd_polyarea_t *pcb_poly_from_pcb_arc(pcb_arc_t *a, rnd_coord_t thick) { - return pcb_poly_from_arc(a->X, a->Y, a->Width, a->Height, a->StartAngle, a->Delta, thick); + return rnd_poly_from_arc(a->X, a->Y, a->Width, a->Height, a->StartAngle, a->Delta, thick); } @@ -345,7 +345,7 @@ rnd_polyarea_t *pcb_poly_from_box_bloated(rnd_rnd_box_t * box, rnd_coord_t bloat) { - return pcb_poly_from_rect(box->X1 - bloat, box->X2 + bloat, box->Y1 - bloat, box->Y2 + bloat); + return rnd_poly_from_rect(box->X1 - bloat, box->X2 + bloat, box->Y1 - bloat, box->Y2 + bloat); } /* remove the padstack clearance from the polygon */ @@ -438,7 +438,7 @@ /* old method: clear by bounding box */ const rnd_rnd_box_t *b = &text->BoundingBox; rnd_polyarea_t *np; - if (!(np = RoundRect(b->X1 + conf_core.design.bloat, b->X2 - conf_core.design.bloat, b->Y1 + conf_core.design.bloat, b->Y2 - conf_core.design.bloat, conf_core.design.bloat))) + if (!(np = rnd_poly_from_round_rect(b->X1 + conf_core.design.bloat, b->X2 - conf_core.design.bloat, b->Y1 + conf_core.design.bloat, b->Y2 - conf_core.design.bloat, conf_core.design.bloat))) return -1; return Subtract(np, p, rnd_true); } @@ -1522,7 +1522,7 @@ if (r < 1) return rnd_false; - if (!(c = pcb_poly_from_circle(X, Y, r))) + if (!(c = rnd_poly_from_circle(X, Y, r))) return rnd_false; return pcb_poly_isects_poly(c, p, rnd_true); } @@ -1539,7 +1539,7 @@ rnd_bool pcb_poly_is_rect_in_p(rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, pcb_poly_t *p) { rnd_polyarea_t *s; - if (!(s = pcb_poly_from_rect(min(X1, X2), max(X1, X2), min(Y1, Y2), max(Y1, Y2)))) + if (!(s = rnd_poly_from_rect(min(X1, X2), max(X1, X2), min(Y1, Y2), max(Y1, Y2)))) return rnd_false; return pcb_poly_isects_poly(s, p, rnd_true); } @@ -1553,9 +1553,9 @@ rnd_polyarea_copy1(main_contour, p->Clipped); if (clip == NULL) - pcb_polyarea_no_holes_dicer(main_contour, 0, 0, 0, 0, emit, user_data); + rnd_polyarea_no_holes_dicer(main_contour, 0, 0, 0, 0, emit, user_data); else - pcb_polyarea_no_holes_dicer(main_contour, clip->X1, clip->Y1, clip->X2, clip->Y2, emit, user_data); + rnd_polyarea_no_holes_dicer(main_contour, clip->X1, clip->Y1, clip->X2, clip->Y2, emit, user_data); } /* make a polygon split into multiple parts into multiple polygons */ Index: trunk/src/thermal.c =================================================================== --- trunk/src/thermal.c (revision 31037) +++ trunk/src/thermal.c (revision 31038) @@ -519,7 +519,7 @@ /* optical tuning: make sure the clearance is large enough around corners even if lines didn't meet - just throw in a big circle */ - ptmp = pcb_poly_from_circle(x, y, clr); + ptmp = rnd_poly_from_circle(x, y, clr); rnd_polyarea_boolean(ptmp, *pres, &p, RND_PBO_UNITE); rnd_polyarea_free(pres); rnd_polyarea_free(&ptmp); @@ -689,7 +689,7 @@ return NULL; goto retry; case PCB_PSSH_CIRC: - return pcb_poly_from_circle(ps->x + shp->data.circ.x, ps->y + shp->data.circ.y, shp->data.circ.dia/2 + clearance); + return rnd_poly_from_circle(ps->x + shp->data.circ.x, ps->y + shp->data.circ.y, shp->data.circ.dia/2 + clearance); case PCB_PSSH_LINE: return pa_line_at(ps->x + shp->data.line.x1, ps->y + shp->data.line.y1, ps->x + shp->data.line.x2, ps->y + shp->data.line.y2, shp->data.line.thickness + clearance*2, shp->data.line.square); case PCB_PSSH_POLY: Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 31037) +++ trunk/src_plugins/jostle/jostle.c (revision 31038) @@ -481,7 +481,7 @@ x = pcb_crosshair.X; y = pcb_crosshair.Y; fprintf(stderr, "%d, %d, %f\n", (int) x, (int) y, value); - info.brush = pcb_poly_from_circle(x, y, value / 2); + info.brush = rnd_poly_from_circle(x, y, value / 2); info.layer = PCB_CURRLAYER(PCB); PCB_LINE_LOOP(info.layer); { Index: trunk/src_plugins/lib_compat_help/pstk_compat.c =================================================================== --- trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 31037) +++ trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 31038) @@ -44,7 +44,7 @@ pcb_pstk_shape_alloc_poly(dst, 8); - pcb_poly_square_pin_factors(style, xm, ym); + rnd_poly_square_pin_factors(style, xm, ym); dst->x[7] = x0 + rnd_round(rx * 0.5) * xm[7]; dst->y[7] = y0 + rnd_round(ry * RND_TAN_22_5_DEGREE_2) * ym[7]; @@ -296,7 +296,7 @@ /* compare to all known shape factors */ for(shi = PCB_PSTK_COMPAT_SHAPED; shi <= PCB_PSTK_COMPAT_SHAPED_END; shi++) { - pcb_poly_square_pin_factors(shi - PCB_PSTK_COMPAT_SHAPED, xm, ym); + rnd_poly_square_pin_factors(shi - PCB_PSTK_COMPAT_SHAPED, xm, ym); found = 1; for(n = 0; n < 8; n++) { if ((xm[n] != x[n]) || (ym[n] != y[n])) { Index: trunk/src_plugins/millpath/toolpath.c =================================================================== --- trunk/src_plugins/millpath/toolpath.c (revision 31037) +++ trunk/src_plugins/millpath/toolpath.c (revision 31038) @@ -433,12 +433,12 @@ rnd_coord_t r = (line->Thickness-1)/2 - 1000; int within = 0; - c = pcb_poly_from_circle(line->Point1.X, line->Point1.Y, r); + c = rnd_poly_from_circle(line->Point1.X, line->Point1.Y, r); within |= rnd_polyarea_touching(pa, c); rnd_polyarea_free(&c); if (!within) { - c = pcb_poly_from_circle(line->Point2.X, line->Point2.Y, r); + c = rnd_poly_from_circle(line->Point2.X, line->Point2.Y, r); if (!within) within |= rnd_polyarea_touching(pa, c); rnd_polyarea_free(&c);