From: dsarrut <dsarrut>
Date: Thu, 10 Mar 2011 16:00:09 +0000 (+0000)
Subject: Replace vvImage::Pointer with raw pointer for function
X-Git-Tag: v1.2.0~186
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=24fb0576a860ea843722b1d84561186542b62fd5;p=clitk.git

Replace vvImage::Pointer with raw pointer for function
---

diff --git a/common/clitkDicomRT_ROI.cxx b/common/clitkDicomRT_ROI.cxx
index 6c9e977..6bb2e25 100644
--- a/common/clitkDicomRT_ROI.cxx
+++ b/common/clitkDicomRT_ROI.cxx
@@ -39,7 +39,7 @@ clitk::DicomRT_ROI::DicomRT_ROI()
 //--------------------------------------------------------------------
 clitk::DicomRT_ROI::~DicomRT_ROI()
 {
-
+  mImage->Delete();
 }
 //--------------------------------------------------------------------
 
@@ -208,7 +208,7 @@ void clitk::DicomRT_ROI::ComputeMesh()
 
 
 //--------------------------------------------------------------------
-void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage::Pointer image, int n,
+void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage * image, int n,
 					    std::string name,
 					    std::vector<double> color, 
 					    std::string filename)
@@ -234,7 +234,7 @@ void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage::Pointer image, int n,
 
 
 //--------------------------------------------------------------------
-const vvImage::Pointer clitk::DicomRT_ROI::GetImage() const
+vvImage * clitk::DicomRT_ROI::GetImage() const
 {
   return mImage;
 }
diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index c1cf977..7fde1bf 100644
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.h
@@ -34,7 +34,7 @@ namespace clitk {
 
     void Print(std::ostream & os = std::cout) const;
     void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
-    void SetFromBinaryImage(vvImage::Pointer image, int n, 
+    void SetFromBinaryImage(vvImage * image, int n, 
 			    std::string name, 
 			    std::vector<double> color, 
 			    std::string filename);
@@ -44,7 +44,7 @@ namespace clitk {
     const std::string & GetFilename() const;
     const std::vector<double> & GetDisplayColor() const;
     vtkPolyData * GetMesh();
-    const vvImage::Pointer GetImage() const;
+    vvImage * GetImage() const;
 
     void SetDisplayColor(double r, double v, double b);
     std::vector<double> & GetDisplayColor() { return mColor; }
@@ -69,7 +69,7 @@ namespace clitk {
     std::vector<DicomRT_Contour*> mListOfContours;
     vtkPolyData * mMesh;
     bool mMeshIsUpToDate;
-    vvImage::Pointer mImage;
+    vvImage * mImage;
     double mBackgroundValue;
     double mForegroundValue;
     ///Spacing between two contours
diff --git a/common/clitkDicomRT_StructureSet.cxx b/common/clitkDicomRT_StructureSet.cxx
index c377157..41cddc2 100644
--- a/common/clitkDicomRT_StructureSet.cxx
+++ b/common/clitkDicomRT_StructureSet.cxx
@@ -37,7 +37,9 @@ clitk::DicomRT_StructureSet::DicomRT_StructureSet()
 //--------------------------------------------------------------------
 clitk::DicomRT_StructureSet::~DicomRT_StructureSet()
 {
-
+  for(uint i=0; i<mListOfROI.size(); i++) {
+    delete mListOfROI[i];
+  }
 }
 //--------------------------------------------------------------------
 
@@ -211,7 +213,7 @@ void clitk::DicomRT_StructureSet::Read(const std::string & filename)
 
 
 //--------------------------------------------------------------------
-int clitk::DicomRT_StructureSet::AddBinaryImageAsNewROI(vvImage::Pointer im, std::string n)
+int clitk::DicomRT_StructureSet::AddBinaryImageAsNewROI(vvImage * im, std::string n)
 {
   //DD("AddBinaryImageAsNewROI");
   // Search max ROI number
diff --git a/common/clitkDicomRT_StructureSet.h b/common/clitkDicomRT_StructureSet.h
index 77d164d..541a91c 100644
--- a/common/clitkDicomRT_StructureSet.h
+++ b/common/clitkDicomRT_StructureSet.h
@@ -46,7 +46,7 @@ namespace clitk {
     const std::string & GetDate() const;
     const std::string & GetTime() const;
 
-    int AddBinaryImageAsNewROI(vvImage::Pointer i, std::string name);
+    int AddBinaryImageAsNewROI(vvImage * i, std::string name);
     
   protected:
     std::string mStudyID;