fix: realign non-triangle remove_overlap() with its prototype

There are two definitions of remove_overlap(), one in use when triangulation or
GTS is enabled and the other in use when either of these is disabled. The latter
definition did not match its declaration. As a result, any attempt to use this
function would most likely have resulted in stack corruption. Fixes #1544.

diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c
index e5133df0bcdc7b07d934c7b8166f9f9f721831d5..705cb8ca596b5aa2543bbc69a5ecc91ebb2aca84 100644 (file)
--- a/lib/neatogen/overlap.c
+++ b/lib/neatogen/overlap.c
@@ -683,7 +683,8 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
 #else
 #include "types.h"
 #include "SparseMatrix.h"
-void remove_overlap(int dim, SparseMatrix A, int m, real *x, real *label_sizes, int ntry, real initial_scaling, int do_shrinking, int *flag)
+void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling,
+                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag)
 {
     static int once;