changes in license header

[clitk.git] / tools / clitkDicomRTStruct2BinaryImage.cxx

diff --git a/tools/clitkDicomRTStruct2BinaryImage.cxx b/tools/clitkDicomRTStruct2BinaryImage.cxx
index 1201bd5dc6c9214dc54bed6cd4cfbf4aad445890..d54c47e408d75d068a0a9089a1f5fe9961d48a8c 100644 (file)
--- a/tools/clitkDicomRTStruct2BinaryImage.cxx
+++ b/tools/clitkDicomRTStruct2BinaryImage.cxx
@@ -4,7 +4,7 @@
 
   Authors belongs to: 
   - University of LYON           http://www.universite-lyon.fr/
-  - Léon Bérard cancer center    http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center    http://www.centreleonberard.fr
   - CREATIS CNRS laboratory      http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -28,24 +28,27 @@ int main(int argc, char * argv[]) {
   GGO(clitkDicomRTStruct2BinaryImage, args_info);
 
   // Read and display information
-  clitk::DicomRT_StructureSet s;
-  s.Read(args_info.input_arg);
-  // s.Print(std::cout);
+  clitk::DicomRT_StructureSet::Pointer s = clitk::DicomRT_StructureSet::New();
+  s->Read(args_info.input_arg);
+  // s->Print(std::cout);
   
   // New filter to convert to binary image
   clitk::DicomRT_ROI_ConvertToImageFilter filter;
   filter.SetCropMaskEnabled(args_info.crop_flag);
   filter.SetImageFilename(args_info.image_arg);  // Used to get spacing + origin
   if (args_info.roi_arg != -1) {
-    filter.SetROI(s.GetROI(args_info.roi_arg)); 
+    filter.SetROI(s->GetROI(args_info.roi_arg)); 
     filter.SetOutputImageFilename(args_info.output_arg);
   filter.Update();  
   }
   else {
-    for(unsigned int i=0; i<s.GetListOfROI().size(); i++) {
-      std::string name = s.GetListOfROI()[i]->GetName();
-      int num = s.GetListOfROI()[i]->GetROINumber();
-      filter.SetROI(s.GetListOfROI()[i]); 
+    for(unsigned int i=0; i<s->GetListOfROI().size(); i++) {
+      clitk::DicomRT_ROI_ConvertToImageFilter filter;
+      filter.SetCropMaskEnabled(args_info.crop_flag);
+      filter.SetImageFilename(args_info.image_arg);  // Used to get spacing + origin
+      std::string name = s->GetListOfROI()[i]->GetName();
+      int num = s->GetListOfROI()[i]->GetROINumber();
+      filter.SetROI(s->GetListOfROI()[i]); 
       name.erase(remove_if(name.begin(), name.end(), isspace), name.end());
       std::string n = std::string(args_info.output_arg).append
         (clitk::toString(num)).append
@@ -53,7 +56,7 @@ int main(int argc, char * argv[]) {
         (name).append
         (".mhd");
       if (args_info.verbose_flag) {
-        std::cout << i << " " << s.GetListOfROI()[i]->GetName() << " num=" << num << " : " << n << std::endl;
+        std::cout << i << " " << s->GetListOfROI()[i]->GetName() << " num=" << num << " : " << n << std::endl;
       }
       filter.SetOutputImageFilename(n);
       filter.Update();