From e45a45ee23c57b4875d349f7210fbcdb24e375e1 Mon Sep 17 00:00:00 2001
From: dbcache <dbcache@clavaire.champignons>
Date: Thu, 27 Sep 2012 14:43:42 +0200
Subject: [PATCH] GDCM 1.x compatibility

---
 tools/clitkWriteDicomSeriesGenericFilter.txx | 5 +++++
 1 file changed, 5 insertions(+)

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
   }
 
-- 
2.45.1