Index: polygon.h =================================================================== --- polygon.h (revision 25999) +++ polygon.h (revision 26000) @@ -38,20 +38,6 @@ #include "math_helper.h" #include "polyarea.h" -/* Implementation constants */ - -#define PCB_POLY_CIRC_SEGS 40 -#define PCB_POLY_CIRC_SEGS_F ((float)PCB_POLY_CIRC_SEGS) - -/* adjustment to make the segments outline the circle rather than connect - * points on the circle: 1 - cos (\alpha / 2) < (\alpha / 2) ^ 2 / 2 - */ -#define PCB_POLY_CIRC_RADIUS_ADJ (1.0 + M_PI / PCB_POLY_CIRC_SEGS_F * \ - M_PI / PCB_POLY_CIRC_SEGS_F / 2.0) - -/* polygon diverges from modelled arc no more than MAX_ARC_DEVIATION * thick */ -#define PCB_POLY_ARC_MAX_DEVIATION 0.02 - /* Prototypes */ void pcb_polygon_init(void); @@ -75,18 +61,12 @@ void pcb_poly_compute_no_holes(pcb_poly_t * poly); /* helpers: create complex shaped polygons */ -pcb_polyarea_t *pcb_poly_from_contour(pcb_pline_t *); pcb_polyarea_t *pcb_poly_from_poly(pcb_poly_t *); -pcb_polyarea_t *pcb_poly_from_rect(pcb_coord_t x1, pcb_coord_t x2, pcb_coord_t y1, pcb_coord_t y2); -pcb_polyarea_t *pcb_poly_from_circle(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius); -pcb_polyarea_t *pcb_poly_from_octagon(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, int style); pcb_polyarea_t *pcb_poly_from_pcb_line(pcb_line_t * l, pcb_coord_t thick); pcb_polyarea_t *pcb_poly_from_pcb_arc(pcb_arc_t * l, pcb_coord_t thick); pcb_polyarea_t *pcb_poly_from_box_bloated(pcb_box_t * box, pcb_coord_t radius); pcb_polyarea_t *pcb_poly_clearance_construct(pcb_poly_t *subpoly); /* clearance shape for when clearpolypoly is set */ - -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_poly_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 *); @@ -113,8 +93,6 @@ void pcb_poly_no_holes_dicer(pcb_poly_t * p, const pcb_box_t * clip, void (*emit) (pcb_pline_t *, void *), void *user_data); void pcb_poly_to_polygons_on_layer(pcb_data_t *, pcb_layer_t *, pcb_polyarea_t *, pcb_flag_t); -void pcb_poly_square_pin_factors(int style, double *xm, double *ym); - pcb_bool pcb_pline_is_rectangle(pcb_pline_t *pl); /* clear np1 from the polygon; also free np1 if fnp is true. Returns 1 on