From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 25 Feb 2013 16:34:46 +0000 (+0100)
Subject: Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~236^2~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cb4bdfed13b79735336f2e087a0b9372610aac06;hp=d5b914b5db163964744fe83b7e3556e834f50ada;p=clitk.git

Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk
---

diff --git a/common/clitkIO.cxx b/common/clitkIO.cxx
index 8b159e7..07af298 100644
--- a/common/clitkIO.cxx
+++ b/common/clitkIO.cxx
@@ -42,11 +42,23 @@
   #include "clitkUSVoxImageIOFactory.h"
   #include "clitkSvlImageIOFactory.h"
 #endif
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkGDCMImageIOFactory.h"
+#endif
 
 //--------------------------------------------------------------------
 // Register factories
 void clitk::RegisterClitkFactories()
 {
+#if ITK_VERSION_MAJOR >= 4
+  std::list< itk::ObjectFactoryBase * > fl = itk::GDCMImageIOFactory::GetRegisteredFactories();
+  for (std::list< itk::ObjectFactoryBase * >::iterator it = fl.begin(); it != fl.end(); ++it)
+    if (dynamic_cast<itk::GDCMImageIOFactory *>(*it))
+    {
+      itk::GDCMImageIOFactory::UnRegisterFactory(*it);
+      break;
+    }
+#endif
 #if CLITK_PRIVATE_FEATURES
   clitk::UsfImageIOFactory::RegisterOneFactory();
   clitk::USVoxImageIOFactory::RegisterOneFactory();
@@ -65,5 +77,8 @@ void clitk::RegisterClitkFactories()
   rtk::EdfImageIOFactory::RegisterOneFactory();
   rtk::ImagXImageIOFactory::RegisterOneFactory();
   clitk::EsrfHstImageIOFactory::RegisterOneFactory();
+#if ITK_VERSION_MAJOR >= 4
+  itk::GDCMImageIOFactory::RegisterOneFactory();
+#endif
 } ////