From 353ca3aff6826edeae0bfbdf66ee4da7b5c423f1 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Mon, 7 Mar 2022 11:44:30 -0500
Subject: [PATCH] Corrected the (recently implemented) "labellayer" GDS/CIF
 output function, which was incorrectly multiplying through by two scale
 factors, resulting in incorrectly-placed labels in the GDS output.

---
 VERSION            | 2 +-
 calma/CalmaWrite.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 6c99b1c5..b7f22adf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.274
+8.3.275
diff --git a/calma/CalmaWrite.c b/calma/CalmaWrite.c
index 458c0095..7657c046 100644
--- a/calma/CalmaWrite.c
+++ b/calma/CalmaWrite.c
@@ -2915,11 +2915,6 @@ calmaPaintLabelFunc(tile, cos)
     if (clipArea != NULL)
 	GeoClip(&r, clipArea);
 
-    r.r_xbot *= calmaPaintScale;
-    r.r_ybot *= calmaPaintScale;
-    r.r_xtop *= calmaPaintScale;
-    r.r_ytop *= calmaPaintScale;
-
     calmaOutRH(4, CALMA_TEXT, CALMA_NODATA, f);
 
     calmaOutRH(6, CALMA_LAYER, CALMA_I2, f);
@@ -2928,8 +2923,8 @@ calmaPaintLabelFunc(tile, cos)
     calmaOutRH(6, CALMA_TEXTTYPE, CALMA_I2, f);
     calmaOutI2(layer->cl_calmatype, f);
 
-    p.p_x = (r.r_xbot + r.r_xtop) * calmaWriteScale / 2;
-    p.p_y = (r.r_ybot + r.r_ytop) * calmaWriteScale / 2;
+    p.p_x = (r.r_xbot + r.r_xtop) * calmaPaintScale / 2;
+    p.p_y = (r.r_ybot + r.r_ytop) * calmaPaintScale / 2;
     calmaOutRH(12, CALMA_XY, CALMA_I4, f);
     calmaOutI4(p.p_x, f);
     calmaOutI4(p.p_y, f);