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

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.
This commit is contained in:
Tim Edwards 2022-03-07 11:44:30 -05:00
parent 47df9da0d3
commit 353ca3aff6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.274
8.3.275

9
calma/CalmaWrite.c
View File

@ -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);