X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkIO.cxx;h=07af298b5563c35cbe99d62c1f30edf7fd4bf81f;hb=a38cbef785cec049a583cdfe98dacf4eed8bac0f;hp=8b159e7828bb13cbca487c20f517c7586ce47c1a;hpb=4c1f33fa1ab2a114f4dc94b24b0f2ef936ffafb8;p=clitk.git 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(*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 } ////