Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 6691) +++ trunk/doc/developer/renames (revision 6692) @@ -737,7 +737,7 @@ ArcPoly -> pcb_poly_from_arc PinPoly -> pcb_poly_from_pin BoxPolyBloated -> pcb_poly_from_box_bloated -frac_circle -> pcb_poly_frac_cicle +frac_circle -> pcb_poly_frac_circle InitClip -> pcb_poly_init_clip RestoreToPolygon -> pcb_poly_restore_to_poly ClearFromPolygon -> pcb_poly_clear_from_poly Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 6691) +++ trunk/src/obj_pinvia_therm.c (revision 6692) @@ -210,11 +210,11 @@ pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else - pcb_poly_frac_cicle(c, v[0] + pin->Clearance / 4, v[1], v, 2); + pcb_poly_frac_circle(c, v[0] + pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y + in; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ - pcb_poly_frac_cicle(c, pin->X + in, pin->Y + in, v, 4); + pcb_poly_frac_circle(c, pin->X + in, pin->Y + in, v, 4); v[0] = pin->X + d; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { @@ -223,7 +223,7 @@ pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else - pcb_poly_frac_cicle(c, v[0], v[1] - pin->Clearance / 4, v, 2); + pcb_poly_frac_circle(c, v[0], v[1] - pin->Clearance / 4, v, 2); p = pcb_poly_from_contour(c); /* bottom right */ v[0] = pin->X + in; @@ -239,15 +239,15 @@ pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else - pcb_poly_frac_cicle(c, v[0], v[1] - pin->Clearance / 4, v, 2); + pcb_poly_frac_circle(c, v[0], v[1] - pin->Clearance / 4, v, 2); v[0] = pin->X + in; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ - pcb_poly_frac_cicle(c, pin->X + in, pin->Y - in, v, 4); + pcb_poly_frac_circle(c, pin->X + in, pin->Y - in, v, 4); v[1] = pin->Y - d; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) - pcb_poly_frac_cicle(c, v[0] - pin->Clearance / 4, v[1], v, 2); + pcb_poly_frac_circle(c, v[0] - pin->Clearance / 4, v[1], v, 2); p2 = pcb_poly_from_contour(c); p->f = p2; p2->b = p; @@ -265,15 +265,15 @@ pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else - pcb_poly_frac_cicle(c, v[0] - pin->Clearance / 4, v[1], v, 2); + pcb_poly_frac_circle(c, v[0] - pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y - in; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point */ - pcb_poly_frac_cicle(c, pin->X - in, pin->Y - in, v, 4); + pcb_poly_frac_circle(c, pin->X - in, pin->Y - in, v, 4); v[0] = pin->X - d; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) - pcb_poly_frac_cicle(c, v[0], v[1] + pin->Clearance / 4, v, 2); + pcb_poly_frac_circle(c, v[0], v[1] + pin->Clearance / 4, v, 2); p2 = pcb_poly_from_contour(c); p->f->f = p2; p2->b = p->f; @@ -285,7 +285,7 @@ v[0] = pin->X - in; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); /* pivot 1/4 circle to next point (x-out, y+in) */ - pcb_poly_frac_cicle(c, pin->X - in, pin->Y + in, v, 4); + pcb_poly_frac_circle(c, pin->X - in, pin->Y + in, v, 4); v[1] = pin->Y + d; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 2) { @@ -293,13 +293,13 @@ pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); } else - pcb_poly_frac_cicle(c, v[0] + pin->Clearance / 4, v[1], v, 2); + pcb_poly_frac_circle(c, v[0] + pin->Clearance / 4, v[1], v, 2); v[1] = pin->Y + in; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); v[0] = pin->X - d; pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v)); if (style == 5) - pcb_poly_frac_cicle(c, v[0], v[1] + pin->Clearance / 4, v, 2); + pcb_poly_frac_circle(c, v[0], v[1] + pin->Clearance / 4, v, 2); p2 = pcb_poly_from_contour(c); p->f->f->f = p2; p2->f = p; Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 6691) +++ trunk/src/polygon.c (revision 6692) @@ -397,7 +397,7 @@ * 2 for a half circle * or 4 for a quarter circle */ -void pcb_poly_frac_cicle(pcb_pline_t * c, pcb_coord_t X, pcb_coord_t Y, pcb_vector_t v, int range) +void pcb_poly_frac_circle(pcb_pline_t * c, pcb_coord_t X, pcb_coord_t Y, pcb_vector_t v, int range) { double e1, e2, t1; int i; @@ -432,7 +432,7 @@ v[1] = y; if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; - pcb_poly_frac_cicle(contour, x, y, v, 1); + pcb_poly_frac_circle(contour, x, y, v, 1); contour->is_round = pcb_true; contour->cx = x; contour->cy = y; @@ -452,19 +452,19 @@ v[1] = y1; if ((contour = pcb_poly_contour_new(v)) == NULL) return NULL; - pcb_poly_frac_cicle(contour, x1, y1, v, 4); + pcb_poly_frac_circle(contour, x1, y1, v, 4); v[0] = x2; v[1] = y1 - t; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, x2, y1, v, 4); + pcb_poly_frac_circle(contour, x2, y1, v, 4); v[0] = x2 + t; v[1] = y2; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, x2, y2, v, 4); + pcb_poly_frac_circle(contour, x2, y2, v, 4); v[0] = x1; v[1] = y2 + t; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, x1, y2, v, 4); + pcb_poly_frac_circle(contour, x1, y2, v, 4); return pcb_poly_from_contour(contour); } @@ -518,7 +518,7 @@ v[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj); v[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj); /* add the round cap at the end */ - pcb_poly_frac_cicle(contour, ends.X2, ends.Y2, v, 2); + pcb_poly_frac_circle(contour, ends.X2, ends.Y2, v, 2); /* and now do the outer arc (going backwards) */ rx = (a->Width + half) * (1 + radius_adj); ry = (a->Width + half) * (1 + radius_adj); @@ -533,7 +533,7 @@ ang = a->StartAngle; v[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj); v[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj); - pcb_poly_frac_cicle(contour, ends.X1, ends.Y1, v, 2); + pcb_poly_frac_circle(contour, ends.X1, ends.Y1, v, 2); /* now we have the whole contour */ if (!(np = pcb_poly_from_contour(contour))) return NULL; @@ -609,7 +609,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); else - pcb_poly_frac_cicle(contour, l->Point2.X, l->Point2.Y, v, 2); + pcb_poly_frac_circle(contour, l->Point2.X, l->Point2.Y, v, 2); v[0] = l->Point2.X + dx; v[1] = l->Point2.Y + dy; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); @@ -618,7 +618,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); else - pcb_poly_frac_cicle(contour, l->Point1.X, l->Point1.Y, v, 2); + pcb_poly_frac_circle(contour, l->Point1.X, l->Point1.Y, v, 2); /* now we have the line contour */ if (!(np = pcb_poly_from_contour(contour))) return NULL; @@ -673,22 +673,22 @@ v[1] = c->Point1.Y - ty; if ((contour = pcb_poly_contour_new(v)) == NULL) return 0; - pcb_poly_frac_cicle(contour, (t->Point1.X - tx), (t->Point1.Y - ty), v, 4); + pcb_poly_frac_circle(contour, (t->Point1.X - tx), (t->Point1.Y - ty), v, 4); v[0] = t->Point2.X - cx; v[1] = t->Point2.Y - cy; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, (t->Point2.X - tx), (t->Point2.Y - ty), v, 4); + pcb_poly_frac_circle(contour, (t->Point2.X - tx), (t->Point2.Y - ty), v, 4); v[0] = c->Point2.X + tx; v[1] = c->Point2.Y + ty; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, (t->Point2.X + tx), (t->Point2.Y + ty), v, 4); + pcb_poly_frac_circle(contour, (t->Point2.X + tx), (t->Point2.Y + ty), v, 4); v[0] = t->Point1.X + cx; v[1] = t->Point1.Y + cy; pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v)); - pcb_poly_frac_cicle(contour, (t->Point1.X + tx), (t->Point1.Y + ty), v, 4); + pcb_poly_frac_circle(contour, (t->Point1.X + tx), (t->Point1.Y + ty), v, 4); /* now we have the line contour */ if (!(np = pcb_poly_from_contour(contour))) Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 6691) +++ trunk/src/polygon.h (revision 6692) @@ -77,7 +77,7 @@ pcb_polyarea_t *pcb_poly_from_pin(pcb_pin_t * l, pcb_coord_t thick, pcb_coord_t clear); pcb_polyarea_t *pcb_poly_from_box_bloated(pcb_box_t * box, pcb_coord_t radius); -void pcb_poly_frac_cicle(pcb_pline_t *, pcb_coord_t, pcb_coord_t, pcb_vector_t, int); +void pcb_poly_frac_circle(pcb_pline_t *, pcb_coord_t, pcb_coord_t, pcb_vector_t, int); int pcb_poly_init_clip(pcb_data_t * d, pcb_layer_t * l, pcb_polygon_t * p); void pcb_poly_restore_to_poly(pcb_data_t *, int, void *, void *); void pcb_poly_clear_from_poly(pcb_data_t *, int, void *, void *);