[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37287] branches/soc-2011-avocado/blender/ source/blender/editors/mesh/autoseam_tools.c: Some memory management issues are fixed.

[shuvro sarker]

Revision: 37287
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37287
Author:   shuvro
Date:     2011-06-07 04:14:15 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Some memory management issues are fixed.

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c

Modified: branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-06-07 04:06:10 UTC (rev 37286)
+++ branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-06-07 04:14:15 UTC (rev 37287)
@@ -35,26 +35,23 @@
 #include "BKE_main.h"
 
 #include "ED_screen.h"
+#include "MEM_guardedalloc.h"
 
 
+
 static int compute_dual_graph(BMesh *bm)
 {
     BMEdge *eed;
     BMIter iter, iter2;
     BMLoop *l;
-    //int count = 0;
     
+    int i,k,m,face_index[2];
+    float **dummy_dual_graph;
     
-    //    float dummy_dual_graph[10][10];
-    int i,face_index[2];
+    dummy_dual_graph = (float **)MEM_callocN(sizeof(float*)*10, "dual_graph");
     
-    //float dummy_dual_graph[10][10];
-    int k,m;
-    
-    float **dummy_dual_graph = (float **) malloc(10* sizeof(float *));
-    
     for(k = 0; k < 10; k++ ){
-        dummy_dual_graph[k] = (float *) malloc(10 * sizeof(float));
+        dummy_dual_graph[k] = (float *)MEM_callocN(sizeof(float)*10, "dual_row");
     }    
     
     for(k = 0; k < 10; k++){
@@ -87,7 +84,8 @@
     
     calculate_eigen(dummy_dual_graph, 10);
     
-    free(dummy_dual_graph);
+    //free(dummy_dual_graph);
+    MEM_freeN(dummy_dual_graph);
     return 0;
 }
 
@@ -138,25 +136,25 @@
 
 void calculate_eigen(float **dual_graph, int dimension)
 {
-    int i,j,k;
+//    int i,j,k;
     AUTOSEAM_DummyClassHandle handle = autoseam_create_dummyclass();
 
-    float **array = (float **) malloc(dimension* sizeof(float *));
+//    float **array = (float **) malloc(dimension* sizeof(float *));
+//    
+//    for(k = 0; k < dimension; k++ ){
+//        array[k] = (float *) malloc(dimension * sizeof(float));
+//    }
+//    
+//    
+//    for(i = 0; i < dimension; i++){
+//        for(j = 0; j< dimension; j++){
+//            array[i][j] = dual_graph[i][j];
+//            printf("%.2f ",array[i][j]);
+//        }
+//        printf("\n");
+//    }
     
-    for(k = 0; k < dimension; k++ ){
-        array[k] = (float *) malloc(dimension * sizeof(float));
-    }
-    
-    
-    for(i = 0; i < dimension; i++){
-        for(j = 0; j< dimension; j++){
-            array[i][j] = dual_graph[i][j];
-            printf("%.2f ",array[i][j]);
-        }
-        printf("\n");
-    }
-    
-    autoseam_calculate_eigen(handle, array, dimension);
+    autoseam_calculate_eigen(handle, dual_graph, dimension);
 }