Changeset 1002 for GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

Timestamp:

06/07/06 10:59:55 (18 years ago)

Author:

mattausch

Message:

debug run: fixing memory holes

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

@@ -10 +10 @@
 #include "MeshKdTree.h"
 #include "Exporter.h"
-#include "X3dExporter.h" // delete later
 #include "ViewCell.h"
 #include "SceneGraph.h"
@@ -49 +48 @@
   environment->GetStringValue("Preprocessor.type", buff);
   string preprocessorType(buff);
-        
-  Preprocessor *p;
 
+  Preprocessor *p = NULL;
+
+ 
   if (preprocessorType == "vss")
   {
@@ -57 +57 @@
   }
   else
+  {
         if (preprocessorType == "rss")
-          p = new RssPreprocessor();
+        {
+                p = new RssPreprocessor();
+        }
         else
+        {
           if (preprocessorType == "exact")
+          {
                 p = new ExactPreprocessor();
+          }
           else
+          {
                 if (preprocessorType == "sampling")
+                {
                   p = new SamplingPreprocessor();
+                }
                 else
+                {       
                   if (preprocessorType == "render")
                   {
-                          p = new RenderSampler();
+                         p = new RenderSampler();
                   }
                   else {
-                        cerr<<"Unknown preprocessor type"<<endl;
-                        Debug<<"Unknown preprocessor type"<<endl;
-                        exit(1);
+                          DEL_PTR(environment);
+                          cerr<<"Unknown preprocessor type"<<endl;
+                          Debug<<"Unknown preprocessor type"<<endl;
+                          exit(1);
                   }
+                }
+          }
+        }
+  }
   
- 
+
   QApplication *app = NULL;
 
@@ -149 +164 @@
          returnCode = app->exec();
 
-   // clean up
+  //-- clean up
   DEL_PTR(p);
   DEL_PTR(environment);
+
   MeshManager::DelSingleton();
   MaterialManager::DelSingleton();
 
+  DEL_PTR(pt);
 
   return returnCode;