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

Pull before push.

ext2spice/ext2hier.c

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

ext2spice/ext2spice.c

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