Removed mat file from experimental

[clitk.git] / common / clitkDicomRT_Contour.cxx

diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx
index 861717002ea65fa76b0a19ae12d62d19ea42500e..ee55e44bc704986ce736c82e19fa7a9c423b145b 100644 (file)
--- a/common/clitkDicomRT_Contour.cxx
+++ b/common/clitkDicomRT_Contour.cxx
@@ -53,6 +53,7 @@ void clitk::DicomRT_Contour::Print(std::ostream & os) const
 
 
 //--------------------------------------------------------------------
+#if GDCM_MAJOR_VERSION == 2
 void clitk::DicomRT_Contour::UpdateDicomItem()
 {
   DD("DicomRT_Contour::UpdateDicomItem");
@@ -109,6 +110,7 @@ void clitk::DicomRT_Contour::UpdateDicomItem()
   DD(bb[0]);
 
 }
+#endif
 //--------------------------------------------------------------------
 
 
@@ -144,15 +146,7 @@ bool clitk::DicomRT_Contour::Read(gdcm::Item * item)
   const gdcm::DataElement & contourdata = nestedds2.GetDataElement( tcontourdata );
   at.SetFromDataElement( contourdata );
   const double* points = at.GetValues();
-<<<<<<< Updated upstream
-<<<<<<< variant A
->>>>>>> variant B
   //  unsigned int npts = at.GetNumberOfValues() / 3;
-======= end
-=======
-  //  unsigned int npts = at.GetNumberOfValues() / 3;
->>>>>>> Stashed changes
-
   assert(at.GetNumberOfValues() == static_cast<unsigned int>(mNbOfPoints)*3);
 
   // Organize values