Attempt to remove some leaks. DicomRT_Contour, DicomRT_ROI and DicomRT_StructureSet...

[clitk.git] / common / clitkDicomRT_StructureSet.cxx

diff --git a/common/clitkDicomRT_StructureSet.cxx b/common/clitkDicomRT_StructureSet.cxx
index c3771570e9e6dfc35927994cc33394d42265c112..9d128b80075bf9ded4d9f3f750bf0f464dfd7916 100644 (file)
--- a/common/clitkDicomRT_StructureSet.cxx
+++ b/common/clitkDicomRT_StructureSet.cxx
@@ -37,7 +37,6 @@ clitk::DicomRT_StructureSet::DicomRT_StructureSet()
 //--------------------------------------------------------------------
 clitk::DicomRT_StructureSet::~DicomRT_StructureSet()
 {
-
 }
 //--------------------------------------------------------------------
 
@@ -99,7 +98,7 @@ const std::string & clitk::DicomRT_StructureSet::GetTime() const
 
 
 //--------------------------------------------------------------------
-const std::vector<clitk::DicomRT_ROI*> & clitk::DicomRT_StructureSet::GetListOfROI() const
+const std::vector<clitk::DicomRT_ROI::Pointer> & clitk::DicomRT_StructureSet::GetListOfROI() const
 {
   return mListOfROI;
 }
@@ -199,7 +198,7 @@ void clitk::DicomRT_StructureSet::Read(const std::string & filename)
   assert(roi_contour_seq); // TODO error message
   int n=0;
   for (gdcm::SQItem* r=roi_contour_seq->GetFirstSQItem(); r!=0; r=roi_contour_seq->GetNextSQItem()) {
-    DicomRT_ROI * roi = new DicomRT_ROI;
+    DicomRT_ROI::Pointer roi = DicomRT_ROI::New();
     roi->Read(mMapOfROIName, r);
     mListOfROI.push_back(roi);
     mMapOfROIIndex[roi->GetROINumber()] = n;
@@ -211,7 +210,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
@@ -238,7 +237,7 @@ int clitk::DicomRT_StructureSet::AddBinaryImageAsNewROI(vvImage::Pointer im, std
   color.push_back(0);
 
   // Create ROI
-  DicomRT_ROI * roi = new DicomRT_ROI;
+  DicomRT_ROI::Pointer roi = DicomRT_ROI::New();
   roi->SetFromBinaryImage(im, max, oss.str(), color, n);
   mListOfROI.push_back(roi);
   mMapOfROIIndex[mListOfROI.size()-1] = max;