luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 01:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bplane

Browse Source 
Conflicts:
	VERSION
	extract/ExtMain.c
	lef/lefWrite.c

Pulled master branch changes to lefWrite into the bplane branch.
This commit is contained in:
Tim Edwards
2020-03-25 11:23:16 -04:00
parent 007806521c 195e096d64
commit 79ada35815
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drc/DRCtech.c
+3 -1
View File
@@ -4044,6 +4044,8 @@ DRCGetDefaultLayerSurround(ttype1, ttype2)
* itself, where one of the shapes has width greater than "twidth".
* The result value is in magic internal units.
*
* If "twidth" is zero, then return the maximum spacing rule distance.
*
* Side effects:
* None.
*
@@ -4066,7 +4068,7 @@ DRCGetDefaultWideLayerSpacing(ttype, twidth)
if (cptr->drcc_flags & DRC_TRIGGER) /* Widespacing rule */
{
widerule = TRUE;
if (cptr->drcc_dist > twidth) /* Check against rule width */
if (twidth > 0 && cptr->drcc_dist > twidth) /* Check against rule width */
return routeSpacing;
}
if (widerule && ((cptr->drcc_flags & DRC_REVERSE) == 0)) /* FORWARD only */