X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FclitkImageToImageGenericFilterBase.h;h=601a752fc55f56021e2803e6dfcf8987a727ba4a;hb=fac0ed982e49a7adde59d6e454b20bb846961bc7;hp=4933b10db4edc6c5f753e27092e42e6370d20021;hpb=9ae64f347a459fbb2abdd5408703aa121646c3de;p=clitk.git

diff --git a/common/clitkImageToImageGenericFilterBase.h b/common/clitkImageToImageGenericFilterBase.h
index 4933b10..601a752 100644
--- a/common/clitkImageToImageGenericFilterBase.h
+++ b/common/clitkImageToImageGenericFilterBase.h
@@ -1,35 +1,22 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   clitk
-  Module:    $RCSfile: clitkImageToImageGenericFilterBase.h,v $
-  Language:  C++
-  Date:      $Date: 2010/03/03 13:00:36 $
-  Version:   $Revision: 1.2 $
-  Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
-             David Sarrut <david.sarrut@creatis.insa-lyon.fr>
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-  Copyright (C) 2008
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #ifndef CLITKIMAGETOIMAGEGENERICFILTERBASE_H
 #define CLITKIMAGETOIMAGEGENERICFILTERBASE_H
-
-// clitk include
 #include "clitkCommon.h"
 #include "clitkImageCommon.h"
 #include "clitkCommonGenericFilter.h"
@@ -71,6 +58,7 @@ namespace clitk {
     void SetInputFilename(const std::string & filename);
     void AddInputFilename(const std::string & filename);
     void SetInputFilenames(const std::vector<std::string> & filenames);
+    void EnableReadOnDisk(bool b);
     void SetOutputFilename(const std::string & filename);
     void AddOutputFilename(const std::string & filename);
     void SetOutputFilenames(const std::vector<std::string> & filenames);
@@ -95,6 +83,7 @@ namespace clitk {
     virtual bool Update() = 0;
 
   protected:  
+    bool mReadOnDisk;
     /// Call this function to dispatch an output towards the correct sink
     template<class ImageType> 
     void SetNextOutput(typename ImageType::Pointer output);
@@ -123,8 +112,15 @@ namespace clitk {
 
 #define ADD_VEC_IMAGE_TYPE(DIM, COMP, PT) this->mImageTypesManager.template AddNewDimensionAndPixelType<DIM,COMP, PT>();
 #define ADD_IMAGE_TYPE(DIM, PT) this->mImageTypesManager.template AddNewDimensionAndPixelType<DIM, PT>();
-
-#include "clitkImageToImageGenericFilterBase.txx"
+#define ADD_DEFAULT_IMAGE_TYPES(DIM) ADD_IMAGE_TYPE(DIM, char);   \
+                                     ADD_IMAGE_TYPE(DIM, uchar);  \
+                                     ADD_IMAGE_TYPE(DIM, short);  \
+                                     ADD_IMAGE_TYPE(DIM, ushort); \
+                                     ADD_IMAGE_TYPE(DIM, int);    \
+                                     ADD_IMAGE_TYPE(DIM, float);  \
+                                     ADD_IMAGE_TYPE(DIM, double);
+
+  //#include "clitkImageToImageGenericFilterBase.txx"
 
 } // end namespace