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

Found and fixed the actual error underlying the problem with 

grid rescaling while reading a GDS AREF record.  The previous
commit is still valid and prevents excessive warnings and
unnecessary rescaling when a bogus value is given for an array
pitch when the array has only one row or one column.  But the
scaling was still incorrect and would potentially cause an
error if an array pitch was at a finer scale than any data read
before it, forcing a valid grid rescaling.  This now works
correctly.
This commit is contained in:
R. Timothy Edwards 2026-02-25 09:59:28 -05:00
parent f3404f67b7
commit d564dc4d84
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.607
8.3.608

27
calma/CalmaRdcl.c
View File

@ -1002,7 +1002,7 @@ calmaElementSref(
for (n = 0; n < nref; n++)
{
savescale = cifCurReadStyle->crs_scaleFactor;
savescale = calmaReadScale1;
/* If there is only one column, then X data in the 2nd or 3rd
* entry is irrelevant. If there is only one row, then Y data
@ -1010,6 +1010,7 @@ calmaElementSref(
* by incorrect/uninitialized data in these positions by ignoring
* them as needed.
*/
if ((n > 0) && (rows == 1))
{
calmaReadX(&refarray[n], 1);
@ -1023,11 +1024,30 @@ calmaElementSref(
refarray[n].p_x = 0;
}
else
{
calmaReadPoint(&refarray[n], 1);
if (savescale != calmaReadScale1)
{
/* Scale changed, so update previous points read */
int newscale = calmaReadScale1 / savescale;
for (i = 0; i < n; i++)
{
refarray[i].p_x *= newscale;
refarray[i].p_y *= newscale;
}
}
if (FEOF(calmaInputFile))
return -1;
}
for (n = 0; n < nref; n++)
refunscaled[n] = refarray[n]; // Save for CDFLATGDS cells
for (n = 0; n < nref; n++)
{
savescale = cifCurReadStyle->crs_scaleFactor;
refarray[n].p_x = CIFScaleCoord(refarray[n].p_x, COORD_EXACT);
if (savescale != cifCurReadStyle->crs_scaleFactor)
{
@ -1048,9 +1068,6 @@ calmaElementSref(
}
refarray[n].p_x *= (savescale / cifCurReadStyle->crs_scaleFactor);
}
if (FEOF(calmaInputFile))
return -1;
}
/* Skip remainder */