Index: elem_rot.c =================================================================== --- elem_rot.c (revision 30902) +++ elem_rot.c (revision 30903) @@ -41,7 +41,7 @@ #define MAXREFPINS 32 /* max length of following list */ static char *reference_pin_names[] = {"1", "2", "A1", "A2", "B1", "B2", 0}; -static double xyToAngle(double x, double y, pcb_bool morethan2pins) +static double xyToAngle(double x, double y, rnd_bool morethan2pins) { double d = atan2(-y, x) * 180.0 / M_PI; @@ -85,7 +85,7 @@ } } -void pcb_subc_xy_rot(pcb_subc_t *subc, pcb_coord_t *cx, pcb_coord_t *cy, double *theta, double *xray_theta, pcb_bool autodetect) +void pcb_subc_xy_rot(pcb_subc_t *subc, rnd_coord_t *cx, rnd_coord_t *cy, double *theta, double *xray_theta, rnd_bool autodetect) { double centroidx, centroidy; int found_any_not_at_centroid, found_any, rpindex; @@ -96,7 +96,7 @@ double pinx[MAXREFPINS]; double piny[MAXREFPINS]; const char *fixed_rotation; - pcb_coord_t ox = 0, oy = 0; + rnd_coord_t ox = 0, oy = 0; pcb_any_obj_t *o; pcb_data_it_t it; @@ -104,10 +104,10 @@ if (!autodetect) { if (pcb_subc_get_origin(subc, &ox, &oy) != 0) - pcb_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc origin for %s\n", subc->refdes); + rnd_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc origin for %s\n", subc->refdes); if (pcb_subc_get_side(subc, &bott) != 0) - pcb_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc side for %s\n", subc->refdes); + rnd_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc side for %s\n", subc->refdes); } /* initialize our pin count and our totals for finding the @@ -124,7 +124,7 @@ * we can find them */ for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) { - pcb_coord_t px, py; + rnd_coord_t px, py; if (o->term == NULL) continue; @@ -212,13 +212,13 @@ } if (!found_any) { - pcb_message + rnd_message (PCB_MSG_WARNING, "pcb_subc_xy_rot: unable to figure out angle because I could\n" " not find a suitable reference pin of element %s\n" " Setting to %g degrees\n", PCB_UNKNOWN(subc->refdes), *theta); } else if (!found_any_not_at_centroid) { - pcb_message + rnd_message (PCB_MSG_WARNING, "pcb_subc_xy_rot: unable to figure out angle of element\n" " %s because the reference pin(s) are at the centroid of the part.\n" " Setting to %g degrees\n", PCB_UNKNOWN(subc->refdes), *theta); @@ -227,9 +227,9 @@ } } -void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, pcb_coord_t subc_ox, pcb_coord_t subc_oy, pcb_bool on_bottom) +void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, rnd_coord_t subc_ox, rnd_coord_t subc_oy, rnd_bool on_bottom) { - pcb_coord_t cx = subc_ox, cy = subc_oy; + rnd_coord_t cx = subc_ox, cy = subc_oy; double rot = 0.0, tmp; const char *cent; Index: elem_rot.h =================================================================== --- elem_rot.h (revision 30902) +++ elem_rot.h (revision 30903) @@ -1,5 +1,5 @@ -void pcb_subc_xy_rot(pcb_subc_t *subc, pcb_coord_t *cx, pcb_coord_t *cy, double *theta, double *xray_theta, pcb_bool autodetect); +void pcb_subc_xy_rot(pcb_subc_t *subc, rnd_coord_t *cx, rnd_coord_t *cy, double *theta, double *xray_theta, rnd_bool autodetect); /* Automatic version of pcb_subc_xy_rot: inserts all the p&p attributes and creates the aux layer */ -void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, pcb_coord_t subc_ox, pcb_coord_t subc_oy, pcb_bool on_bottom); +void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, rnd_coord_t subc_ox, rnd_coord_t subc_oy, rnd_bool on_bottom); Index: media.h =================================================================== --- media.h (revision 30902) +++ media.h (revision 30903) @@ -1,7 +1,7 @@ typedef struct { const char *name; - pcb_coord_t width, height; /* orientation: landscape */ - pcb_coord_t margin_x, margin_y; + rnd_coord_t width, height; /* orientation: landscape */ + rnd_coord_t margin_x, margin_y; } pcb_media_t; extern pcb_media_t pcb_media_data[]; Index: pstk_compat.c =================================================================== --- pstk_compat.c (revision 30902) +++ pstk_compat.c (revision 30903) @@ -38,7 +38,7 @@ #define sqr(o) ((double)(o)*(double)(o)) /* emulate old pcb-rnd "pin shape" feature */ -static void octa_shape(pcb_pstk_poly_t *dst, pcb_coord_t x0, pcb_coord_t y0, pcb_coord_t rx, pcb_coord_t ry, int style) +static void octa_shape(pcb_pstk_poly_t *dst, rnd_coord_t x0, rnd_coord_t y0, rnd_coord_t rx, rnd_coord_t ry, int style) { double xm[8], ym[8]; @@ -65,9 +65,9 @@ } /* emulate the old 'square flag' feature */ -static void square_shape(pcb_pstk_poly_t *dst, pcb_coord_t x0, pcb_coord_t y0, pcb_coord_t radius, int style) +static void square_shape(pcb_pstk_poly_t *dst, rnd_coord_t x0, rnd_coord_t y0, rnd_coord_t radius, int style) { - pcb_coord_t r2 = pcb_round(radius * 0.5); + rnd_coord_t r2 = pcb_round(radius * 0.5); pcb_pstk_shape_alloc_poly(dst, 4); @@ -78,7 +78,7 @@ } -static int compat_via_shape_gen(pcb_pstk_shape_t *dst, pcb_pstk_compshape_t cshape, pcb_coord_t pad_dia) +static int compat_via_shape_gen(pcb_pstk_shape_t *dst, pcb_pstk_compshape_t cshape, rnd_coord_t pad_dia) { if ((cshape >= PCB_PSTK_COMPAT_SHAPED) && (cshape <= PCB_PSTK_COMPAT_SHAPED_END)) { dst->shape = PCB_PSSH_POLY; @@ -113,7 +113,7 @@ free(shp->data.poly.x); } -static pcb_pstk_t *pcb_pstk_new_compat_via_(pcb_data_t *data, long int id, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_coord_t pad_dia, pcb_coord_t clearance, pcb_coord_t mask, pcb_pstk_compshape_t cshape, pcb_bool plated, pcb_bool hole_clearance_hack) +static pcb_pstk_t *pcb_pstk_new_compat_via_(pcb_data_t *data, long int id, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_coord_t pad_dia, rnd_coord_t clearance, rnd_coord_t mask, pcb_pstk_compshape_t cshape, rnd_bool plated, rnd_bool hole_clearance_hack) { pcb_pstk_proto_t proto; pcb_pstk_shape_t shape[5]; /* max number of shapes: 3 coppers, 2 masks */ @@ -193,13 +193,13 @@ return pcb_pstk_new(data, -1, pid, x, y, clearance, pcb_flag_make(PCB_FLAG_CLEARLINE)); } -pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, long int id, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_coord_t pad_dia, pcb_coord_t clearance, pcb_coord_t mask, pcb_pstk_compshape_t cshape, pcb_bool plated) +pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, long int id, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_coord_t pad_dia, rnd_coord_t clearance, rnd_coord_t mask, pcb_pstk_compshape_t cshape, rnd_bool plated) { return pcb_pstk_new_compat_via_(data, id, x, y, drill_dia, pad_dia, clearance, mask, cshape, plated, 0); } -static pcb_pstk_compshape_t get_old_shape_square(pcb_coord_t *dia, const pcb_pstk_shape_t *shp) +static pcb_pstk_compshape_t get_old_shape_square(rnd_coord_t *dia, const pcb_pstk_shape_t *shp) { double sq, len2, l, a; int n; @@ -229,7 +229,7 @@ } -static pcb_pstk_compshape_t get_old_shape_octa(pcb_coord_t *dia, const pcb_pstk_shape_t *shp) +static pcb_pstk_compshape_t get_old_shape_octa(rnd_coord_t *dia, const pcb_pstk_shape_t *shp) { double x[8], y[8], xm[8], ym[8], minx = 0.0, miny = 0.0, tmp; int shi, n, found; @@ -313,7 +313,7 @@ return PCB_PSTK_COMPAT_INVALID; } -static pcb_pstk_compshape_t get_old_shape(pcb_coord_t *dia, const pcb_pstk_shape_t *shp) +static pcb_pstk_compshape_t get_old_shape(rnd_coord_t *dia, const pcb_pstk_shape_t *shp) { switch(shp->shape) { case PCB_PSSH_LINE: @@ -335,13 +335,13 @@ return PCB_PSTK_COMPAT_INVALID; } -pcb_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t *drill_dia, pcb_coord_t *pad_dia, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_pstk_compshape_t *cshape, pcb_bool *plated) +rnd_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t *drill_dia, rnd_coord_t *pad_dia, rnd_coord_t *clearance, rnd_coord_t *mask, pcb_pstk_compshape_t *cshape, rnd_bool *plated) { pcb_pstk_proto_t *proto; pcb_pstk_tshape_t *tshp; int n, coppern = -1, maskn = -1; pcb_pstk_compshape_t old_shape[5]; - pcb_coord_t old_dia[5]; + rnd_coord_t old_dia[5]; proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto); if ((proto == NULL) || (proto->tr.used < 1)) @@ -414,11 +414,11 @@ } /* emulate the old 'square flag' pad */ -static void pad_shape(pcb_pstk_poly_t *dst, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness) +static void pad_shape(pcb_pstk_poly_t *dst, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thickness) { double d, dx, dy; - pcb_coord_t nx, ny; - pcb_coord_t halfthick = (thickness + 1) / 2; + rnd_coord_t nx, ny; + rnd_coord_t halfthick = (thickness + 1) / 2; dx = x2 - x1; dy = y2 - y1; @@ -450,7 +450,7 @@ } /* Generate a square or round pad of a given thickness - typically mask or copper */ -static void gen_pad(pcb_pstk_shape_t *dst, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_bool square) +static void gen_pad(pcb_pstk_shape_t *dst, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thickness, rnd_bool square) { if (square) { dst->shape = PCB_PSSH_POLY; @@ -473,7 +473,7 @@ } } -pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, long int id, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_coord_t clearance, pcb_coord_t mask, pcb_bool square, pcb_bool nopaste, pcb_bool onotherside) +pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, long int id, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thickness, rnd_coord_t clearance, rnd_coord_t mask, rnd_bool square, rnd_bool nopaste, rnd_bool onotherside) { pcb_layer_type_t side; pcb_pstk_proto_t proto; @@ -481,7 +481,7 @@ pcb_cardinal_t pid; pcb_pstk_tshape_t tshp; int n; - pcb_coord_t cx, cy; + rnd_coord_t cx, cy; assert(thickness >= 0); assert(clearance >= 0); @@ -525,13 +525,13 @@ } -pcb_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, pcb_coord_t *x1, pcb_coord_t *y1, pcb_coord_t *x2, pcb_coord_t *y2, pcb_coord_t *thickness, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_bool *square, pcb_bool *nopaste) +rnd_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, rnd_coord_t *x1, rnd_coord_t *y1, rnd_coord_t *x2, rnd_coord_t *y2, rnd_coord_t *thickness, rnd_coord_t *clearance, rnd_coord_t *mask, rnd_bool *square, rnd_bool *nopaste) { pcb_pstk_proto_t *proto; pcb_pstk_tshape_t *tshp; int n, coppern = -1, maskn = -1, pasten = -1; pcb_layer_type_t side; - pcb_coord_t lx1[3], ly1[3], lx2[3], ly2[3], lt[3]; /* poly->line conversion cache */ + rnd_coord_t lx1[3], ly1[3], lx2[3], ly2[3], lt[3]; /* poly->line conversion cache */ proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto); if ((proto == NULL) || (proto->tr.used < 1)) @@ -576,7 +576,7 @@ /* if the shape is poly, convert to line to make the rest of the code simpler */ if (tshp->shape[0].shape == PCB_PSSH_POLY) { for(n = 0; n < tshp->len; n++) { - pcb_coord_t w, h, x1, x2, y1, y2; + rnd_coord_t w, h, x1, x2, y1, y2; double stepd, step2; int step; @@ -745,7 +745,7 @@ } -pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, long int id, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, pcb_flag_t Flags) +pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, long int id, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Thickness, rnd_coord_t Clearance, rnd_coord_t Mask, rnd_coord_t DrillingHole, const char *Name, pcb_flag_t Flags) { pcb_pstk_t *p; pcb_pstk_compshape_t shp; @@ -783,7 +783,7 @@ return p; } -void pcb_shape_octagon(pcb_pstk_shape_t *dst, pcb_coord_t radiusx, pcb_coord_t radiusy) +void pcb_shape_octagon(pcb_pstk_shape_t *dst, rnd_coord_t radiusx, rnd_coord_t radiusy) { dst->shape = PCB_PSSH_POLY; octa_shape(&dst->data.poly, 0, 0, radiusx, radiusy, 0); Index: pstk_compat.h =================================================================== --- pstk_compat.h (revision 30902) +++ pstk_compat.h (revision 30903) @@ -14,17 +14,17 @@ /* Create a padstack that emulates an old-style via - register proto as needed if id <= 0, allocate a new id automatically */ -pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, long int id, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_coord_t pad_dia, pcb_coord_t clearance, pcb_coord_t mask, pcb_pstk_compshape_t shp, pcb_bool plated); +pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, long int id, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_coord_t pad_dia, rnd_coord_t clearance, rnd_coord_t mask, pcb_pstk_compshape_t shp, rnd_bool plated); /* Convert an existing padstack to old-style via and return broken down parameters */ -pcb_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t *drill_dia, pcb_coord_t *pad_dia, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_pstk_compshape_t *cshape, pcb_bool *plated); +rnd_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t *drill_dia, rnd_coord_t *pad_dia, rnd_coord_t *clearance, rnd_coord_t *mask, pcb_pstk_compshape_t *cshape, rnd_bool *plated); /* Create a padstack that emulates an old-style pad - register proto as needed If id <= 0, allocate an id automatically. */ -pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, long int id, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_coord_t clearance, pcb_coord_t mask, pcb_bool square, pcb_bool nopaste, pcb_bool onotherside); +pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, long int id, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thickness, rnd_coord_t clearance, rnd_coord_t mask, rnd_bool square, rnd_bool nopaste, rnd_bool onotherside); /* Convert an existing padstack to old-style pad and return broken down parameters */ -pcb_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, pcb_coord_t *x1, pcb_coord_t *y1, pcb_coord_t *x2, pcb_coord_t *y2, pcb_coord_t *thickness, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_bool *square, pcb_bool *nopaste); +rnd_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, rnd_coord_t *x1, rnd_coord_t *y1, rnd_coord_t *x2, rnd_coord_t *y2, rnd_coord_t *thickness, rnd_coord_t *clearance, rnd_coord_t *mask, rnd_bool *square, rnd_bool *nopaste); typedef enum { PCB_PSTKCOMP_OLD_OCTAGON = 1 @@ -39,6 +39,6 @@ /* Create a padstack that mimics the old gEDA/PCB via (or pin). If id <= 0, allocate a new ID automatically. Should not be used anywhere but io_pcb and io_lihata. */ -pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, long int id, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, pcb_flag_t Flags); +pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, long int id, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Thickness, rnd_coord_t Clearance, rnd_coord_t Mask, rnd_coord_t DrillingHole, const char *Name, pcb_flag_t Flags); #endif Index: pstk_help.c =================================================================== --- pstk_help.c (revision 30902) +++ pstk_help.c (revision 30903) @@ -34,7 +34,7 @@ #include "find.h" -pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated) +pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated) { pcb_pstk_proto_t proto; pcb_cardinal_t pid; @@ -67,7 +67,7 @@ #define NUM_LYTS (sizeof(lyts) / sizeof(lyts[0])) -static int vect2pstk_conv_cand(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet, pcb_any_obj_t **cand, int *num_cand, pcb_coord_t cx, pcb_coord_t cy, int plated, pcb_any_obj_t *extrao) +static int vect2pstk_conv_cand(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet, pcb_any_obj_t **cand, int *num_cand, rnd_coord_t cx, rnd_coord_t cy, int plated, pcb_any_obj_t *extrao) { pcb_pstk_proto_t proto; int l, ci, res = -1; @@ -121,7 +121,7 @@ { int l, n, plated, done = 0, ci; pcb_pstk_proto_t *p; - pcb_coord_t cx, cy, d, r, valid; + rnd_coord_t cx, cy, d, r, valid; pcb_any_obj_t *cand[NUM_LYTS]; int num_cand[NUM_LYTS]; @@ -206,7 +206,7 @@ int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet) { int l, n, done = 0, ci; - pcb_coord_t cx, cy; + rnd_coord_t cx, cy; pcb_any_obj_t *cand[NUM_LYTS]; int num_cand[NUM_LYTS]; @@ -283,7 +283,7 @@ } -pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated, pcb_coord_t glob_clearance, pcb_pstk_shape_t *shape) +pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated, rnd_coord_t glob_clearance, pcb_pstk_shape_t *shape) { pcb_pstk_proto_t proto; pcb_cardinal_t pid; @@ -310,7 +310,7 @@ return pcb_pstk_new(data, -1, pid, x, y, glob_clearance, pcb_flag_make(PCB_FLAG_CLEARLINE)); } -void pcb_shape_rect(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height) +void pcb_shape_rect(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height) { pcb_pstk_poly_t *dst = &shape->data.poly; @@ -326,7 +326,7 @@ dst->x[3] = -width; dst->y[3] = +height; } -void pcb_shape_rect_trdelta(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height, pcb_coord_t dx, pcb_coord_t dy) +void pcb_shape_rect_trdelta(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height, rnd_coord_t dx, rnd_coord_t dy) { pcb_pstk_poly_t *dst = &shape->data.poly; @@ -344,7 +344,7 @@ dst->x[3] = -width-dx; dst->y[3] = +height+dy; } -void pcb_shape_oval(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height) +void pcb_shape_oval(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height) { shape->shape = PCB_PSSH_LINE; Index: pstk_help.h =================================================================== --- pstk_help.h (revision 30902) +++ pstk_help.h (revision 30903) @@ -5,11 +5,11 @@ #include /* create a new adstack that contains only a hole, but no shapes */ -pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated); +pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated); /* Convert an array of shapes, terminated by a shape with layer_mask=0, into a padstack. */ -pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated, pcb_coord_t glob_clearance, pcb_pstk_shape_t *shape); +pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, rnd_coord_t drill_dia, rnd_bool plated, rnd_coord_t glob_clearance, pcb_pstk_shape_t *shape); /* Convert a vector of (pcb_any_obj_t *) into zero or more padstacks. Remove objects that are converted from both data and objs. New padstacks are @@ -23,16 +23,16 @@ int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet); /*** shape generators ***/ -void pcb_shape_rect(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height); -void pcb_shape_oval(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height); +void pcb_shape_rect(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height); +void pcb_shape_oval(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height); /* trapezoid: deform the rectangle so that upper horizontal edge is smaller by dx and lower horizontal edge is larger by dx; same happens to the vertical edges and dy. */ -void pcb_shape_rect_trdelta(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height, pcb_coord_t dx, pcb_coord_t dy); +void pcb_shape_rect_trdelta(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height, rnd_coord_t dx, rnd_coord_t dy); /* Create a regular octagon shape */ -void pcb_shape_octagon(pcb_pstk_shape_t *dst, pcb_coord_t radiusx, pcb_coord_t radiusy); +void pcb_shape_octagon(pcb_pstk_shape_t *dst, rnd_coord_t radiusx, rnd_coord_t radiusy); #endif Index: subc_help.c =================================================================== --- subc_help.c (revision 30902) +++ subc_help.c (revision 30903) @@ -26,7 +26,7 @@ #include "subc_help.h" -pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom, const char *pattern) +pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, unsigned direction, int scale, rnd_bool bottom, const char *pattern) { pcb_layer_type_t side = bottom ? PCB_LYT_BOTTOM : PCB_LYT_TOP; pcb_layer_t *ly = pcb_subc_get_layer(sc, side | PCB_LYT_SILK, 0, pcb_true, "top-silk", pcb_false); @@ -35,7 +35,7 @@ return 0; } -pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom) +pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, unsigned direction, int scale, rnd_bool bottom) { return pcb_subc_add_dyntex(sc, x, y, direction, scale, bottom, "%a.parent.refdes%"); } Index: subc_help.h =================================================================== --- subc_help.h (revision 30902) +++ subc_help.h (revision 30903) @@ -7,8 +7,8 @@ /* Create dynamic text on the top silk layer (creates the layer if needed). Returns the text object, or NULL on error. Does not set any subc attribute. The refdes version is just a shorthand for the pattern. */ -pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom, const char *pattern); -pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom); +pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, unsigned direction, int scale, rnd_bool bottom, const char *pattern); +pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, unsigned direction, int scale, rnd_bool bottom); /* Returns the refdes text objects; must be DYNTEXT and must contain the refdes attribute printing. If there's are multiple objects, silk is