preliminary fixes for multi-component images

[clitk.git] / common / clitkImageToImageGenericFilter.h

diff --git a/common/clitkImageToImageGenericFilter.h b/common/clitkImageToImageGenericFilter.h
index 645fe9b550817305506013b3efa2af582be81ee9..64ac2396869e1ed462b1bbe5c63fe2d9651ddafa 100644 (file)
--- a/common/clitkImageToImageGenericFilter.h
+++ b/common/clitkImageToImageGenericFilter.h
@@ -3,8 +3,8 @@
   Program:   clitk
   Module:    $RCSfile: clitkImageToImageGenericFilter.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:53:15 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2010/02/08 15:45:17 $
+  Version:   $Revision: 1.5 $
   Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
              David Sarrut <david.sarrut@creatis.insa-lyon.fr>
 
@@ -40,6 +40,7 @@
 #include <vvFromITK.h>
 #include <vvToITK.h>
 #include <list>
+#include <set>
 
 namespace clitk {
   
@@ -115,8 +116,8 @@ namespace clitk {
     std::vector<vvImage::Pointer> mInputVVImages;
     std::vector<vvImage::Pointer> mOutputVVImages;
 
-    std::vector<std::string> mListOfAllowedPixelType;
-    std::vector<unsigned int> mListOfAllowedDimension;    
+    std::set<std::string> mListOfAllowedPixelTypes;
+    std::set<unsigned int> mListOfAllowedDimensions;
     bool CheckImageType();
     bool CheckDimension();
     bool CheckPixelType();
@@ -151,6 +152,7 @@ namespace clitk {
 
   // #define ADD_IMAGE_DIMENSION(DIM) Initialize<DIM>();
 
+#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>();