From: dbcache <dbcache@clavaire.champignons>
Date: Thu, 27 Sep 2012 12:43:42 +0000 (+0200)
Subject: GDCM 1.x compatibility
X-Git-Tag: v1.3.0~4^2~6
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e45a45ee23c57b4875d349f7210fbcdb24e375e1;p=clitk.git

GDCM 1.x compatibility
---

diff --git a/tools/clitkWriteDicomSeriesGenericFilter.txx b/tools/clitkWriteDicomSeriesGenericFilter.txx
index a1cdd26..9d1b427 100644
--- a/tools/clitkWriteDicomSeriesGenericFilter.txx
+++ b/tools/clitkWriteDicomSeriesGenericFilter.txx
@@ -294,8 +294,13 @@ WriteDicomSeriesGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
         DD(studyUID);
     }
 #if GDCM_MAJOR_VERSION < 2
+<<<<<<< Updated upstream
     else
       gdcmIO->KeepOriginalUID();
+=======
+  else
+    gdcmIO->SetKeepOriginalUID(true);
+>>>>>>> Stashed changes
 #endif
   }