From f49f5c1e173029f50806825af4bcfd66b7d4f04d Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 15 Jan 2022 13:34:22 -0800 Subject: [PATCH] Agglomerative_Ink_Bundling_new: remove 'pick' manual memory management --- lib/mingle/agglomerative_bundling.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/mingle/agglomerative_bundling.cpp b/lib/mingle/agglomerative_bundling.cpp index 93c8b6c91..eaf36c0c1 100644 --- a/lib/mingle/agglomerative_bundling.cpp +++ b/lib/mingle/agglomerative_bundling.cpp @@ -287,7 +287,6 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_establish(Agglomera static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_new(SparseMatrix A0, pedge *edges, double angle_param, double angle){ /* give a link of edges and their nearest neighbor graph, return a multilevel of edge bundling based on ink saving */ Agglomerative_Ink_Bundling grid; - int *pick; SparseMatrix A = A0; if (!SparseMatrix_is_symmetric(A, FALSE) || A->type != MATRIX_TYPE_REAL){ @@ -295,10 +294,10 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_new(SparseMatrix A0 } grid = Agglomerative_Ink_Bundling_init(A, edges, 0); - pick = (int*)MALLOC(sizeof(int)*A0->m); + std::vector pick(A0->m); - grid = Agglomerative_Ink_Bundling_establish(grid, pick, angle_param, angle); - free(pick); + grid = Agglomerative_Ink_Bundling_establish(grid, pick.data(), angle_param, + angle); if (A != A0) grid->delete_top_level_A = TRUE;/* be sure to clean up later */ -- 2.40.0