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

Corrected the tech loader, which was failing to set the file 

prefix when doing a reentrant load, causing include files to not
be found.  Fixed a divide-by-zero issue that occurs when some
tech file sections are not loaded to the abovementioned error.
This commit is contained in:
R. Timothy Edwards 2025-09-11 10:51:14 -04:00
parent 0022c502c8
commit 00e3bbd12a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.550
8.3.551

3
cif/CIFtech.c
View File

@ -1758,7 +1758,8 @@ cifComputeHalo(
if (maxGrow > maxShrink)
style->cs_radius = 2*maxGrow;
else style->cs_radius = 2*maxShrink;
style->cs_radius /= style->cs_scaleFactor;
if (style->cs_scaleFactor > 0)
style->cs_radius /= style->cs_scaleFactor;
style->cs_radius++;
/* TxPrintf("Radius for %s CIF is %d.\n",

16
utils/tech.c
View File

@ -449,6 +449,14 @@ TechLoad(filename, initmask)
return (FALSE);
}
/* TECH_VERSION in the filename is deprecated as of magic version */
/* 7.2.27; TECH_VERSION is no longer defined in the utils/Makefile.*/
/* It has been changed to TECH_FORMAT_VERSION, left at version 27, */
/* and placed in utils/tech.h. It is needed for backward */
/* compatibility with the old *.tech27 file format. */
(void) sprintf(suffix, ".tech");
/* If NULL is passed to argument "filename", this is a reload and */
/* we should read TechFileName verbatim. */
@ -477,14 +485,6 @@ TechLoad(filename, initmask)
tf = (FILE *)NULL;
/* TECH_VERSION in the filename is deprecated as of magic version */
/* 7.2.27; TECH_VERSION is no longer defined in the utils/Makefile. */
/* It has been changed to TECH_FORMAT_VERSION, left at version 27, */
/* and placed in utils/tech.h. It is needed for backward */
/* compatibility with *.tech27 files, of which there are many. */
(void) sprintf(suffix, ".tech");
/* Added 1/20/2015 to correspond to change to PaLockOpen(); */
/* Always strip suffix from filename when suffix is specified. */