]> Creatis software - clitk.git/commitdiff
GDCM 1.x compatibility
authordbcache <dbcache@clavaire.champignons>
Thu, 27 Sep 2012 12:43:42 +0000 (14:43 +0200)
committerdbcache <dbcache@clavaire.champignons>
Thu, 27 Sep 2012 12:43:42 +0000 (14:43 +0200)
tools/clitkWriteDicomSeriesGenericFilter.txx

index a1cdd2613fd828dfb3ab8ce02587f679f0d95e53..9d1b427738ff6040bf03576bf489b663843bfa23 100644 (file)
@@ -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
   }