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

Corrected custom wire extension handling in GDS file reads.

This commit is contained in:
Tim Edwards 2017-10-06 22:56:34 -04:00
parent 6e066ededa
commit 5ba46da6b9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calma/CalmaRdpt.c
View File

@ -471,15 +471,13 @@ calmaElementPath()
width /= calmaReadScale2; width /= calmaReadScale2;
/* Set path extensions based on path type */ /* Set path extensions based on path type. Note that SQUARE endcaps */
if (pathtype == CALMAPATH_SQUAREFLUSH || pathtype == CALMAPATH_CUSTOM) /* are handled automatically by the CIFPaintWirePath routine. */
{ /* Round endcaps are not really handled other than assuming they're */
extend1 = extend2 = 0; /* the same as square. All others are truncated to zero and any */
} /* custom endcap is added to the path here. */
else if (pathtype == CALMAPATH_SQUAREPLUS || pathtype == CALMAPATH_ROUND)
{ extend1 = extend2 = 0;
extend1 = extend2 = (width / 2);
}
/* Handle BGNEXTN, ENDEXTN */ /* Handle BGNEXTN, ENDEXTN */
PEEKRH(nbytes, rtype); PEEKRH(nbytes, rtype);
@ -608,8 +606,8 @@ calmaElementPath()
} }
CIFPaintWirePath(pathheadp, width, CIFPaintWirePath(pathheadp, width,
(pathtype == CALMAPATH_SQUAREFLUSH) ? FALSE : TRUE, (pathtype == CALMAPATH_SQUAREFLUSH || pathtype == CALMAPATH_CUSTOM) ?
plane, CIFPaintTable, (PaintUndoInfo *)NULL); FALSE : TRUE, plane, CIFPaintTable, (PaintUndoInfo *)NULL);
if (cifCurReadPlanes == cifEditCellPlanes) if (cifCurReadPlanes == cifEditCellPlanes)
{ {