Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4765) +++ trunk/src/action_helper.c (revision 4766) @@ -96,7 +96,7 @@ { pcb_box_t *box; - box = GetArcEnds((ArcTypePtr) ptr2); + box = GetArcEnds((pcb_arc_t *) ptr2); *x = box->X1; *y = box->Y1; break; @@ -646,7 +646,7 @@ case STATE_SECOND: case STATE_THIRD: { - ArcTypePtr arc; + pcb_arc_t *arc; Coord wx, wy; Angle sa, dir; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4765) +++ trunk/src/crosshair.c (revision 4766) @@ -132,7 +132,7 @@ */ static void XORDrawAttachedArc(Coord thick) { - ArcType arc; + pcb_arc_t arc; pcb_box_t *bx; Coord wx, wy; Angle sa, dir; @@ -378,7 +378,7 @@ case PCB_TYPE_ARC: { - ArcTypePtr Arc = (ArcTypePtr) Crosshair.AttachedObject.Ptr2; + pcb_arc_t *Arc = (pcb_arc_t *) Crosshair.AttachedObject.Ptr2; gui->draw_arc(Crosshair.GC, Arc->X + dx, Arc->Y + dy, Arc->Width, Arc->Height, Arc->StartAngle, Arc->Delta); break; @@ -741,7 +741,7 @@ { struct onpoint_search_info *info = (struct onpoint_search_info *) cl; pcb_crosshair_t *crosshair = info->crosshair; - ArcType *arc = (ArcType *) box; + pcb_arc_t *arc = (pcb_arc_t *) box; Coord p1x, p1y, p2x, p2y; p1x = arc->X - arc->Width * cos(TO_RADIANS(arc->StartAngle)); @@ -779,7 +779,7 @@ #if 0 case ARCPOINT_TYPE: /* See comment above */ - DrawArc(NULL, (ArcType *) obj); + DrawArc(NULL, (pcb_arc_t *) obj); break; #endif } Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4765) +++ trunk/src/data.c (revision 4766) @@ -217,7 +217,7 @@ END_LOOP; list_map0(&layer->Line, pcb_line_t, RemoveFreeLine); - list_map0(&layer->Arc, ArcType, RemoveFreeArc); + list_map0(&layer->Arc, pcb_arc_t, RemoveFreeArc); list_map0(&layer->Text, TextType, RemoveFreeText); POLYGON_LOOP(layer); { Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 4765) +++ trunk/src/data.h (revision 4766) @@ -90,7 +90,7 @@ /* layer object callbacks */ typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter); typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line); -typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc); +typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc); typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text); typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly); @@ -97,7 +97,7 @@ /* element callbacks */ typedef int (*pcb_element_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, int enter); typedef void (*pcb_eline_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line); -typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc); +typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc); typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, TextType *text); typedef void (*pcb_epin_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, PinType *pin); typedef void (*pcb_epad_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4765) +++ trunk/src/draw.c (revision 4766) @@ -518,7 +518,7 @@ break; case PCB_TYPE_ARC: case PCB_TYPE_ELEMENT_ARC: - EraseArc((ArcTypePtr) ptr); + EraseArc((pcb_arc_t *) ptr); break; default: Message(PCB_MSG_DEFAULT, "hace: Internal ERROR, trying to erase an unknown type\n"); @@ -539,7 +539,7 @@ break; case PCB_TYPE_ARC: if (((pcb_layer_t *) ptr1)->On) - DrawArc((pcb_layer_t *) ptr1, (ArcTypePtr) ptr2); + DrawArc((pcb_layer_t *) ptr1, (pcb_arc_t *) ptr2); break; case PCB_TYPE_TEXT: if (((pcb_layer_t *) ptr1)->On) Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 4765) +++ trunk/src/find.c (revision 4766) @@ -101,7 +101,7 @@ (((pcb_line_t **)LineList[(L)].Data)[(I)]) #define ARCLIST_ENTRY(L,I) \ - (((ArcTypePtr *)ArcList[(L)].Data)[(I)]) + (((pcb_arc_t **)ArcList[(L)].Data)[(I)]) #define RATLIST_ENTRY(I) \ (((RatTypePtr *)RatList.Data)[(I)]) @@ -158,10 +158,10 @@ static pcb_bool LookupLOConnectionsToLine(pcb_line_t *, pcb_cardinal_t, pcb_bool); static pcb_bool LookupLOConnectionsToPad(PadTypePtr, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToPolygon(PolygonTypePtr, pcb_cardinal_t); -static pcb_bool LookupLOConnectionsToArc(ArcTypePtr, pcb_cardinal_t); +static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToRatEnd(PointTypePtr, pcb_cardinal_t); static pcb_bool IsRatPointOnLineEnd(PointTypePtr, pcb_line_t *); -static pcb_bool ArcArcIntersect(ArcTypePtr, ArcTypePtr); +static pcb_bool ArcArcIntersect(pcb_arc_t *, pcb_arc_t *); static pcb_bool PrintElementConnections(ElementTypePtr, FILE *, pcb_bool); static pcb_bool ListsEmpty(pcb_bool); static pcb_bool DoIt(pcb_bool, pcb_bool); Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 4765) +++ trunk/src/find.h (revision 4766) @@ -61,10 +61,10 @@ (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON) pcb_bool LineLineIntersect(pcb_line_t *, pcb_line_t *); -pcb_bool LineArcIntersect(pcb_line_t *, ArcTypePtr); +pcb_bool LineArcIntersect(pcb_line_t *, pcb_arc_t *); pcb_bool PinLineIntersect(PinTypePtr, pcb_line_t *); pcb_bool LinePadIntersect(pcb_line_t *, PadTypePtr); -pcb_bool ArcPadIntersect(ArcTypePtr, PadTypePtr); +pcb_bool ArcPadIntersect(pcb_arc_t *, PadTypePtr); pcb_bool IsPolygonInPolygon(PolygonTypePtr, PolygonTypePtr); void LookupElementConnections(ElementTypePtr, FILE *); void LookupConnectionsToAllElements(FILE *); @@ -85,7 +85,7 @@ void RestoreFindFlag(void); int DRCAll(void); pcb_bool IsLineInPolygon(pcb_line_t *, PolygonTypePtr); -pcb_bool IsArcInPolygon(ArcTypePtr, PolygonTypePtr); +pcb_bool IsArcInPolygon(pcb_arc_t *, PolygonTypePtr); pcb_bool IsPadInPolygon(PadTypePtr, PolygonTypePtr); /* find_clear.c */ Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 4765) +++ trunk/src/find_deadcode.c (revision 4766) @@ -41,7 +41,7 @@ static int LOT_Arccallback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!arc->Thickness) Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4765) +++ trunk/src/find_drc.c (revision 4766) @@ -139,7 +139,7 @@ } case PCB_TYPE_ARC: { - ArcTypePtr arc = (ArcTypePtr) thing_ptr3; + pcb_arc_t *arc = (pcb_arc_t *) thing_ptr3; *x = arc->X; *y = arc->Y; break; @@ -233,7 +233,7 @@ DrcViolationType *violation; pcb_line_t *line = (pcb_line_t *) ptr2; - ArcTypePtr arc = (ArcTypePtr) ptr2; + pcb_arc_t *arc = (pcb_arc_t *) ptr2; PinTypePtr pin = (PinTypePtr) ptr2; PadTypePtr pad = (PadTypePtr) ptr2; Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4765) +++ trunk/src/find_geo.c (revision 4766) @@ -74,7 +74,7 @@ *sa = NormalizeAngle(*sa); } -static int radius_crosses_arc(double x, double y, ArcTypePtr arc) +static int radius_crosses_arc(double x, double y, pcb_arc_t *arc) { double alpha = atan2(y - arc->Y, -x + arc->X) * PCB_RAD_TO_DEG; Angle sa = arc->StartAngle, d = arc->Delta; @@ -87,7 +87,7 @@ return (sa + d - 360) >= alpha; } -static void get_arc_ends(Coord * box, ArcTypePtr arc) +static void get_arc_ends(Coord * box, pcb_arc_t *arc) { box[0] = arc->X - arc->Width * cos(PCB_M180 * arc->StartAngle); box[1] = arc->Y + arc->Height * sin(PCB_M180 * arc->StartAngle); @@ -120,7 +120,7 @@ * * */ -static pcb_bool ArcArcIntersect(ArcTypePtr Arc1, ArcTypePtr Arc2) +static pcb_bool ArcArcIntersect(pcb_arc_t *Arc1, pcb_arc_t *Arc2) { double x, y, dx, dy, r1, r2, a, d, l, t, t1, t2, dl; Coord pdx, pdy; @@ -416,7 +416,7 @@ * * The end points are hell so they are checked individually */ -pcb_bool LineArcIntersect(pcb_line_t *Line, ArcTypePtr Arc) +pcb_bool LineArcIntersect(pcb_line_t *Line, pcb_arc_t *Arc) { double dx, dy, dx1, dy1, l, d, r, r2, Radius; pcb_box_t *box; @@ -471,7 +471,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 IsArcInPolygon(ArcTypePtr Arc, PolygonTypePtr Polygon) +pcb_bool IsArcInPolygon(pcb_arc_t *Arc, PolygonTypePtr Polygon) { pcb_box_t *Box = (pcb_box_t *) Arc; @@ -604,7 +604,7 @@ return LineLineIntersect((Line), (pcb_line_t *) Pad); } -pcb_bool ArcPadIntersect(ArcTypePtr Arc, PadTypePtr Pad) +pcb_bool ArcPadIntersect(pcb_arc_t *Arc, PadTypePtr Pad) { return LineArcIntersect((pcb_line_t *) (Pad), (Arc)); } Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4765) +++ trunk/src/find_lookup.c (revision 4766) @@ -99,7 +99,7 @@ return pcb_false; } -static pcb_bool ADD_ARC_TO_LIST(pcb_cardinal_t L, ArcTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_ARC_TO_LIST(pcb_cardinal_t L, pcb_arc_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr)); @@ -245,7 +245,7 @@ } if (arclist_length(&layer->Arc)) { ArcList[i].Size = arclist_length(&layer->Arc); - ArcList[i].Data = (void **) calloc(ArcList[i].Size, sizeof(ArcTypePtr)); + ArcList[i].Data = (void **) calloc(ArcList[i].Size, sizeof(pcb_arc_t *)); } if (polylist_length(&layer->Polygon)) { PolygonList[i].Size = polylist_length(&layer->Polygon); @@ -306,7 +306,7 @@ static r_dir_t LOCtoPVarc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct pv_info *i = (struct pv_info *) cl; if (!TEST_FLAG(TheFlag, arc) && IS_PV_ON_ARC(&i->pv, arc) && !TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { @@ -602,7 +602,7 @@ pcb_cardinal_t layer; pcb_line_t line; PadType pad; - ArcType arc; + pcb_arc_t arc; PolygonType polygon; RatType rat; jmp_buf env; @@ -839,7 +839,7 @@ static r_dir_t LOCtoArcArc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!arc->Thickness) @@ -869,7 +869,7 @@ * the notation that is used is: * Xij means Xj at arc i */ -static pcb_bool LookupLOConnectionsToArc(ArcTypePtr Arc, pcb_cardinal_t LayerGroup) +static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *Arc, pcb_cardinal_t LayerGroup) { pcb_cardinal_t entry; struct lo_info info; @@ -931,7 +931,7 @@ static r_dir_t LOCtoLineArc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!arc->Thickness) @@ -1147,7 +1147,7 @@ static r_dir_t LOCtoPadArc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!arc->Thickness) @@ -1323,7 +1323,7 @@ static r_dir_t LOCtoPolyArc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!arc->Thickness) Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4765) +++ trunk/src/find_misc.c (revision 4766) @@ -181,7 +181,7 @@ int layer = GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1); - if (ADD_ARC_TO_LIST(layer, (ArcTypePtr) ptr2, 0, NULL, FCT_START)) + if (ADD_ARC_TO_LIST(layer, (pcb_arc_t *) ptr2, 0, NULL, FCT_START)) return pcb_true; break; } Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4765) +++ trunk/src/global_typedefs.h (revision 4766) @@ -35,7 +35,7 @@ typedef struct pcb_box_list_s pcb_box_list_t; typedef struct pcb_font_s pcb_font_t; typedef struct pcb_line_s pcb_line_t; -typedef struct pcb_arc_s ArcType, *ArcTypePtr; +typedef struct pcb_arc_s pcb_arc_t; typedef struct pcb_point_s PointType, *PointTypePtr; typedef struct pcb_rat_line_s RatType, *RatTypePtr; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4765) +++ trunk/src/gui_act.c (revision 4766) @@ -1150,7 +1150,7 @@ case PCB_TYPE_ARC: notify_crosshair_change(pcb_false); - set_same_(((ArcTypePtr) ptr2)->Thickness, 0, 0, ((ArcTypePtr) ptr2)->Clearance / 2, NULL); + set_same_(((pcb_arc_t *) ptr2)->Thickness, 0, 0, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (conf_core.editor.mode != PCB_MODE_ARC) SetMode(PCB_MODE_ARC); Index: trunk/src/ht_element.c =================================================================== --- trunk/src/ht_element.c (revision 4765) +++ trunk/src/ht_element.c (revision 4766) @@ -94,7 +94,7 @@ h_str(l->Number); } -int pcb_arc_eq(const ElementType *e1, const ArcType *a1, const ElementType *e2, const ArcType *a2) +int pcb_arc_eq(const ElementType *e1, const pcb_arc_t *a1, const ElementType *e2, const pcb_arc_t *a2) { if (neq(a1, a2, Thickness) || neq(a1, a2, Clearance)) return 0; if (neq(a1, a2, Width) || neq(a1, a2, Height)) return 0; @@ -104,7 +104,7 @@ return 1; } -unsigned int pcb_arc_hash(const ElementType *e, const ArcType *a) +unsigned int pcb_arc_hash(const ElementType *e, const pcb_arc_t *a) { return h_coord(a->Thickness) ^ h_coord(a->Clearance) ^ @@ -143,7 +143,7 @@ } { - ArcType *a; + pcb_arc_t *a; linelist_foreach(&e->Arc, &it, a) { val ^= pcb_arc_hash(e, a); } @@ -199,7 +199,7 @@ } { - ArcType *a1, *a2; + pcb_arc_t *a1, *a2; a1 = arclist_first((arclist_t *)&e1->Arc); a2 = arclist_first((arclist_t *)&e2->Arc); for(;;) { Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4765) +++ trunk/src/obj_any.h (revision 4766) @@ -82,7 +82,7 @@ pcb_line_t *line; TextType *text; PolygonType *polygon; - ArcType *arc; + pcb_arc_t *arc; RatType *rat; PadType *pad; PinType *pin; Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4765) +++ trunk/src/obj_arc.c (revision 4766) @@ -45,19 +45,19 @@ #include "obj_arc_draw.h" -ArcTypePtr GetArcMemory(pcb_layer_t * layer) +pcb_arc_t *GetArcMemory(pcb_layer_t * layer) { - ArcType *new_obj; + pcb_arc_t *new_obj; - new_obj = calloc(sizeof(ArcType), 1); + new_obj = calloc(sizeof(pcb_arc_t), 1); arclist_append(&layer->Arc, new_obj); return new_obj; } -ArcType *GetElementArcMemory(ElementType *Element) +pcb_arc_t *GetElementArcMemory(ElementType *Element) { - ArcType *arc = calloc(sizeof(ArcType), 1); + pcb_arc_t *arc = calloc(sizeof(pcb_arc_t), 1); arclist_append(&Element->Arc, arc); return arc; @@ -66,7 +66,7 @@ /* computes the bounding box of an arc */ -void SetArcBoundingBox(ArcTypePtr Arc) +void SetArcBoundingBox(pcb_arc_t *Arc) { double ca1, ca2, sa1, sa2; double minx, maxx, miny, maxy; @@ -130,7 +130,7 @@ close_box(&Arc->BoundingBox); } -pcb_box_t *GetArcEnds(ArcTypePtr Arc) +pcb_box_t *GetArcEnds(pcb_arc_t *Arc) { static pcb_box_t box; box.X1 = Arc->X - Arc->Width * cos(Arc->StartAngle * PCB_M180); @@ -141,7 +141,7 @@ } /* doesn't these belong in change.c ?? */ -void ChangeArcAngles(pcb_layer_t *Layer, ArcTypePtr a, Angle new_sa, Angle new_da) +void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, Angle new_sa, Angle new_da) { if (new_da >= 360) { new_da = 360; @@ -158,7 +158,7 @@ } -void ChangeArcRadii(pcb_layer_t *Layer, ArcTypePtr a, Coord new_width, Coord new_height) +void ChangeArcRadii(pcb_layer_t *Layer, pcb_arc_t *a, Coord new_width, Coord new_height) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, a); r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); @@ -172,9 +172,9 @@ /* creates a new arc on a layer */ -ArcType *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags) +pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags) { - ArcTypePtr Arc; + pcb_arc_t *Arc; ARC_LOOP(Layer); { @@ -201,7 +201,7 @@ return (Arc); } -void pcb_add_arc_on_layer(pcb_layer_t *Layer, ArcType *Arc) +void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc) { SetArcBoundingBox(Arc); if (!Layer->arc_tree) @@ -211,7 +211,7 @@ -void RemoveFreeArc(ArcType * data) +void RemoveFreeArc(pcb_arc_t * data) { arclist_remove(data); free(data); @@ -221,7 +221,7 @@ /***** operations *****/ /* copies an arc to buffer */ -void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; @@ -231,7 +231,7 @@ } /* moves an arc to buffer */ -void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, ArcType * arc) +void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_arc_t * arc) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; @@ -251,7 +251,7 @@ } /* changes the size of an arc */ -void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Thickness + ctx->chgsize.delta; @@ -273,7 +273,7 @@ } /* changes the clearance size of an arc */ -void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Clearance + ctx->chgsize.delta; @@ -300,7 +300,7 @@ } /* changes the radius of an arc (is_primary 0=width or 1=height or 2=both) */ -void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { Coord value, *dst; void *a0, *a1; @@ -337,7 +337,7 @@ } /* changes the angle of an arc (is_primary 0=start or 1=end) */ -void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { Angle value, *dst; void *a0, *a1; @@ -377,7 +377,7 @@ } /* changes the clearance flag of an arc */ -void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) return (NULL); @@ -397,7 +397,7 @@ } /* sets the clearance flag of an arc */ -void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) return (NULL); @@ -405,7 +405,7 @@ } /* clears the clearance flag of an arc */ -void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) return (NULL); @@ -413,9 +413,9 @@ } /* copies an arc */ -void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - ArcTypePtr arc; + pcb_arc_t *arc; arc = CreateNewArcOnLayer(Layer, Arc->X + ctx->copy.DeltaX, Arc->Y + ctx->copy.DeltaY, Arc->Width, Arc->Height, Arc->StartAngle, @@ -428,7 +428,7 @@ } /* moves an arc */ -void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -447,7 +447,7 @@ } /* moves an arc between layers; lowlevel routines */ -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, ArcType * arc, pcb_layer_t * Destination) +void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination) { r_delete_entry(Source->arc_tree, (pcb_box_t *) arc); @@ -462,9 +462,9 @@ /* moves an arc between layers */ -void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, ArcType * Arc) +void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc) { - ArcTypePtr newone; + pcb_arc_t *newone; if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) { Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); @@ -480,7 +480,7 @@ RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); if (Layer->On) EraseArc(Arc); - newone = (ArcTypePtr) MoveArcToLayerLowLevel(ctx, Layer, Arc, ctx->move.dst_layer); + newone = (pcb_arc_t *) MoveArcToLayerLowLevel(ctx, Layer, Arc, ctx->move.dst_layer); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, ctx->move.dst_layer, Arc); if (ctx->move.dst_layer->On) DrawArc(ctx->move.dst_layer, newone); @@ -489,7 +489,7 @@ } /* destroys an arc from a layer */ -void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -499,7 +499,7 @@ } /* removes an arc from a layer */ -void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { /* erase from screen */ if (Layer->On) { @@ -511,7 +511,7 @@ return NULL; } -void *RemoveArc(pcb_layer_t *Layer, ArcTypePtr Arc) +void *RemoveArc(pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_opctx_t ctx; @@ -523,7 +523,7 @@ } /* rotates an arc */ -void RotateArcLowLevel(ArcTypePtr Arc, Coord X, Coord Y, unsigned Number) +void RotateArcLowLevel(pcb_arc_t *Arc, Coord X, Coord Y, unsigned Number) { Coord save; @@ -541,7 +541,7 @@ } /* rotates an arc */ -void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) +void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { EraseArc(Arc); r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -553,7 +553,7 @@ } /*** draw ***/ -void _draw_arc(ArcType * arc) +void _draw_arc(pcb_arc_t * arc) { if (!arc->Thickness) return; @@ -567,7 +567,7 @@ gui->draw_arc(Output.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); } -void draw_arc(pcb_layer_t * layer, ArcType * arc) +void draw_arc(pcb_layer_t * layer, pcb_arc_t * arc) { const char *color; char buf[sizeof("#XXXXXX")]; @@ -594,12 +594,12 @@ r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl) { - draw_arc((pcb_layer_t *) cl, (ArcTypePtr) b); + draw_arc((pcb_layer_t *) cl, (pcb_arc_t *) b); return R_DIR_FOUND_CONTINUE; } /* erases an arc on a layer */ -void EraseArc(ArcTypePtr Arc) +void EraseArc(pcb_arc_t *Arc) { if (!Arc->Thickness) return; @@ -607,7 +607,7 @@ EraseFlags(&Arc->Flags); } -void DrawArc(pcb_layer_t *Layer, ArcTypePtr Arc) +void DrawArc(pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_draw_invalidate(Arc); } Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4765) +++ trunk/src/obj_arc.h (revision 4766) @@ -42,22 +42,22 @@ /*** Memory ***/ -ArcTypePtr GetArcMemory(pcb_layer_t *); -ArcType *GetElementArcMemory(ElementType *Element); -void RemoveFreeArc(ArcType *data); +pcb_arc_t *GetArcMemory(pcb_layer_t *); +pcb_arc_t *GetElementArcMemory(ElementType *Element); +void RemoveFreeArc(pcb_arc_t *data); /*** Utility ***/ -void SetArcBoundingBox(ArcTypePtr Arc); -pcb_box_t *GetArcEnds(ArcTypePtr Arc); -void ChangeArcAngles(pcb_layer_t *Layer, ArcTypePtr a, Angle new_sa, Angle new_da); -void ChangeArcRadii(pcb_layer_t *Layer, ArcTypePtr a, Coord new_width, Coord new_height); -void *RemoveArc(pcb_layer_t *Layer, ArcTypePtr Arc); -ArcType *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags); +void SetArcBoundingBox(pcb_arc_t *Arc); +pcb_box_t *GetArcEnds(pcb_arc_t *Arc); +void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, Angle new_sa, Angle new_da); +void ChangeArcRadii(pcb_layer_t *Layer, pcb_arc_t *a, Coord new_width, Coord new_height); +void *RemoveArc(pcb_layer_t *Layer, pcb_arc_t *Arc); +pcb_arc_t *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_arc_on_layer(pcb_layer_t *Layer, ArcType *Arc); +void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc); -void RotateArcLowLevel(ArcTypePtr Arc, Coord X, Coord Y, unsigned Number); +void RotateArcLowLevel(pcb_arc_t *Arc, Coord X, Coord Y, unsigned Number); #define MOVE_ARC_LOWLEVEL(a,dx,dy) \ { \ @@ -66,7 +66,7 @@ } #define ARC_LOOP(element) do { \ - ArcType *arc; \ + pcb_arc_t *arc; \ gdl_iterator_t __it__; \ linelist_foreach(&(element)->Arc, &__it__, arc) { Index: trunk/src/obj_arc_draw.h =================================================================== --- trunk/src/obj_arc_draw.h (revision 4765) +++ trunk/src/obj_arc_draw.h (revision 4766) @@ -31,7 +31,7 @@ r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl); #endif -void _draw_arc(ArcType * arc); -void draw_arc(pcb_layer_t * layer, ArcType * arc); -void EraseArc(ArcTypePtr Arc); -void DrawArc(pcb_layer_t *Layer, ArcTypePtr Arc); +void _draw_arc(pcb_arc_t * arc); +void draw_arc(pcb_layer_t * layer, pcb_arc_t * arc); +void EraseArc(pcb_arc_t *Arc); +void DrawArc(pcb_layer_t *Layer, pcb_arc_t *Arc); Index: trunk/src/obj_arc_list.h =================================================================== --- trunk/src/obj_arc_list.h (revision 4765) +++ trunk/src/obj_arc_list.h (revision 4766) @@ -29,7 +29,7 @@ /* List of Arcs */ #define TDL(x) arclist_ ## x #define TDL_LIST_T arclist_t -#define TDL_ITEM_T ArcType +#define TDL_ITEM_T pcb_arc_t #define TDL_FIELD link #define TDL_SIZE_T size_t #define TDL_FUNC Index: trunk/src/obj_arc_op.h =================================================================== --- trunk/src/obj_arc_op.h (revision 4765) +++ trunk/src/obj_arc_op.h (revision 4766) @@ -28,19 +28,19 @@ #include "operation.h" -void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *layer, ArcType *arc); -void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, ArcType * arc, pcb_layer_t * Destination); -void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, ArcType * Arc); -void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); -void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc); +void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination); +void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc); +void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4765) +++ trunk/src/obj_elem.c (revision 4766) @@ -102,7 +102,7 @@ list_map0(&element->Pin, PinType, RemoveFreePin); list_map0(&element->Pad, PadType, RemoveFreePad); list_map0(&element->Line, pcb_line_t, RemoveFreeLine); - list_map0(&element->Arc, ArcType, RemoveFreeArc); + list_map0(&element->Arc, pcb_arc_t, RemoveFreeArc); FreeAttributeListMemory(&element->Attributes); reset_obj_mem(ElementType, element); @@ -595,10 +595,10 @@ } /* creates a new arc in an element */ -ArcTypePtr CreateNewArcInElement(ElementTypePtr Element, Coord X, Coord Y, +pcb_arc_t *CreateNewArcInElement(ElementTypePtr Element, Coord X, Coord Y, Coord Width, Coord Height, Angle angle, Angle delta, Coord Thickness) { - ArcType *arc = GetElementArcMemory(Element); + pcb_arc_t *arc = GetElementArcMemory(Element); /* set Delta (0,360], StartAngle in [0,360) */ if (delta < 0) { Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 4765) +++ trunk/src/obj_elem.h (revision 4766) @@ -81,7 +81,7 @@ char *Value, Coord TextX, Coord TextY, pcb_uint8_t Direction, int TextScale, FlagType TextFlags, pcb_bool uniqueName); -ArcTypePtr CreateNewArcInElement(ElementTypePtr Element, Coord X, Coord Y, +pcb_arc_t *CreateNewArcInElement(ElementTypePtr Element, Coord X, Coord Y, Coord Width, Coord Height, Angle angle, Angle delta, Coord Thickness); pcb_line_t *CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); @@ -141,7 +141,7 @@ linelist_foreach(&(element)->Line, &__it__, line) { #define ELEMENTARC_LOOP(element) do { \ - ArcType *arc; \ + pcb_arc_t *arc; \ gdl_iterator_t __it__; \ linelist_foreach(&(element)->Arc, &__it__, arc) { Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4765) +++ trunk/src/obj_line_drcenf.c (revision 4766) @@ -231,7 +231,7 @@ static r_dir_t drcArc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct drc_info *i = (struct drc_info *) cl; if (!TEST_FLAG(PCB_FLAG_FOUND, arc) && LineArcIntersect(i->line, arc)) Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 4765) +++ trunk/src/obj_pinvia_therm.c (revision 4766) @@ -355,7 +355,7 @@ */ POLYAREA *ThermPoly(pcb_board_t *p, PinTypePtr pin, pcb_cardinal_t laynum) { - ArcType a; + pcb_arc_t a; POLYAREA *pa, *arc; pcb_cardinal_t style = GET_THERM(laynum, pin); Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4765) +++ trunk/src/operation.h (revision 4766) @@ -120,7 +120,7 @@ void *(*Pad)(pcb_opctx_t *ctx, ElementTypePtr, PadTypePtr); void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *, PointTypePtr); void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr, PointTypePtr); - void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, ArcTypePtr); + void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_arc_t *); void *(*Rat)(pcb_opctx_t *ctx, RatTypePtr); } pcb_opfunc_t; Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4765) +++ trunk/src/polygon.c (revision 4766) @@ -470,7 +470,7 @@ } #define ARC_ANGLE 5 -static POLYAREA *ArcPolyNoIntersect(ArcType * a, Coord thick) +static POLYAREA *ArcPolyNoIntersect(pcb_arc_t * a, Coord thick) { PLINE *contour = NULL; POLYAREA *np = NULL; @@ -539,10 +539,10 @@ } #define MIN_CLEARANCE_BEFORE_BISECT 10. -POLYAREA *ArcPoly(ArcType * a, Coord thick) +POLYAREA *ArcPoly(pcb_arc_t * a, Coord thick) { double delta; - ArcType seg1, seg2; + pcb_arc_t seg1, seg2; POLYAREA *tmp1, *tmp2, *res; delta = (a->Delta < 0) ? -a->Delta : a->Delta; @@ -807,7 +807,7 @@ return Subtract(np, p, pcb_true); } -static int SubtractArc(ArcType * arc, PolygonType * p) +static int SubtractArc(pcb_arc_t * arc, PolygonType * p) { POLYAREA *np; @@ -908,7 +908,7 @@ static r_dir_t arc_sub_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; struct cpInfo *info = (struct cpInfo *) cl; PolygonTypePtr polygon; @@ -1100,7 +1100,7 @@ return 1; } -static int UnsubtractArc(ArcType * arc, pcb_layer_t * l, PolygonType * p) +static int UnsubtractArc(pcb_arc_t * arc, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1408,7 +1408,7 @@ Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: - SubtractArc((ArcTypePtr) ptr2, Polygon); + SubtractArc((pcb_arc_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: @@ -1434,7 +1434,7 @@ UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: - UnsubtractArc((ArcTypePtr) ptr2, Layer, Polygon); + UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: UnsubtractPad((PadTypePtr) ptr2, Layer, Polygon); Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 4765) +++ trunk/src/polygon.h (revision 4766) @@ -71,7 +71,7 @@ POLYAREA *CirclePoly(Coord x, Coord y, Coord radius); POLYAREA *OctagonPoly(Coord x, Coord y, Coord radius, int style); POLYAREA *LinePoly(pcb_line_t * l, Coord thick); -POLYAREA *ArcPoly(ArcType * l, Coord thick); +POLYAREA *ArcPoly(pcb_arc_t * l, Coord thick); POLYAREA *PinPoly(PinType * l, Coord thick, Coord clear); POLYAREA *BoxPolyBloated(pcb_box_t * box, Coord radius); void frac_circle(PLINE *, Coord, Coord, Vector, int); Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 4765) +++ trunk/src/rotate.c (revision 4766) @@ -149,7 +149,7 @@ int type; void *ptr1, *ptr2, *ptr3; if ((type = SearchScreen(X, Y, ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (ArcTypePtr) ptr2)) { + if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return; } Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4765) +++ trunk/src/search.c (revision 4766) @@ -54,7 +54,7 @@ * want to include locked types in the search. */ static pcb_bool SearchLineByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_line_t **); -static pcb_bool SearchArcByLocation(int, pcb_layer_t **, ArcTypePtr *, ArcTypePtr *); +static pcb_bool SearchArcByLocation(int, pcb_layer_t **, pcb_arc_t **, pcb_arc_t **); static pcb_bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); static pcb_bool SearchPolygonByLocation(int, pcb_layer_t **, PolygonTypePtr *, PolygonTypePtr *); @@ -252,7 +252,7 @@ * searches arc on the SearchLayer */ struct arc_info { - ArcTypePtr *Arc, *Dummy; + pcb_arc_t **Arc, **Dummy; int locked; }; @@ -259,7 +259,7 @@ static r_dir_t arc_callback(const pcb_box_t * box, void *cl) { struct arc_info *i = (struct arc_info *) cl; - ArcTypePtr a = (ArcTypePtr) box; + pcb_arc_t *a = (pcb_arc_t *) box; if (TEST_FLAG(i->locked, a)) return R_DIR_NOT_FOUND; @@ -272,7 +272,7 @@ } -static pcb_bool SearchArcByLocation(int locked, pcb_layer_t ** Layer, ArcTypePtr * Arc, ArcTypePtr * Dummy) +static pcb_bool SearchArcByLocation(int locked, pcb_layer_t ** Layer, pcb_arc_t ** Arc, pcb_arc_t ** Dummy) { struct arc_info info; @@ -742,7 +742,7 @@ /* --------------------------------------------------------------------------- * checks if an arc crosses a square */ -pcb_bool IsArcInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, ArcTypePtr Arc) +pcb_bool IsArcInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_arc_t *Arc) { pcb_line_t line; @@ -901,7 +901,7 @@ * and in the case that the arc thickness is greater than * the radius. */ -pcb_bool IsPointOnArc(Coord X, Coord Y, Coord Radius, ArcTypePtr Arc) +pcb_bool IsPointOnArc(Coord X, Coord Y, Coord Radius, pcb_arc_t *Arc) { /* Calculate angle of point from arc center */ double p_dist = Distance(X, Y, Arc->X, Arc->Y); @@ -1050,7 +1050,7 @@ return (PCB_TYPE_LINE); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_ARC && - SearchArcByLocation(locked, (pcb_layer_t **) Result1, (ArcTypePtr *) Result2, (ArcTypePtr *) Result3)) + SearchArcByLocation(locked, (pcb_layer_t **) Result1, (pcb_arc_t **) Result2, (pcb_arc_t **) Result3)) return (PCB_TYPE_ARC); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_TEXT Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 4765) +++ trunk/src/search.h (revision 4766) @@ -147,11 +147,11 @@ */ pcb_bool IsPointOnLine(Coord, Coord, Coord, pcb_line_t *); pcb_bool IsPointOnPin(Coord, Coord, Coord, PinTypePtr); -pcb_bool IsPointOnArc(Coord, Coord, Coord, ArcTypePtr); +pcb_bool IsPointOnArc(Coord, Coord, Coord, pcb_arc_t *); pcb_bool IsPointOnLineEnd(Coord, Coord, RatTypePtr); pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, pcb_line_t *); pcb_bool IsLineInQuadrangle(PointType p[4], pcb_line_t *Line); -pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, ArcTypePtr); +pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, pcb_arc_t *); pcb_bool IsPointInPad(Coord, Coord, Coord, PadTypePtr); pcb_bool IsPointInBox(Coord, Coord, pcb_box_t *, Coord); int SearchObjectByLocation(unsigned, void **, void **, void **, Coord, Coord, Coord); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4765) +++ trunk/src/select.c (revision 4766) @@ -148,7 +148,7 @@ case PCB_TYPE_ARC: { - ArcType *arc = (ArcTypePtr) ptr2; + pcb_arc_t *arc = (pcb_arc_t *) ptr2; layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_ARC, ptr1, ptr2, ptr2); @@ -494,7 +494,7 @@ case PCB_TYPE_ARC: if (F->Arc) - return (F->Arc(ctx, (pcb_layer_t *) Ptr1, (ArcTypePtr) Ptr2)); + return (F->Arc(ctx, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2)); break; case PCB_TYPE_LINE_POINT: Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4765) +++ trunk/src/undo.c (revision 4766) @@ -368,7 +368,7 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; - ArcTypePtr a = (ArcTypePtr) ptr2; + pcb_arc_t *a = (pcb_arc_t *) ptr2; r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); old_sa = a->StartAngle; old_da = a->Delta; @@ -399,7 +399,7 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; - ArcTypePtr a = (ArcTypePtr) ptr2; + pcb_arc_t *a = (pcb_arc_t *) ptr2; r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); old_w = a->Width; old_h = a->Height; @@ -1420,7 +1420,7 @@ break; case PCB_TYPE_ARC: case PCB_TYPE_ELEMENT_ARC: - undo->Data.Size = ((ArcTypePtr) ptr2)->Thickness; + undo->Data.Size = ((pcb_arc_t *) ptr2)->Thickness; break; } } @@ -1447,7 +1447,7 @@ undo->Data.Size = ((PadTypePtr) ptr2)->Clearance; break; case PCB_TYPE_ARC: - undo->Data.Size = ((ArcTypePtr) ptr2)->Clearance; + undo->Data.Size = ((pcb_arc_t *) ptr2)->Clearance; break; } } @@ -1495,7 +1495,7 @@ void AddObjectToChangeAnglesUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { UndoListTypePtr undo; - ArcTypePtr a = (ArcTypePtr) Ptr3; + pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { undo = GetUndoSlot(UNDO_CHANGEANGLES, OBJECT_ID(Ptr3), Type); @@ -1511,7 +1511,7 @@ void AddObjectToChangeRadiiUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { UndoListTypePtr undo; - ArcTypePtr a = (ArcTypePtr) Ptr3; + pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { undo = GetUndoSlot(UNDO_CHANGERADII, OBJECT_ID(Ptr3), Type); Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4765) +++ trunk/src/undo_act.c (revision 4766) @@ -219,7 +219,7 @@ /* guaranteed to succeed */ SearchObjectByLocation(PCB_TYPE_ARC, &ptr1, &ptr2, &ptr3, Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, 0); - bx = GetArcEnds((ArcTypePtr) ptr2); + bx = GetArcEnds((pcb_arc_t *) ptr2); Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X1; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = bx->Y1; AdjustAttachedObjects(); Index: trunk/src/vtonpoint.h =================================================================== --- trunk/src/vtonpoint.h (revision 4765) +++ trunk/src/vtonpoint.h (revision 4766) @@ -10,7 +10,7 @@ union { void *any; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; } obj; } OnpointType; Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4765) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4766) @@ -89,7 +89,7 @@ return Line; } -static void *MyMoveArcLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, ArcType * Arc, Coord dx, Coord dy) +static void *MyMoveArcLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, pcb_arc_t * Arc, Coord dx, Coord dy) { if (Data) { RestoreToPolygon(Data, PCB_TYPE_ARC, Layer, Arc); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4765) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4766) @@ -765,7 +765,7 @@ text->BoundingBox.X2, text->BoundingBox.Y2, layergroup, text, style); } -static routebox_t *AddArc(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, ArcTypePtr arc, RouteStyleType * style) +static routebox_t *AddArc(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_arc_t *arc, RouteStyleType * style) { return AddIrregularObstacle(layergroupboxes, arc->BoundingBox.X1, arc->BoundingBox.Y1, Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4765) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4766) @@ -84,7 +84,7 @@ pcb_line_t *l; TextType *t; PolygonType *p; - ArcType *a; + pcb_arc_t *a; PinType *v; PinType *pin; } obj; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4765) +++ trunk/src_plugins/io_kicad/write.c (revision 4766) @@ -611,8 +611,8 @@ pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { gdl_iterator_t it; - ArcType *arc; - ArcType localArc; /* for converting ellipses to circular arcs */ + pcb_arc_t *arc; + pcb_arc_t localArc; /* for converting ellipses to circular arcs */ pcb_box_t *boxResult; /* for figuring out arc ends */ pcb_cardinal_t currentLayer = number; Coord radius, xStart, yStart, xEnd, yEnd; @@ -802,7 +802,7 @@ gdl_iterator_t eit; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; ElementType *element; pcb_box_t *boxResult; @@ -1038,7 +1038,7 @@ gdl_iterator_t eit; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; Coord arcStartX, arcStartY, arcEndX, arcEndY; /* for arc rendering */ Coord xPos, yPos; Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4765) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4766) @@ -572,8 +572,8 @@ pcb_layer_t *layer, Coord xOffset, Coord yOffset) { gdl_iterator_t it; - ArcType *arc; - ArcType localArc; /* for converting ellipses to circular arcs */ + pcb_arc_t *arc; + pcb_arc_t localArc; /* for converting ellipses to circular arcs */ pcb_box_t *boxResult; /* for figuring out arc ends */ pcb_cardinal_t currentLayer = number; Coord radius, xStart, yStart, xEnd, yEnd; @@ -762,7 +762,7 @@ gdl_iterator_t eit; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; ElementType *element; pcb_box_t *boxResult; @@ -993,7 +993,7 @@ gdl_iterator_t eit; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; Coord arcStartX, arcStartY, arcEndX, arcEndY; /* for arc rendering */ Coord xPos, yPos; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4765) +++ trunk/src_plugins/io_lihata/read.c (revision 4766) @@ -406,7 +406,7 @@ static int parse_arc(pcb_layer_t *ly, ElementType *el, lht_node_t *obj, Coord dx, Coord dy) { - ArcType *arc; + pcb_arc_t *arc; if (ly != NULL) arc = GetArcMemory(ly); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4765) +++ trunk/src_plugins/io_lihata/write.c (revision 4766) @@ -251,7 +251,7 @@ return obj; } -static lht_node_t *build_arc(ArcType *arc, Coord dx, Coord dy) +static lht_node_t *build_arc(pcb_arc_t *arc, Coord dx, Coord dy) { char buff[128]; lht_node_t *obj; @@ -379,7 +379,7 @@ { char buff[128]; pcb_line_t *li; - ArcType *ar; + pcb_arc_t *ar; PinType *pi; PadType *pa; lht_node_t *obj, *lst; @@ -422,7 +422,7 @@ { lht_node_t *obj, *grp; pcb_line_t *li; - ArcType *ar; + pcb_arc_t *ar; PolygonType *po; TextType *tx; char tmp[16]; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4765) +++ trunk/src_plugins/io_pcb/file.c (revision 4766) @@ -370,7 +370,7 @@ { gdl_iterator_t eit; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; ElementType *element; pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt; @@ -440,7 +440,7 @@ { gdl_iterator_t it; pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; TextType *text; PolygonType *polygon; Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4765) +++ trunk/src_plugins/propedit/propsel.c (revision 4766) @@ -97,7 +97,7 @@ map_attr(ctx, &line->Attributes); } -static void map_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) +static void map_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) { map_chk_skip(ctx, arc); map_add_prop(ctx, "p/trace/thickness", Coord, arc->Thickness); @@ -131,7 +131,7 @@ map_attr(ctx, &line->Attributes); } -static void map_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc) +static void map_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc) { map_chk_skip(ctx, arc); map_arc_cb(ctx, pcb, NULL, arc); @@ -235,7 +235,7 @@ ChangeObjectClearSize(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; } -static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) +static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 8; @@ -335,7 +335,7 @@ } } -static void set_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc) +static void set_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc) { set_ctx_t *st = (set_ctx_t *)ctx; @@ -492,7 +492,7 @@ del_attr(ctx, &line->Attributes); } -static void del_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) +static void del_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) { map_chk_skip(ctx, arc); del_attr(ctx, &arc->Attributes); @@ -516,7 +516,7 @@ del_attr(ctx, &line->Attributes); } -static void del_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc) +static void del_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc) { map_chk_skip(ctx, arc); del_attr(ctx, &arc->Attributes); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4765) +++ trunk/src_plugins/puller/puller.c (revision 4766) @@ -82,7 +82,7 @@ static int multi, line_exact, arc_exact; static pcb_line_t *the_line; -static ArcTypePtr the_arc; +static pcb_arc_t *the_arc; static double arc_dist; /* We canonicalize the arc and line such that the point to be moved is @@ -99,7 +99,7 @@ return Distance(x1, y1, x2, y2) <= r / 2; } -static int arc_endpoint_is(ArcTypePtr a, int angle, int x, int y) +static int arc_endpoint_is(pcb_arc_t *a, int angle, int x, int y) { int ax = a->X, ay = a->Y; @@ -303,7 +303,7 @@ static r_dir_t arc_callback(const pcb_box_t * b, void *cl) { /* pcb_layer_t *layer = (pcb_layer_t *) cl; */ - ArcTypePtr a = (ArcTypePtr) b; + pcb_arc_t *a = (pcb_arc_t *) b; #if TRACE1 pcb_printf("arc a %#mD r %#mS sa %ld d %ld\n", a->X, a->Y, a->Width, a->StartAngle, a->Delta); @@ -563,7 +563,7 @@ int type; union { pcb_line_t *line; - ArcType *arc; + pcb_arc_t *arc; } parent; } Extra; @@ -624,7 +624,7 @@ } #endif -static void fix_arc_extra(ArcTypePtr a, Extra * e) +static void fix_arc_extra(pcb_arc_t *a, Extra * e) { #if TRACE1 printf("new arc angles %ld %ld\n", a->StartAngle, a->Delta); @@ -684,7 +684,7 @@ static r_dir_t find_pair_arc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; Extra *e = ARC2EXTRA(arc); FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl; @@ -783,7 +783,7 @@ static r_dir_t find_pair_pinarc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; PinTypePtr pin = (PinTypePtr) cl; Extra *e = ARC2EXTRA(arc); int hits; @@ -897,7 +897,7 @@ static r_dir_t find_pair_padarc_callback(const pcb_box_t * b, void *cl) { - ArcTypePtr arc = (ArcTypePtr) b; + pcb_arc_t *arc = (pcb_arc_t *) b; PadTypePtr pad = (PadTypePtr) cl; Extra *e = ARC2EXTRA(arc); int hits; @@ -934,7 +934,7 @@ return extra; } -static Extra *new_arc_extra(ArcType * arc) +static Extra *new_arc_extra(pcb_arc_t * arc) { Extra *extra = g_slice_new0(Extra); g_hash_table_insert(arcs, arc, extra); @@ -1128,7 +1128,7 @@ printf(" %s %p %s %p\n", e->start.is_pad ? "pad" : "pin", (void *)e->start.pin, e->end.is_pad ? "pad" : "pin", (void *)e->end.pin); } else if (EXTRA_IS_ARC(e)) { - ArcTypePtr arc = EXTRA2ARC(e); + pcb_arc_t *arc = EXTRA2ARC(e); pcb_printf(" %p A %#mD-%#mD", (void *)arc, e->start.x, e->start.y, e->end.x, e->end.y); pcb_printf(" at %#mD ang %ld,%ld\n", arc->X, arc->Y, arc->StartAngle, arc->Delta); } @@ -1204,7 +1204,7 @@ memcpy(&e->end, &etmp, sizeof(End)); } -static void reverse_arc(ArcTypePtr arc) +static void reverse_arc(pcb_arc_t *arc) { Extra *e = ARC2EXTRA(arc); End etmp; @@ -1234,10 +1234,10 @@ working on. */ /* what we're working with */ -static ArcTypePtr start_arc; +static pcb_arc_t *start_arc; static pcb_line_t *start_line; static pcb_line_t *end_line; -static ArcTypePtr end_arc; +static pcb_arc_t *end_arc; static Extra *start_extra, *end_extra; static Extra *sarc_extra, *earc_extra; static void *start_pinpad, *end_pinpad; @@ -1511,7 +1511,7 @@ static r_dir_t gp_arc_cb(const pcb_box_t * b, void *cb) { - const ArcTypePtr a = (ArcTypePtr) b; + const pcb_arc_t *a = (pcb_arc_t *) b; Extra *e = ARC2EXTRA(a); if (a == start_arc || a == end_arc) return R_DIR_NOT_FOUND; @@ -1639,10 +1639,10 @@ return line; } -static ArcTypePtr create_arc(pcb_line_t *sample, int x, int y, int r, int sa, int da) +static pcb_arc_t *create_arc(pcb_line_t *sample, int x, int y, int r, int sa, int da) { Extra *e; - ArcTypePtr arc; + pcb_arc_t *arc; if (r % 100 == 1) r--; @@ -1741,7 +1741,7 @@ #endif } -static void mark_arc_for_deletion(ArcTypePtr a) +static void mark_arc_for_deletion(pcb_arc_t *a) { Extra *e = ARC2EXTRA(a); e->deleted = 1; @@ -1771,7 +1771,7 @@ int ex, ey; pcb_line_t *new_line; Extra *new_lextra; - ArcTypePtr new_arc; + pcb_arc_t *new_arc; Extra *new_aextra; double abs_angle; Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4765) +++ trunk/src_plugins/query/query_access.c (revision 4766) @@ -54,7 +54,7 @@ APPEND(ctx, PCB_OBJ_LINE, line, PCB_PARENT_LAYER, layer); } -static void list_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) +static void list_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) { APPEND(ctx, PCB_OBJ_ARC, arc, PCB_PARENT_LAYER, layer); } @@ -81,7 +81,7 @@ APPEND(ctx, PCB_OBJ_ELINE, line, PCB_PARENT_ELEMENT, element); } -static void list_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc) +static void list_earc_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc) { APPEND(ctx, PCB_OBJ_EARC, arc, PCB_PARENT_ELEMENT, element); } @@ -327,7 +327,7 @@ static int field_arc(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - ArcType *a = obj->data.arc; + pcb_arc_t *a = obj->data.arc; query_fields_keys_t fh1, fh2; fld2hash_req(fh1, fld, 0); @@ -578,7 +578,7 @@ static int field_earc(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - ArcType *a = obj->data.arc; + pcb_arc_t *a = obj->data.arc; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4765) +++ trunk/src_plugins/report/report.c (revision 4766) @@ -264,7 +264,7 @@ } case PCB_TYPE_ARC: { - ArcTypePtr Arc; + pcb_arc_t *Arc; pcb_box_t *box; #ifndef NDEBUG if (gui->shift_is_pressed()) { @@ -273,7 +273,7 @@ return 0; } #endif - Arc = (ArcTypePtr) ptr2; + Arc = (pcb_arc_t *) ptr2; box = GetArcEnds(Arc); report = pcb_strdup_printf("%m+ARC ID# %ld; Flags:%s\n" Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4765) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4766) @@ -67,7 +67,7 @@ double ldist, adist, radius; double vx, vy, vr, vl; int delta, aoffset, count; - ArcType *arc; + pcb_arc_t *arc; fprintf(stderr, "...Line ((%.6f, %.6f), (%.6f, %.6f)): ", PCB_COORD_TO_MM(l->Point1.X), PCB_COORD_TO_MM(l->Point1.Y), PCB_COORD_TO_MM(l->Point2.X), PCB_COORD_TO_MM(l->Point2.Y)); Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4765) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4766) @@ -5557,7 +5557,7 @@ { gdouble sa, da, theta; gdouble d = 0.; - ArcTypePtr arc; + pcb_arc_t *arc; gint wind; wind = coord_wind(a->x0, a->y0, a->x1, a->y1, vx(a->centre), vy(a->centre));