From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 29 Oct 2010 07:51:06 +0000 (+0000)
Subject: some memory leaks
X-Git-Tag: ManualPaint~9
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2d120b4a381dd83c9bb9e3e05a8da23143f90108;p=creaMaracasVisu.git

some memory leaks
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index 25f66ed..ef27a33 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -24,9 +24,9 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
 //-------------------------------------------------------------------
 vtkMPR3DDataViewer::~vtkMPR3DDataViewer()
 {
-	_outlineData-> Delete();
-	_mapOutline-> Delete();
-	_outline-> Delete();
+	if(_outlineData) {_outlineData-> Delete();}
+	if(_mapOutline)  {_mapOutline-> Delete();}
+	if(_outline)	 {_outline-> Delete();}
 
 //	if (_bwLut)		_bwLut->Delete();
 //	if (_hueLut)		_hueLut->Delete();
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index ead3f1f..588a0de 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/29 06:32:50 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2010/10/29 07:51:06 $
+  Version:   $Revision: 1.33 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,7 +23,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Other includes
 //------------------------------------------------------------------------------------------------------------
-
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
@@ -214,7 +213,7 @@
 		{
 		   if (mvtkmprbasedata)         { delete mvtkmprbasedata;}
 		}
-
+		
 		if (mvtk2Dbaseview)             { delete mvtk2Dbaseview; }
 		if (mvtkmpr2Dview_X)            { delete mvtkmpr2Dview_X;}
 		if (mvtkmpr2Dview_Y)            { delete mvtkmpr2Dview_Y;}
@@ -225,6 +224,7 @@
 		if (mwxvtkmpr3Dview)            { delete mwxvtkmpr3Dview;}
 		if (mwxvtkclipping3Dview)       { delete mwxvtkclipping3Dview;}
 		if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;}
+		if (vtkmpr3Ddataviewer)			{ delete vtkmpr3Ddataviewer;}
 	}
 	//------------------------------------------------------------------------------------------------------------
 	// Methods
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
index 9a07691..57b9ccf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/21 13:54:15 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2010/10/29 07:51:06 $
+  Version:   $Revision: 1.10 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -46,7 +46,6 @@
 // Class definition
 //------------------------------------------------------------------------------------------------------------
 
-
  class wxMaracas_ViewerWidget : public wxPanel
   {
   public: