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

Rolling back part of the last commit; the correction to the tile 

allocation fixes the issue with memory being grabbed constantly
and never released, but re-surfaces an error with tiles being
used after being freed.  This is assumed to be a long-standing
bug that has not been found yet.  Meanwhile, the error that uses
up excess memory is better than the error that causes layouts to
get completely screwed up.
This commit is contained in:
R. Timothy Edwards 2025-11-08 17:24:09 -05:00
parent 957d7edd64
commit c87e5baff4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.574
8.3.575

4
tiles/tile.c
View File

@ -820,7 +820,7 @@ TiJoinX1(Tile **delay1, Tile *tile1, Tile *tile2, Plane *plane)
{
TiFreeIf(*delay1);
TiJoinX(tile1, tile2, plane);
*delay1 = tile2;
// *delay1 = tile2;
}
void
@ -828,7 +828,7 @@ TiJoinY1(Tile **delay1, Tile *tile1, Tile *tile2, Plane *plane)
{
TiFreeIf(*delay1);
TiJoinY(tile1, tile2, plane);
*delay1 = tile2;
// *delay1 = tile2;
}
#endif

4
tiles/tile.h
View File

@ -307,7 +307,7 @@ TiJoinX1(Tile **delay1, Tile *tile1, Tile *tile2, Plane *plane)
{
TiFreeIf(*delay1);
TiJoinX(tile1, tile2, plane);
*delay1 = tile2;
// *delay1 = tile2;
}
inline void
@ -315,7 +315,7 @@ TiJoinY1(Tile **delay1, Tile *tile1, Tile *tile2, Plane *plane)
{
TiFreeIf(*delay1);
TiJoinY(tile1, tile2, plane);
*delay1 = tile2;
// *delay1 = tile2;
}
#else
/* To support older compilers (that don't auto emit based on -O level) */