Allow compilation with ITK4.13.0

[clitk.git] / common / clitkImageToImageGenericFilterBase.h

diff --git a/common/clitkImageToImageGenericFilterBase.h b/common/clitkImageToImageGenericFilterBase.h
index 280dd6569a4ce25c622339c25a3a5f85fcff1b08..3a568c6d03924b3e3e2c90aaea7bea4af9bb06a2 100644 (file)
--- a/common/clitkImageToImageGenericFilterBase.h
+++ b/common/clitkImageToImageGenericFilterBase.h
@@ -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,7 +14,7 @@
 
   - 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
@@ -52,11 +52,6 @@ namespace clitk {
     const std::string & GetFilterName();
     void SetFilterName(std::string & n);
     
-    // Error management
-    // itkSetMacro(LastError, std::string);
-    // itkGetConstMacro(LastError, std::string);
-    // bool HasError() { return (GetLastError() != ""); }
-
     // Generic IO
     /// Returns the dimension and pixel type of the *first* input
     void GetInputImageDimensionAndPixelType(unsigned int& dim, std::string& pixeltype,
@@ -66,8 +61,10 @@ namespace clitk {
     void AddInputFilename(const std::string & filename);
     void SetInputFilenames(const std::vector<std::string> & filenames);
     void EnableReadOnDisk(bool b);
+    void EnableWriteOnDisk(bool b);
+    void EnableWriteCompression(bool b);
     void SetOutputFilename(const std::string & filename);
-    void AddOutputFilename(const std::string & filename);
+    void AddOutputFilename(const std::string filename);
     void SetOutputFilenames(const std::vector<std::string> & filenames);
     std::string GetOutputFilename();
     void SetIOVerbose(bool b);
@@ -93,14 +90,13 @@ namespace clitk {
     FilterBase * GetFilterBase() { return m_FilterBase; }
     
     // Indicate that the filter must stop as soon as possible (if threaded)
-    // void MustStop();
     void DeleteLastOutputImage();
-    // itkSetMacro(StopOnError, bool);
-    // itkGetConstMacro(StopOnError, bool);
-    // itkBooleanMacro(StopOnError);    
 
   protected:  
     bool m_ReadOnDisk;
+    bool m_WriteOnDisk;
+    bool m_WriteCompression;
+
     /// Call this function to dispatch an output towards the correct sink
     template<class ImageType> 
     void SetNextOutput(typename ImageType::Pointer output);
@@ -111,7 +107,7 @@ namespace clitk {
 
     std::vector<std::string> m_InputFilenames;
     std::list<std::string> m_OutputFilenames;
-
+    
     bool m_IOVerbose;
     unsigned int m_Dim;
     std::string m_PixelTypeName;
@@ -141,6 +137,9 @@ namespace clitk {
                                      ADD_IMAGE_TYPE(DIM, int);    \
                                      ADD_IMAGE_TYPE(DIM, float);  \
                                      ADD_IMAGE_TYPE(DIM, double);
+#define ADD_DEFAULT_VEC_IMAGE_TYPES ADD_VEC_IMAGE_TYPE(2,2,float); \
+                                    ADD_VEC_IMAGE_TYPE(2,3,float); \
+                                    ADD_VEC_IMAGE_TYPE(3,3,float);
 
   //#include "clitkImageToImageGenericFilterBase.txx"