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

Fixed the "flatten" command so that "-dotoplabels" works as advertised, 

and doesn't crash magic.
This commit is contained in:
Tim Edwards 2023-03-25 15:06:25 -04:00
parent fc62a63d41
commit 7b9809e567
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commands/CmdFI.c
View File

@ -2123,15 +2123,16 @@ CmdFlatten(w, cmd)
DBCellCopyAllPaint(&scx, &DBAllButSpaceAndDRCBits, xMask, flatDestUse); DBCellCopyAllPaint(&scx, &DBAllButSpaceAndDRCBits, xMask, flatDestUse);
DBFlatCopyMaskHints(&scx, xMask, flatDestUse); DBFlatCopyMaskHints(&scx, xMask, flatDestUse);
if (dolabels) if (toplabels)
FlatCopyAllLabels(&scx, &DBAllTypeBits, xMask, flatDestUse);
else if (toplabels)
{ {
int savemask = scx.scx_use->cu_expandMask; int savemask = scx.scx_use->cu_expandMask;
scx.scx_use->cu_expandMask = CU_DESCEND_SPECIAL; scx.scx_use->cu_expandMask = CU_DESCEND_SPECIAL;
DBCellCopyAllLabels(&scx, &DBAllTypeBits, CU_DESCEND_SPECIAL, flatDestUse); DBCellCopyAllLabels(&scx, &DBAllTypeBits, CU_DESCEND_SPECIAL, flatDestUse,
NULL);
scx.scx_use->cu_expandMask = savemask; scx.scx_use->cu_expandMask = savemask;
} }
else if (dolabels)
FlatCopyAllLabels(&scx, &DBAllTypeBits, xMask, flatDestUse);
if (xMask != CU_DESCEND_ALL) if (xMask != CU_DESCEND_ALL)
DBCellCopyAllCells(&scx, xMask, flatDestUse, (Rect *)NULL); DBCellCopyAllCells(&scx, xMask, flatDestUse, (Rect *)NULL);