Merge branch 'master' into magic-8.2

calma/CalmaWrite.c

@@ -365,9 +365,8 @@ CalmaWrite(rootDef, f)
  */
 
 bool
-calmaDumpStructure(def, cellstart, outf, calmaDefHash, filename)
+calmaDumpStructure(def, outf, calmaDefHash, filename)
     CellDef *def;
-    off_t cellstart;
     FILE *outf;
     HashTable *calmaDefHash;
     char *filename;
@@ -593,10 +592,9 @@ syntaxerror:
  */
 
 void
-calmaFullDump(def, fi, cellstart, outf, filename)
+calmaFullDump(def, fi, outf, filename)
     CellDef *def;
     FILE *fi;
-    off_t cellstart;
     FILE *outf;
     char *filename;
 {
@@ -659,7 +657,7 @@ calmaFullDump(def, fi, cellstart, outf, filename)
     }
     HashSetValue(he, StrDup(NULL, uniqlibname));
 
-    while (calmaDumpStructure(def, cellstart, outf, &calmaDefHash, filename))
+    while (calmaDumpStructure(def, outf, &calmaDefHash, filename))
 	if (SigInterruptPending)
 	    goto done;
     calmaSkipExact(CALMA_ENDLIB);
@@ -813,7 +811,7 @@ calmaProcessDef(def, outf)
 
 	    he = HashLookOnly(&calmaLibHash, retfilename);
 	    if (he == NULL)
-		calmaFullDump(def, fi, cellstart, outf, retfilename);
+		calmaFullDump(def, fi, outf, retfilename);
 
 	    fclose(fi);
 	    def->cd_flags |= CDVENDORGDS;

drc/DRCtech.c

@@ -2159,9 +2159,9 @@ drcSpacing(argc, argv)
 	}
 	else
 	{
-	    runlength = distance;
 	    layers2 = argv[3];
 	    distance = atoi(argv[4]);
+	    runlength = distance;
 	    adjacency = argv[5];
 	    why = drcWhyDup(argv[6]);
 	}

ext2spice/ext2hier.c

@@ -661,6 +661,7 @@ spcdevHierVisit(hc, dev, scale)
 			"base", esSpiceF);
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -788,6 +789,7 @@ spcdevHierVisit(hc, dev, scale)
 			subnode->efnode_name->efnn_hier,
 			"diode_bot", esSpiceF);
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -808,6 +810,7 @@ spcdevHierVisit(hc, dev, scale)
 			gate->dterm_node->efnode_name->efnn_hier,
 			"diode_top", esSpiceF);
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcHierWriteParams(hc, dev, scale, l, w, sdM);
 	    break;
 
@@ -1514,8 +1517,8 @@ devDistJunctHierVisit(hc, dev, scale)
 	return 0;
     }
 
-    w = (int)((float)w * scale);
     EFGetLengthAndWidth(dev, &l, &w);
+    w = (int)((float)w * scale);
 
     for (i = 1; i<dev->dev_nterm; i++)
     {

ext2spice/ext2spice.c

@@ -2335,6 +2335,7 @@ spcdevVisit(dev, hierName, scale, trans)
 			name, esSpiceF);
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcWriteParams(dev, hierName, scale, l, w, sdM);
 	    break;
 
@@ -2456,6 +2457,7 @@ spcdevVisit(dev, hierName, scale, trans)
 			name, esSpiceF); 
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcWriteParams(dev, hierName, scale, l, w, sdM);
 	    break;
 
@@ -2473,6 +2475,7 @@ spcdevVisit(dev, hierName, scale, trans)
 			name, esSpiceF);
 
 	    fprintf(esSpiceF, " %s", EFDevTypes[dev->dev_type]);
+	    sdM = getCurDevMult();
 	    spcWriteParams(dev, hierName, scale, l, w, sdM);
 	    break;
 
@@ -3796,8 +3799,8 @@ devDistJunctVisit(dev, hierName, scale, trans)
 	return 0;
     }
 
-    w = (int)((float)w * scale);
     EFGetLengthAndWidth(dev, &l, &w);
+    w = (int)((float)w * scale);
 
     for (i = 1; i<dev->dev_nterm; i++)
     {

plot/plotRutils.c

@@ -196,6 +196,7 @@ PlotFreeRaster(raster)
 				 * have been created with PlotNewRaster.
 				 */
 {
+    if (raster == NULL) return;
     freeMagic((char *) raster->ras_bits);
     freeMagic((char *) raster);
 }

plot/plotVers.c

@@ -1084,7 +1084,7 @@ PlotVersatec(scx, layers, xMask, user_scale)
     Raster *raster = NULL;
 
     /* CMYK color separated raster buffers.	*/
-    Raster *kRaster, *cRaster, *mRaster, *yRaster;
+    Raster *kRaster = NULL, *cRaster = NULL, *mRaster = NULL, *yRaster = NULL;
 
     haveColorMessage = FALSE;
     GeoTransRect(&scx->scx_trans, &scx->scx_area, &rootClip);

router/rtrChannel.c

@@ -310,6 +310,7 @@ RtrChannelObstacles(use, ch)
     scx.scx_area.r_ytop += w * RtrGridSpacing + down;
     scx.scx_use = use;
     scx.scx_trans = GeoIdentityTransform;
+    TTMaskZero(&allObs);
     TTMaskSetMask3(&allObs, &RtrMetalObstacles, &RtrPolyObstacles);
     (void) DBTreeSrTiles(&scx, &allObs, 0, rtrChannelObstacleMark, (ClientData) ch);
 

select/selCreate.c

@@ -1232,8 +1232,8 @@ selACPaintFunc2(tile, selACarg)
 	Rect rrect, orect;
 	int np, i, j;
 
-	ttype = (selACarg->ttype & TT_SIDE) ? ((ttype & TT_RIGHTMASK) >> 14) :
-		ttype & TT_LEFTMASK;
+	ttype = (selACarg->ttype & TT_SIDE) ? ((selACarg->ttype & TT_RIGHTMASK) >> 14) :
+		selACarg->ttype & TT_LEFTMASK;
 
 	if (type & TT_DIAGONAL)
 	    rtype = (type & TT_SIDE) ? SplitRightType(tile) :