Merge branch 'master' of /home/romulo/creatis/clitk3-git-shared/clitk3

[clitk.git] / common / clitkIO.cxx

diff --git a/common/clitkIO.cxx b/common/clitkIO.cxx
index 2c8b9b5cd1094dd3a3cf1a669ae6dbbed4227ece..d2f775853a9433c7cd77663822ace3915e68aa79 100755 (executable)
--- 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,28 +14,19 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
-/**
-   -------------------------------------------------
-   * @file   clitkHisImageIO.cxx
-   * @author Simon Rit <simon.rit@gmail.com>
-   * @date   16 Feb 2010
-   *
-   * @brief
-   *
-   *
-   -------------------------------------------------*/
+===========================================================================**/
 
 // 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"
@@ -46,7 +37,10 @@
 // Register factories
 void clitk::RegisterClitkFactories()
 {
+  clitk::DicomRTDoseIOFactory::RegisterOneFactory();
+#if ITK_VERSION_MAJOR <= 3
   itk::ImageIOFactory::RegisterBuiltInFactories();
+#endif
   clitk::VoxImageIOFactory::RegisterOneFactory();
   clitk::VfImageIOFactory::RegisterOneFactory();
   clitk::HisImageIOFactory::RegisterOneFactory();