X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkWriteDicomSeriesGenericFilter.txx;fp=tools%2FclitkWriteDicomSeriesGenericFilter.txx;h=9d1b427738ff6040bf03576bf489b663843bfa23;hb=e45a45ee23c57b4875d349f7210fbcdb24e375e1;hp=a1cdd2613fd828dfb3ab8ce02587f679f0d95e53;hpb=8c3e438fb5b04fc64c3fcbcf9a94a52bff59ec1f;p=clitk.git

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
   }