X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkIO.cxx;h=46e0580df572f7ac8cfabe4e809f921b85760d50;hb=99edafc56db3383493d259ed5bc5dad0f9623422;hp=ded85e7a1f4f595eee6dd3a81068f8d6732cdd7a;hpb=93b239ec8224f526d22b2bc31328da163e82500f;p=clitk.git

diff --git a/common/clitkIO.cxx b/common/clitkIO.cxx
old mode 100755
new mode 100644
index ded85e7..46e0580
--- a/common/clitkIO.cxx
+++ b/common/clitkIO.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,35 +14,50 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 // std include
 #include <iostream>
 #include <fstream>
 
 // itk include
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
 
 // clitk include
 #include "clitkIO.h"
 #include "clitkImageCommon.h"
 #include "clitkDicomRTDoseIOFactory.h"
 #include "clitkVoxImageIOFactory.h"
-#include "clitkHisImageIOFactory.h"
 #include "clitkVfImageIOFactory.h"
 #include "clitkXdrImageIOFactory.h"
-#include "clitkHndImageIOFactory.h"
+#include "rtkHisImageIOFactory.h"
+#include "rtkHndImageIOFactory.h"
+#include "clitkGateAsciiImageIOFactory.h"
+#include "clitkConfiguration.h"
+#if CLITK_PRIVATE_FEATURES
+  #include "clitkUsfImageIOFactory.h"
+  #include "clitkUSVoxImageIOFactory.h"
+  #include "clitkSvlImageIOFactory.h"
+#endif
 
 //--------------------------------------------------------------------
 // Register factories
 void clitk::RegisterClitkFactories()
 {
+#if CLITK_PRIVATE_FEATURES
+  clitk::UsfImageIOFactory::RegisterOneFactory();
+  clitk::USVoxImageIOFactory::RegisterOneFactory();
+  clitk::SvlImageIOFactory::RegisterOneFactory();
+#endif
+  clitk::GateAsciiImageIOFactory::RegisterOneFactory();
   clitk::DicomRTDoseIOFactory::RegisterOneFactory();
+#if ITK_VERSION_MAJOR <= 3
   itk::ImageIOFactory::RegisterBuiltInFactories();
+#endif
   clitk::VoxImageIOFactory::RegisterOneFactory();
   clitk::VfImageIOFactory::RegisterOneFactory();
-  clitk::HisImageIOFactory::RegisterOneFactory();
   clitk::XdrImageIOFactory::RegisterOneFactory();
-  clitk::HndImageIOFactory::RegisterOneFactory();
+  rtk::HisImageIOFactory::RegisterOneFactory();
+  rtk::HndImageIOFactory::RegisterOneFactory();
 } ////