Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4924) +++ trunk/doc-rnd/hacking/renames (revision 4925) @@ -499,3 +499,14 @@ CreateNewVia -> pcb_via_new_on_board CreateNewPin -> pcb_pin_new_in_element SetPinBoundingBox -> pcb_pin_bbox +GetPolygonMemory -> pcb_poly_alloc +RemoveFreePolygon -> pcb_poly_free +GetPointMemoryInPolygon -> pcb_poly_point_alloc +GetHoleIndexMemoryInPolygon -> pcb_poly_holeidx_new +FreePolygonMemory -> pcb_poly_free_fields +SetPolygonBoundingBox -> pcb_poly_bbox +CreateNewPolygonFromRectangle -> pcb_poly_new_from_rectangle +CreateNewPolygon -> pcb_poly_new +CreateNewPointInPolygon -> pcb_poly_point_new +CreateNewHoleInPolygon -> pcb_poly_hole_new +RemovePolygon -> pcb_poly_remove Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4924) +++ trunk/src/action_helper.c (revision 4925) @@ -884,7 +884,7 @@ int flags = PCB_FLAG_CLEARPOLY; if (conf_core.editor.full_poly) flags |= PCB_FLAG_FULLPOLY; - if ((polygon = CreateNewPolygonFromRectangle(CURRENT, + if ((polygon = pcb_poly_new_from_rectangle(CURRENT, Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.X, @@ -949,7 +949,7 @@ * different to the last one */ if (!n || points[n - 1].X != Crosshair.AttachedLine.Point2.X || points[n - 1].Y != Crosshair.AttachedLine.Point2.Y) { - CreateNewPointInPolygon(&Crosshair.AttachedPolygon, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y); + pcb_poly_point_new(&Crosshair.AttachedPolygon, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y); /* copy the coordinates */ Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X; @@ -1041,7 +1041,7 @@ * different to the last one */ if (!n || points[n - 1].X != Crosshair.AttachedLine.Point2.X || points[n - 1].Y != Crosshair.AttachedLine.Point2.Y) { - CreateNewPointInPolygon(&Crosshair.AttachedPolygon, + pcb_poly_point_new(&Crosshair.AttachedPolygon, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y); /* copy the coordinates */ Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4924) +++ trunk/src/buffer.c (revision 4925) @@ -327,7 +327,7 @@ free_rotate(&point->X, &point->Y, Buffer->X, Buffer->Y, cosa, sina); } END_LOOP; - SetPolygonBoundingBox(polygon); + pcb_poly_bbox(polygon); r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon, 0); } ENDALL_LOOP; @@ -448,7 +448,7 @@ point->Y = PCB_SWAP_Y(point->Y); } END_LOOP; - SetPolygonBoundingBox(polygon); + pcb_poly_bbox(polygon); } ENDALL_LOOP; pcb_set_buffer_bbox(Buffer); @@ -513,7 +513,7 @@ point->Y = PCB_SWAP_Y(point->Y); } END_LOOP; - SetPolygonBoundingBox(polygon); + pcb_poly_bbox(polygon); r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon, 0); /* hmmm, how to handle clip */ } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4924) +++ trunk/src/crosshair.c (revision 4925) @@ -1246,6 +1246,6 @@ */ void pcb_crosshair_uninit(void) { - FreePolygonMemory(&Crosshair.AttachedPolygon); + pcb_poly_free_fields(&Crosshair.AttachedPolygon); gui->destroy_gc(Crosshair.GC); } Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4924) +++ trunk/src/data.c (revision 4925) @@ -221,10 +221,10 @@ list_map0(&layer->Text, pcb_text_t, RemoveFreeText); POLYGON_LOOP(layer); { - FreePolygonMemory(polygon); + pcb_poly_free_fields(polygon); } END_LOOP; - list_map0(&layer->Polygon, pcb_polygon_t, RemoveFreePolygon); + list_map0(&layer->Polygon, pcb_polygon_t, pcb_poly_free); if (layer->line_tree) r_destroy_tree(&layer->line_tree); if (layer->arc_tree) Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4924) +++ trunk/src/obj_poly.c (revision 4925) @@ -54,7 +54,7 @@ /*** allocation ***/ /* get next slot for a polygon object, allocates memory if necessary */ -pcb_polygon_t *GetPolygonMemory(pcb_layer_t * layer) +pcb_polygon_t *pcb_poly_alloc(pcb_layer_t * layer) { pcb_polygon_t *new_obj; @@ -64,7 +64,7 @@ return new_obj; } -void RemoveFreePolygon(pcb_polygon_t * data) +void pcb_poly_free(pcb_polygon_t * data) { polylist_remove(data); free(data); @@ -71,7 +71,7 @@ } /* gets the next slot for a point in a polygon struct, allocates memory if necessary */ -pcb_point_t *GetPointMemoryInPolygon(pcb_polygon_t *Polygon) +pcb_point_t *pcb_poly_point_alloc(pcb_polygon_t *Polygon) { pcb_point_t *points = Polygon->Points; @@ -86,7 +86,7 @@ } /* gets the next slot for a point in a polygon struct, allocates memory if necessary */ -pcb_cardinal_t *GetHoleIndexMemoryInPolygon(pcb_polygon_t *Polygon) +pcb_cardinal_t *pcb_poly_holeidx_new(pcb_polygon_t *Polygon) { pcb_cardinal_t *holeindex = Polygon->HoleIndex; @@ -101,7 +101,7 @@ } /* frees memory used by a polygon */ -void FreePolygonMemory(pcb_polygon_t * polygon) +void pcb_poly_free_fields(pcb_polygon_t * polygon) { if (polygon == NULL) return; @@ -131,7 +131,7 @@ /* sets the bounding box of a polygons */ -void SetPolygonBoundingBox(pcb_polygon_t *Polygon) +void pcb_poly_bbox(pcb_polygon_t *Polygon) { Polygon->BoundingBox.X1 = Polygon->BoundingBox.Y1 = MAX_COORD; Polygon->BoundingBox.X2 = Polygon->BoundingBox.Y2 = 0; @@ -148,16 +148,16 @@ } /* creates a new polygon from the old formats rectangle data */ -pcb_polygon_t *CreateNewPolygonFromRectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_flag_t Flags) +pcb_polygon_t *pcb_poly_new_from_rectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_flag_t Flags) { - pcb_polygon_t *polygon = CreateNewPolygon(Layer, Flags); + pcb_polygon_t *polygon = pcb_poly_new(Layer, Flags); if (!polygon) return (polygon); - CreateNewPointInPolygon(polygon, X1, Y1); - CreateNewPointInPolygon(polygon, X2, Y1); - CreateNewPointInPolygon(polygon, X2, Y2); - CreateNewPointInPolygon(polygon, X1, Y2); + pcb_poly_point_new(polygon, X1, Y1); + pcb_poly_point_new(polygon, X2, Y1); + pcb_poly_point_new(polygon, X2, Y2); + pcb_poly_point_new(polygon, X1, Y2); pcb_add_polygon_on_layer(Layer, polygon); return (polygon); @@ -165,7 +165,7 @@ void pcb_add_polygon_on_layer(pcb_layer_t *Layer, pcb_polygon_t *polygon) { - SetPolygonBoundingBox(polygon); + pcb_poly_bbox(polygon); if (!Layer->polygon_tree) Layer->polygon_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon, 0); @@ -172,9 +172,9 @@ } /* creates a new polygon on a layer */ -pcb_polygon_t *CreateNewPolygon(pcb_layer_t *Layer, pcb_flag_t Flags) +pcb_polygon_t *pcb_poly_new(pcb_layer_t *Layer, pcb_flag_t Flags) { - pcb_polygon_t *polygon = GetPolygonMemory(Layer); + pcb_polygon_t *polygon = pcb_poly_alloc(Layer); /* copy values */ polygon->Flags = Flags; @@ -186,9 +186,9 @@ } /* creates a new point in a polygon */ -pcb_point_t *CreateNewPointInPolygon(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y) +pcb_point_t *pcb_poly_point_new(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y) { - pcb_point_t *point = GetPointMemoryInPolygon(Polygon); + pcb_point_t *point = pcb_poly_point_alloc(Polygon); /* copy values */ point->X = X; @@ -198,9 +198,9 @@ } /* creates a new hole in a polygon */ -pcb_polygon_t *CreateNewHoleInPolygon(pcb_polygon_t * Polygon) +pcb_polygon_t *pcb_poly_hole_new(pcb_polygon_t * Polygon) { - pcb_cardinal_t *holeindex = GetHoleIndexMemoryInPolygon(Polygon); + pcb_cardinal_t *holeindex = pcb_poly_holeidx_new(Polygon); *holeindex = Polygon->PointN; return Polygon; } @@ -213,12 +213,12 @@ for (n = 0; n < Src->PointN; n++) { if (hole < Src->HoleIndexN && n == Src->HoleIndex[hole]) { - CreateNewHoleInPolygon(Dest); + pcb_poly_hole_new(Dest); hole++; } - CreateNewPointInPolygon(Dest, Src->Points[n].X, Src->Points[n].Y); + pcb_poly_point_new(Dest, Src->Points[n].X, Src->Points[n].Y); } - SetPolygonBoundingBox(Dest); + pcb_poly_bbox(Dest); Dest->Flags = Src->Flags; PCB_FLAG_CLEAR(PCB_FLAG_FOUND, Dest); return (Dest); @@ -232,7 +232,7 @@ pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; pcb_polygon_t *polygon; - polygon = CreateNewPolygon(layer, Polygon->Flags); + polygon = pcb_poly_new(layer, Polygon->Flags); CopyPolygonLowLevel(polygon, Polygon); /* Update the polygon r-tree. Unlike similarly named functions for @@ -316,7 +316,7 @@ */ ErasePolygon(Polygon); r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); - save = *CreateNewPointInPolygon(Polygon, ctx->insert.x, ctx->insert.y); + save = *pcb_poly_point_new(Polygon, ctx->insert.x, ctx->insert.y); for (n = Polygon->PointN - 1; n > ctx->insert.idx; n--) Polygon->Points[n] = Polygon->Points[n - 1]; @@ -329,7 +329,7 @@ SetChangedFlag(pcb_true); AddObjectToInsertPointUndoList(PCB_TYPE_POLYGON_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); - SetPolygonBoundingBox(Polygon); + pcb_poly_bbox(Polygon); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); InitClip(PCB->Data, Layer, Polygon); if (ctx->insert.forcible || !RemoveExcessPolygonPoints(Layer, Polygon)) { @@ -375,7 +375,7 @@ } r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); - SetPolygonBoundingBox(Polygon); + pcb_poly_bbox(Polygon); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); RemoveExcessPolygonPoints(Layer, Polygon); InitClip(PCB->Data, Layer, Polygon); @@ -459,9 +459,9 @@ void *DestroyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); - FreePolygonMemory(Polygon); + pcb_poly_free_fields(Polygon); - RemoveFreePolygon(Polygon); + pcb_poly_free(Polygon); return NULL; } @@ -495,7 +495,7 @@ if (Polygon->HoleIndex[i] > point_idx) Polygon->HoleIndex[i]--; - SetPolygonBoundingBox(Polygon); + pcb_poly_bbox(Polygon); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); InitClip(PCB->Data, Layer, Polygon); return (Polygon); @@ -514,7 +514,7 @@ return NULL; } -void *RemovePolygon(pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_poly_remove(pcb_layer_t *Layer, pcb_polygon_t *Polygon) { pcb_opctx_t ctx; @@ -533,7 +533,7 @@ pcb_cardinal_t i; if (contour == 0) - return RemovePolygon(Layer, Polygon); + return pcb_poly_remove(Layer, Polygon); if (Layer->On) { ErasePolygon(Polygon); @@ -602,7 +602,7 @@ if (Polygon->HoleIndex[i] > point_idx) Polygon->HoleIndex[i]--; - SetPolygonBoundingBox(Polygon); + pcb_poly_bbox(Polygon); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); RemoveExcessPolygonPoints(Layer, Polygon); InitClip(PCB->Data, Layer, Polygon); @@ -621,7 +621,7 @@ { pcb_polygon_t *polygon; - polygon = CreateNewPolygon(Layer, pcb_no_flags()); + polygon = pcb_poly_new(Layer, pcb_no_flags()); CopyPolygonLowLevel(polygon, Polygon); MovePolygonLowLevel(polygon, ctx->copy.DeltaX, ctx->copy.DeltaY); if (!Layer->polygon_tree) Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 4924) +++ trunk/src/obj_poly.h (revision 4925) @@ -48,18 +48,18 @@ -pcb_polygon_t *GetPolygonMemory(pcb_layer_t * layer); -void RemoveFreePolygon(pcb_polygon_t * data); -pcb_point_t *GetPointMemoryInPolygon(pcb_polygon_t *Polygon); -pcb_cardinal_t *GetHoleIndexMemoryInPolygon(pcb_polygon_t *Polygon); -void FreePolygonMemory(pcb_polygon_t * polygon); +pcb_polygon_t *pcb_poly_alloc(pcb_layer_t * layer); +void pcb_poly_free(pcb_polygon_t * data); +pcb_point_t *pcb_poly_point_alloc(pcb_polygon_t *Polygon); +pcb_cardinal_t *pcb_poly_holeidx_new(pcb_polygon_t *Polygon); +void pcb_poly_free_fields(pcb_polygon_t * polygon); -void SetPolygonBoundingBox(pcb_polygon_t *Polygon); -pcb_polygon_t *CreateNewPolygonFromRectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_flag_t Flags); -pcb_polygon_t *CreateNewPolygon(pcb_layer_t *Layer, pcb_flag_t Flags); -pcb_point_t *CreateNewPointInPolygon(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y); -pcb_polygon_t *CreateNewHoleInPolygon(pcb_polygon_t * Polygon); -void *RemovePolygon(pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void pcb_poly_bbox(pcb_polygon_t *Polygon); +pcb_polygon_t *pcb_poly_new_from_rectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_flag_t Flags); +pcb_polygon_t *pcb_poly_new(pcb_layer_t *Layer, pcb_flag_t Flags); +pcb_point_t *pcb_poly_point_new(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y); +pcb_polygon_t *pcb_poly_hole_new(pcb_polygon_t * Polygon); +void *pcb_poly_remove(pcb_layer_t *Layer, pcb_polygon_t *Polygon); void MovePolygonLowLevel(pcb_polygon_t *Polygon, pcb_coord_t DX, pcb_coord_t DY); void RotatePolygonLowLevel(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4924) +++ trunk/src/polygon.c (revision 4925) @@ -1336,7 +1336,7 @@ int saveID; /* move data to layer and clear attached struct */ - polygon = CreateNewPolygon(CURRENT, pcb_no_flags()); + polygon = pcb_poly_new(CURRENT, pcb_no_flags()); saveID = polygon->ID; *polygon = Crosshair.AttachedPolygon; polygon->ID = saveID; @@ -1344,7 +1344,7 @@ if (conf_core.editor.full_poly) PCB_FLAG_SET(PCB_FLAG_FULLPOLY, polygon); memset(&Crosshair.AttachedPolygon, 0, sizeof(pcb_polygon_t)); - SetPolygonBoundingBox(polygon); + pcb_poly_bbox(polygon); if (!CURRENT->polygon_tree) CURRENT->polygon_tree = r_create_tree(NULL, 0, 0); r_insert_entry(CURRENT->polygon_tree, (pcb_box_t *) polygon, 0); @@ -1699,7 +1699,7 @@ start = p = poly->Clipped; /* This is ugly. The creation of the new polygons can cause * all of the polygon pointers (including the one we're called - * with to change if there is a realloc in GetPolygonMemory(). + * with to change if there is a realloc in pcb_poly_alloc(). * That will invalidate our original "poly" argument, potentially * inside the loop. We need to steal the Clipped pointer and * hide it from the Remove call so that it still exists while @@ -1710,7 +1710,7 @@ printf("Just leaked in MorpyPolygon\n"); poly->NoHoles = NULL; flags = poly->Flags; - RemovePolygon(layer, poly); + pcb_poly_remove(layer, poly); inhibit = pcb_true; do { pcb_vnode_t *v; @@ -1717,14 +1717,14 @@ pcb_polygon_t *newone; if (p->contours->area > PCB->IsleArea) { - newone = CreateNewPolygon(layer, flags); + newone = pcb_poly_new(layer, flags); if (!newone) return pcb_false; many = pcb_true; v = &p->contours->head; - CreateNewPointInPolygon(newone, v->point[0], v->point[1]); + pcb_poly_point_new(newone, v->point[0], v->point[1]); for (v = v->next; v != &p->contours->head; v = v->next) - CreateNewPointInPolygon(newone, v->point[0], v->point[1]); + pcb_poly_point_new(newone, v->point[0], v->point[1]); newone->BoundingBox.X1 = p->contours->xmin; newone->BoundingBox.X2 = p->contours->xmax + 1; newone->BoundingBox.Y1 = p->contours->ymin; @@ -1811,7 +1811,7 @@ pa = Input; do { - Polygon = CreateNewPolygon(Layer, Flags); + Polygon = pcb_poly_new(Layer, Flags); pline = pa->contours; outer = pcb_true; @@ -1818,12 +1818,12 @@ do { if (!outer) - CreateNewHoleInPolygon(Polygon); + pcb_poly_hole_new(Polygon); outer = pcb_false; node = &pline->head; do { - CreateNewPointInPolygon(Polygon, node->point[0], node->point[1]); + pcb_poly_point_new(Polygon, node->point[0], node->point[1]); } while ((node = node->next) != &pline->head); @@ -1831,7 +1831,7 @@ while ((pline = pline->next) != NULL); InitClip(Destination, Layer, Polygon); - SetPolygonBoundingBox(Polygon); + pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) Layer->polygon_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4924) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4925) @@ -301,7 +301,7 @@ /* void *v; - v = CreateNewPolygonFromRectangle(PCB->Data->Layer+1, + v = pcb_poly_new_from_rectangle(PCB->Data->Layer+1, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(1500), PCB_MIL_TO_COORD(1500), pcb_flag_make(PCB_FLAG_CLEARPOLY | PCB_FLAG_FULLPOLY)); @@ -350,7 +350,7 @@ PCB_MIL_TO_COORD(850), PCB_MIL_TO_COORD(1150), 0, 100, "Text", pcb_flag_make(PCB_FLAG_CLEARLINE)); { - pcb_polygon_t *v = CreateNewPolygonFromRectangle(preview_pcb.Data->Layer, + pcb_polygon_t *v = pcb_poly_new_from_rectangle(preview_pcb.Data->Layer, PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(1200), PCB_MIL_TO_COORD(1200), pcb_flag_make(PCB_FLAG_CLEARPOLY)); Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 4924) +++ trunk/src_plugins/io_kicad/read.c (revision 4925) @@ -1892,7 +1892,7 @@ if (PCBLayer == -1) { return -1; } - polygon = CreateNewPolygon(&st->PCB->Data->Layer[PCBLayer], flags); + polygon = pcb_poly_new(&st->PCB->Data->Layer[PCBLayer], flags); } else { return -1; } @@ -1920,7 +1920,7 @@ Y = PCB_MM_TO_COORD(val); } if (polygon != NULL) { - CreateNewPointInPolygon(polygon, X, Y); + pcb_poly_point_new(polygon, X, Y); } } else { return -1; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4924) +++ trunk/src_plugins/io_lihata/read.c (revision 4925) @@ -440,7 +440,7 @@ static int parse_polygon(pcb_layer_t *ly, pcb_element_t *el, lht_node_t *obj) { - pcb_polygon_t *poly = GetPolygonMemory(ly); + pcb_polygon_t *poly = pcb_poly_alloc(ly); lht_node_t *geo; pcb_cardinal_t n = 0, c; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4924) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4925) @@ -2238,7 +2238,7 @@ case 85: #line 908 "parse_y.y" /* yacc.c:1646 */ { - CreateNewPolygonFromRectangle(Layer, + pcb_poly_new_from_rectangle(Layer, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer))); } #line 2245 "parse_y.c" /* yacc.c:1646 */ @@ -2362,7 +2362,7 @@ case 101: #line 1145 "parse_y.y" /* yacc.c:1646 */ { - Polygon = CreateNewPolygon(Layer, (yyvsp[-2].flagtype)); + Polygon = pcb_poly_new(Layer, (yyvsp[-2].flagtype)); } #line 2368 "parse_y.c" /* yacc.c:1646 */ break; @@ -2394,7 +2394,7 @@ } else { - SetPolygonBoundingBox (Polygon); + pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) Layer->polygon_tree = r_create_tree (NULL, 0, 0); r_insert_entry (Layer->polygon_tree, (pcb_box_t *) Polygon, 0); @@ -2406,7 +2406,7 @@ case 105: #line 1190 "parse_y.y" /* yacc.c:1646 */ { - CreateNewHoleInPolygon (Polygon); + pcb_poly_hole_new(Polygon); } #line 2412 "parse_y.c" /* yacc.c:1646 */ break; @@ -2414,7 +2414,7 @@ case 109: #line 1204 "parse_y.y" /* yacc.c:1646 */ { - CreateNewPointInPolygon(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); + pcb_poly_point_new(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } #line 2420 "parse_y.c" /* yacc.c:1646 */ break; @@ -2422,7 +2422,7 @@ case 110: #line 1208 "parse_y.y" /* yacc.c:1646 */ { - CreateNewPointInPolygon(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); + pcb_poly_point_new(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } #line 2428 "parse_y.c" /* yacc.c:1646 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4924) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4925) @@ -906,7 +906,7 @@ /* x1, y1, x2, y2, flags */ | T_RECTANGLE '(' measure measure measure measure INTEGER ')' { - CreateNewPolygonFromRectangle(Layer, + pcb_poly_new_from_rectangle(Layer, OU ($3), OU ($4), OU ($3) + OU ($5), OU ($4) + OU ($6), pcb_flag_old($7)); } | text_hi_format @@ -1143,7 +1143,7 @@ : /* flags are passed in */ T_POLYGON '(' flags ')' '(' { - Polygon = CreateNewPolygon(Layer, $3); + Polygon = pcb_poly_new(Layer, $3); } polygonpoints polygonholes ')' @@ -1172,7 +1172,7 @@ } else { - SetPolygonBoundingBox (Polygon); + pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) Layer->polygon_tree = r_create_tree (NULL, 0, 0); r_insert_entry (Layer->polygon_tree, (pcb_box_t *) Polygon, 0); @@ -1188,7 +1188,7 @@ polygonhole : T_POLYGON_HOLE '(' { - CreateNewHoleInPolygon (Polygon); + pcb_poly_hole_new(Polygon); } polygonpoints ')' ; @@ -1202,11 +1202,11 @@ /* xcoord ycoord */ : '(' measure measure ')' { - CreateNewPointInPolygon(Polygon, OU ($2), OU ($3)); + pcb_poly_point_new(Polygon, OU ($2), OU ($3)); } | '[' measure measure ']' { - CreateNewPointInPolygon(Polygon, NU ($2), NU ($3)); + pcb_poly_point_new(Polygon, NU ($2), NU ($3)); } ; Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4924) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4925) @@ -307,7 +307,7 @@ /* Check where we should place the node in the tree */ root = insert_node_recursive(root, this_node); - /*RemovePolygon (layer, polygon);*/ + /*pcb_poly_remove(layer, polygon);*/ } ENDALL_LOOP; @@ -326,7 +326,7 @@ if (Layer != layer) continue; - RemovePolygon(layer, polygon); + pcb_poly_remove(layer, polygon); } ENDALL_LOOP; Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 4924) +++ trunk/src_plugins/polystitch/polystitch.c (revision 4925) @@ -172,7 +172,7 @@ int n = poly->PointN; if (poly->Points[0].X == poly->Points[n - 1].X && poly->Points[0].Y == poly->Points[n - 1].Y) return; - CreateNewPointInPolygon(poly, poly->Points[0].X, poly->Points[0].Y); + pcb_poly_point_new(poly, poly->Points[0].X, poly->Points[0].Y); } /*! @@ -212,12 +212,12 @@ r_delete_entry(poly_layer->polygon_tree, (pcb_box_t *) outer_poly); for (i = 0; i < inner_poly->PointN; i++) - CreateNewPointInPolygon(outer_poly, inner_poly->Points[i].X, inner_poly->Points[i].Y); + pcb_poly_point_new(outer_poly, inner_poly->Points[i].X, inner_poly->Points[i].Y); SetChangedFlag(pcb_true); outer_poly->NoHolesValid = 0; - SetPolygonBoundingBox(outer_poly); + pcb_poly_bbox(outer_poly); r_insert_entry(poly_layer->polygon_tree, (pcb_box_t *) outer_poly, 0); RemoveExcessPolygonPoints(poly_layer, outer_poly); InitClip(PCB->Data, poly_layer, outer_poly); @@ -224,7 +224,7 @@ DrawPolygon(poly_layer, outer_poly); pcb_draw(); - RemovePolygon(poly_layer, inner_poly); + pcb_poly_remove(poly_layer, inner_poly); } static int polystitch(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)