luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plowFindWidthBack() pass by-pointer const TileTypeBitMask* instead of by-value 

sizeof(TileTypeBitMask) == 32
This commit is contained in:
Darryl L. Miles 2025-02-17 09:52:39 +00:00 committed by Tim Edwards
parent 2ff6d6113d
commit cf0f9311ab
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plow/PlowJogs.c
View File

@ -353,7 +353,7 @@ plowProcessJogFunc(edge, area)
* all of the LHS of the jog. * all of the LHS of the jog.
*/ */
TTMaskSetOnlyType(&mask, edge->e_ltype); TTMaskSetOnlyType(&mask, edge->e_ltype);
width = plowFindWidthBack(&newedge, mask, area, (Rect *) NULL); width = plowFindWidthBack(&newedge, &mask, area, (Rect *) NULL);
r.r_xtop = newedge.e_x; r.r_xtop = newedge.e_x;
r.r_xbot = newedge.e_x - width - 1; r.r_xbot = newedge.e_x - width - 1;
r.r_ytop = newedge.e_ytop; r.r_ytop = newedge.e_ytop;

2
plow/PlowTest.c
View File

@ -294,7 +294,7 @@ PlowTest(w, cmd)
editArea.r_ybot, editArea.r_ytop); editArea.r_ybot, editArea.r_ytop);
saveDef = plowYankDef; saveDef = plowYankDef;
plowYankDef = def; plowYankDef = def;
(void) plowFindWidthBack(&edge, okTypes, &def->cd_bbox, &editArea); (void) plowFindWidthBack(&edge, &okTypes, &def->cd_bbox, &editArea);
plowYankDef = saveDef; plowYankDef = saveDef;
GeoTransRect(&EditToRootTransform, &editArea, &rootBox); GeoTransRect(&EditToRootTransform, &editArea, &rootBox);
ToolMoveBox(TOOL_BL, &rootBox.r_ll, FALSE, rootBoxDef); ToolMoveBox(TOOL_BL, &rootBox.r_ll, FALSE, rootBoxDef);

12
plow/PlowWidth.c
View File

@ -320,13 +320,12 @@ clipright:
*/ */
int int
plowFindWidthBack(edge, types, bbox, prect) plowFindWidthBack(
Edge *edge; /* Edge along the RHS of this material */ Edge *edge, /* Edge along the RHS of this material */
TileTypeBitMask types; /* Types whose width is being computed. Note const TileTypeBitMask *typesp,/* Types whose width is being computed.
* that this set is passed by value.
*/ */
Rect *bbox; /* Bounding box of the cell */ Rect *bbox, /* Bounding box of the cell */
Rect *prect; /* (Debugging only): if this is non-NULL, Rect *prect) /* (Debugging only): if this is non-NULL,
* the rectangle it points to is filled * the rectangle it points to is filled
* in with the rectangle found by this * in with the rectangle found by this
* algorithm to be the largest containing * algorithm to be the largest containing
@ -334,6 +333,7 @@ plowFindWidthBack(edge, types, bbox, prect)
* set 'types'. * set 'types'.
*/ */
{ {
TileTypeBitMask types = *typesp; /* TTMaskCopy(&types, typesp); */
Plane *plane = plowYankDef->cd_planes[edge->e_pNum]; Plane *plane = plowYankDef->cd_planes[edge->e_pNum];
TileTypeBitMask ctypes; TileTypeBitMask ctypes;
struct wclip wc; struct wclip wc;

2
plow/plowInt.h
View File

@ -258,7 +258,7 @@ extern int plowAtomize();
extern void plowCleanupJogs(); extern void plowCleanupJogs();
extern void plowDebugEdge(); extern void plowDebugEdge();
extern int plowFindWidth(Edge *edge, const TileTypeBitMask *typesp, Rect *bbox, Rect *prect); extern int plowFindWidth(Edge *edge, const TileTypeBitMask *typesp, Rect *bbox, Rect *prect);
extern int plowFindWidthBack(); extern int plowFindWidthBack(Edge *edge, const TileTypeBitMask *typesp, Rect *bbox, Rect *prect);
extern int plowGenRandom(); extern int plowGenRandom();
extern void plowQueueDone(); extern void plowQueueDone();
extern void plowQueueInit(); extern void plowQueueInit();