From 99ac84d5901c7232cf15ff1fd32cd2fedf1a7407 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Wed, 8 Apr 2020 12:11:32 -0400
Subject: [PATCH] Corrected bpDump to remove UnitsS2I(), replacing with
 scalefactor determined by CIFGetOutputScale().

---
 bplane/bpDump.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/bplane/bpDump.c b/bplane/bpDump.c
index 5a9c7c0c..10b617cd 100644
--- a/bplane/bpDump.c
+++ b/bplane/bpDump.c
@@ -37,6 +37,7 @@
 #include "utils/utils.h"
 #include "database/database.h"
 #include "utils/geometry.h"
+#include "cif/cif.h"
 #include "bplane/bplaneInt.h"
 
 static int bpDumpFlags; /* set by bpDump, used by subroutines */
@@ -66,7 +67,6 @@ static void bpIndent(int n)
  */		 
 void bpDumpRect(Rect *r)
 {
-
   if(bpDumpFlags & BPD_INTERNAL_UNITS)
   {
     fprintf(stderr,"%d ",
@@ -80,14 +80,18 @@ void bpDumpRect(Rect *r)
   }
   else
   {
-    fprintf(stderr,"%s ",
-	    UnitsI2S(r->r_xbot));
-    fprintf(stderr,"%s ",
-	    UnitsI2S(r->r_ybot));
-    fprintf(stderr,"%s ",
-	    UnitsI2S(r->r_xtop));
-    fprintf(stderr,"%s",
-	    UnitsI2S(r->r_ytop));
+    float oscale;
+
+    oscale = CIFGetOutputScale(1000);
+
+    fprintf(stderr,"%f ",
+	    oscale * (float)r->r_xbot);
+    fprintf(stderr,"%f ",
+	    oscale * (float)r->r_ybot);
+    fprintf(stderr,"%f ",
+	    oscale * (float)r->r_xtop);
+    fprintf(stderr,"%f",
+	    oscale * (float)r->r_ytop);
   }
 }
 
@@ -168,11 +172,15 @@ static void bpBinArrayDump(BinArray *ba, int indent)
   }
   else
   {
-    fprintf(stderr,"{dx %s} ",
-	    UnitsI2S(dx));
+    float oscale;
 
-    fprintf(stderr,"{dy %s} ",
-	    UnitsI2S(dy));
+    oscale = CIFGetOutputScale(1000);
+
+    fprintf(stderr,"{dx %f} ",
+	    (float)dx * oscale);
+
+    fprintf(stderr,"{dy %f} ",
+	    (float)dy * oscale);
   }
     fprintf(stderr,"{dimX %d} {dimY %d} {  bbox ",
 	  dimX,