Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / common / clitkDicomRT_ROI.h

diff --git a/common/clitkDicomRT_ROI.h b/common/clitkDicomRT_ROI.h
index d69ec1e9461100f161e3efaed1e05a5374797149..a22322ecbb853c0d8172444201edbcabd2fd534f 100644 (file)
--- a/common/clitkDicomRT_ROI.h
+++ b/common/clitkDicomRT_ROI.h
@@ -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
@@ -35,7 +35,11 @@ public:
   itkNewMacro(Self);
 
   void Print(std::ostream & os = std::cout) const;
+#if GDCM_MAJOR_VERSION == 2
+  void Read(std::map<int, std::string> & rois, gdcm::Item const & item);
+#else
   void Read(std::map<int, std::string> & rois, gdcm::SQItem * item);
+#endif
   void SetFromBinaryImage(vvImage * image, int n, 
         std::string name, 
         std::vector<double> color, 
@@ -69,7 +73,7 @@ protected:
   int mNumber;
   std::vector<double> mColor;
   std::vector<DicomRT_Contour::Pointer> mListOfContours;
-  vtkPolyData * mMesh;
+  vtkSmartPointer<vtkPolyData> mMesh;
   bool mMeshIsUpToDate;
   vvImage::Pointer mImage;
   double mBackgroundValue;