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

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2020-03-28 03:00:04 -04:00
parent 1f5374bdf7 2a7e2ab110
commit 2f00f2a057
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.2.203
8.2.204

2
calma/CalmaWrite.c
View File

@ -451,7 +451,7 @@ calmaDumpStructure(def, outf, calmaDefHash, filename)
chklibname = (char *)DBPropGet(edef, "GDS_FILE", &isReadOnly);
/* Is the library name the same? */
if (isAbstract && !strcmp(filename, chklibname))
if (isAbstract && isReadOnly && !strcmp(filename, chklibname))
{
/* Same library, so keep the cellname and mark the cell */
/* as having been written to GDS. */

11
resis/ResSimple.c
View File

@ -750,7 +750,16 @@ ResCalculateChildCapacitance(me)
for (tptr = me->rn_te; tptr != NULL; tptr = tptr->te_nextt)
{
dev = tptr->te_thist;
t = TiGetType(dev->rd_tile);
/* Hack for non-Manhattan geometry. Only one side of a split */
/* tile should correspond to a device type. */
if (IsSplit(dev->rd_tile))
{
t = TiGetLeftType(dev->rd_tile);
if (ExtCurStyle->exts_device[t] == NULL)
t = TiGetRightType(dev->rd_tile);
}
else
t = TiGetType(dev->rd_tile);
if (dev->rd_fet_gate == me)
{
devptr = ExtCurStyle->exts_device[t];