Browse Source

- fixed a memory leak in triangle_wrapper
- small fix in cmake file for triangle example


Former-commit-id: 3ae6454969c28689850f0dc6684df825cb20741e

Daniele Panozzo 11 years ago
parent
commit
24f1d5a7d8

+ 7 - 2
include/igl/triangle/triangle_wrapper.cpp

@@ -84,16 +84,21 @@ IGL_INLINE void igl::triangle_wrapper(
   free(in.holelist);
   free(in.holelist);
 
 
   // Cleanup out
   // Cleanup out
+  free(out.pointlist);
+  free(out.trianglelist);
+  free(out.segmentlist);
+
+  // Return the mesh
   V2.resize(out.numberofpoints,2);
   V2.resize(out.numberofpoints,2);
   for (unsigned i=0;i<V2.rows();++i)
   for (unsigned i=0;i<V2.rows();++i)
     for (unsigned j=0;j<2;++j)
     for (unsigned j=0;j<2;++j)
       V2(i,j) = out.pointlist[i*2+j];
       V2(i,j) = out.pointlist[i*2+j];
-  
+
   F2.resize(out.numberoftriangles,3);
   F2.resize(out.numberoftriangles,3);
   for (unsigned i=0;i<F2.rows();++i)
   for (unsigned i=0;i<F2.rows();++i)
     for (unsigned j=0;j<3;++j)
     for (unsigned j=0;j<3;++j)
       F2(i,j) = out.trianglelist[i*3+j];
       F2(i,j) = out.trianglelist[i*3+j];
-  
+
 }
 }
 
 
 #ifndef IGL_HEADER_ONLY
 #ifndef IGL_HEADER_ONLY

+ 1 - 1
tutorial/604_Triangle/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
 cmake_minimum_required(VERSION 2.6)
-project(601_Serialization)
+project(604_Triangle)
 
 
 include("../CMakeLists.shared")
 include("../CMakeLists.shared")
 find_package(TRIANGLE REQUIRED)
 find_package(TRIANGLE REQUIRED)