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

Merge branch 'master' of opencircuitdesign.com:/home/tim/gitsrc/magic/ 

Pull before push.
This commit is contained in:
Tim Edwards 2021-03-01 11:12:42 -05:00
parent 83808dcf79 4cc09afeac
commit 33927740bf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext2spice/ext2hier.c
View File

@ -1896,6 +1896,8 @@ esHierVisit(hc, cdata)
freeMagic(p); freeMagic(p);
devMergeList = NULL; devMergeList = NULL;
} }
else if (esDistrJunct)
EFHierVisitDevs(hcf, devDistJunctHierVisit, (ClientData)NULL);
/* Output devices */ /* Output devices */
EFHierVisitDevs(hcf, spcdevHierVisit, (ClientData)NULL); EFHierVisitDevs(hcf, spcdevHierVisit, (ClientData)NULL);

2
ext2spice/ext2spice.c
View File

@ -3973,7 +3973,7 @@ update_w(resClass, w, n)
{ {
(nc->m_w.widths) = (float *)mallocMagic((unsigned)sizeof(float) (nc->m_w.widths) = (float *)mallocMagic((unsigned)sizeof(float)
* efNumResistClasses); * efNumResistClasses);
for (i = 0; i < EFDevNumTypes; i++) for (i = 0; i < efNumResistClasses; i++)
nc->m_w.widths[i] = 0.0; nc->m_w.widths[i] = 0.0;
} }
nc->m_w.widths[resClass] += (float)w; nc->m_w.widths[resClass] += (float)w;