songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leaks in partition code

This commit is contained in:
Mael Rouxel-Labbé 2018-12-20 15:57:51 +01:00
parent 9a60299682
commit 2c6e9c2b70
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
View File

@ -36,12 +36,15 @@
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <cstdlib>
namespace CGAL { namespace CGAL {
namespace METIS { namespace METIS {
template<typename TriangleMesh, typename METIS_options, typename NamedParameters> template<typename TriangleMesh, typename METIS_options, typename NamedParameters>
void partition_dual_graph(const TriangleMesh& tm, int nparts, void partition_dual_graph(const TriangleMesh& tm,
int nparts,
METIS_options options, // options array METIS_options options, // options array
const NamedParameters& np) const NamedParameters& np)
{ {
@ -93,11 +96,11 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts,
idx_t objval; idx_t objval;
// partition info for the nodes // partition info for the nodes
idx_t* npart = (idx_t*) calloc(nn, sizeof(idx_t)); idx_t* npart = (idx_t*) calloc(num_vertices(tm), sizeof(idx_t));
CGAL_assertion(npart != NULL); CGAL_assertion(npart != NULL);
// partition info for the elements // partition info for the elements
idx_t* epart = (idx_t*) calloc(ne, sizeof(idx_t)); idx_t* epart = (idx_t*) calloc(num_faces(tm), sizeof(idx_t));
CGAL_assertion(epart != NULL); CGAL_assertion(epart != NULL);
// do not support Fortran-style arrays // do not support Fortran-style arrays
@ -118,6 +121,12 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts,
Output_face_partition_ids fo; Output_face_partition_ids fo;
vo(tm, indices, npart, get_param(np, internal_np::vertex_partition_id)); vo(tm, indices, npart, get_param(np, internal_np::vertex_partition_id));
fo(tm, epart, get_param(np, internal_np::face_partition_id)); fo(tm, epart, get_param(np, internal_np::face_partition_id));
delete[] eptr;
delete[] eind;
std::free(npart);
std::free(epart);
} }
template<typename TriangleMesh, typename NamedParameters> template<typename TriangleMesh, typename NamedParameters>

15
BGL/include/CGAL/boost/graph/METIS/partition_graph.h
View File

@ -34,6 +34,8 @@
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <cstdlib>
namespace CGAL { namespace CGAL {
namespace METIS { namespace METIS {
@ -76,7 +78,8 @@ struct Output_face_partition_ids
}; };
template<typename TriangleMesh, typename METIS_options, typename NamedParameters> template<typename TriangleMesh, typename METIS_options, typename NamedParameters>
void partition_graph(const TriangleMesh& tm, int nparts, void partition_graph(const TriangleMesh& tm,
int nparts,
METIS_options options, // pointer to the options array METIS_options options, // pointer to the options array
const NamedParameters& np) const NamedParameters& np)
{ {
@ -125,11 +128,11 @@ void partition_graph(const TriangleMesh& tm, int nparts,
idx_t objval; idx_t objval;
// partition info for the nodes // partition info for the nodes
idx_t* npart = (idx_t*) calloc(nn, sizeof(idx_t)); idx_t* npart = (idx_t*) calloc(num_vertices(tm), sizeof(idx_t));
CGAL_assertion(npart != NULL); CGAL_assertion(npart != NULL);
// partition info for the elements // partition info for the elements
idx_t* epart = (idx_t*) calloc(ne, sizeof(idx_t)); idx_t* epart = (idx_t*) calloc(num_faces(tm), sizeof(idx_t));
CGAL_assertion(epart != NULL); CGAL_assertion(epart != NULL);
// do not support Fortran-style arrays // do not support Fortran-style arrays
@ -150,6 +153,12 @@ void partition_graph(const TriangleMesh& tm, int nparts,
Output_face_partition_ids fo; Output_face_partition_ids fo;
vo(tm, indices, npart, get_param(np, internal_np::vertex_partition_id)); vo(tm, indices, npart, get_param(np, internal_np::vertex_partition_id));
fo(tm, epart, get_param(np, internal_np::face_partition_id)); fo(tm, epart, get_param(np, internal_np::face_partition_id));
delete[] eptr;
delete[] eind;
std::free(npart);
std::free(epart);
} }
template<typename TriangleMesh, typename NamedParameters> template<typename TriangleMesh, typename NamedParameters>