X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkIO.cxx;h=aa42db89ea2998a3df138f18a8cc5e1de565d2d3;hb=b3721d3c1dbff583fbb05cc5b9f933955a399715;hp=07af298b5563c35cbe99d62c1f30edf7fd4bf81f;hpb=cb4bdfed13b79735336f2e087a0b9372610aac06;p=clitk.git diff --git a/common/clitkIO.cxx b/common/clitkIO.cxx index 07af298..aa42db8 100644 --- a/common/clitkIO.cxx +++ b/common/clitkIO.cxx @@ -34,6 +34,7 @@ #include "rtkHndImageIOFactory.h" #include "rtkEdfImageIOFactory.h" #include "rtkImagXImageIOFactory.h" +#include "rtkXRadImageIOFactory.h" #include "clitkEsrfHstImageIOFactory.h" #include "clitkGateAsciiImageIOFactory.h" #include "clitkConfiguration.h" @@ -44,6 +45,7 @@ #endif #if ITK_VERSION_MAJOR >= 4 #include "itkGDCMImageIOFactory.h" + #include "itkPNGImageIOFactory.h" #endif //-------------------------------------------------------------------- @@ -58,6 +60,14 @@ void clitk::RegisterClitkFactories() itk::GDCMImageIOFactory::UnRegisterFactory(*it); break; } + + std::list< itk::ObjectFactoryBase * > flpng = itk::PNGImageIOFactory::GetRegisteredFactories(); + for (std::list< itk::ObjectFactoryBase * >::iterator it = flpng.begin(); it != flpng.end(); ++it) + if (dynamic_cast(*it)) + { + itk::PNGImageIOFactory::UnRegisterFactory(*it); + break; + } #endif #if CLITK_PRIVATE_FEATURES clitk::UsfImageIOFactory::RegisterOneFactory(); @@ -76,9 +86,11 @@ void clitk::RegisterClitkFactories() rtk::HndImageIOFactory::RegisterOneFactory(); rtk::EdfImageIOFactory::RegisterOneFactory(); rtk::ImagXImageIOFactory::RegisterOneFactory(); + rtk::XRadImageIOFactory::RegisterOneFactory(); clitk::EsrfHstImageIOFactory::RegisterOneFactory(); #if ITK_VERSION_MAJOR >= 4 itk::GDCMImageIOFactory::RegisterOneFactory(); + itk::PNGImageIOFactory::RegisterOneFactory(); #endif } ////