Provide ADD_DEFAULT_VEC_IMAGE_TYPES for generic VF filters

diff --git a/common/clitkImageToImageGenericFilterBase.h b/common/clitkImageToImageGenericFilterBase.h
index 03b4f4acfa030d91b52e0804b521e06e6f30ed25..3a568c6d03924b3e3e2c90aaea7bea4af9bb06a2 100644 (file)
--- a/common/clitkImageToImageGenericFilterBase.h
+++ b/common/clitkImageToImageGenericFilterBase.h
@@ -137,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"
 

diff --git a/tools/clitkCatImageGenericFilter.txx b/tools/clitkCatImageGenericFilter.txx
index 0355bffe5a4f3628f5f76b038e1843899a18ac8b..f8f81f9aefe1c8e06f4860e288e1b6a2ca14332d 100644 (file)
--- a/tools/clitkCatImageGenericFilter.txx
+++ b/tools/clitkCatImageGenericFilter.txx
@@ -43,9 +43,7 @@ template<unsigned int Dim>
 void CatImageGenericFilter<args_info_type>::InitializeImageType()
 {
   ADD_DEFAULT_IMAGE_TYPES(Dim);
-  ADD_VEC_IMAGE_TYPE(2,2,float);
-  ADD_VEC_IMAGE_TYPE(2,3,float);
-  ADD_VEC_IMAGE_TYPE(3,3,float);
+  ADD_DEFAULT_VEC_IMAGE_TYPES;
 }
 //--------------------------------------------------------------------
 

diff --git a/tools/clitkVFResampleGenericFilter.cxx b/tools/clitkVFResampleGenericFilter.cxx
index 1339c89073c34df0cc2646129d43de0a85220c31..4175215526c030e19e5ba3c32d7bccd25ee79ce2 100644 (file)
--- a/tools/clitkVFResampleGenericFilter.cxx
+++ b/tools/clitkVFResampleGenericFilter.cxx
@@ -41,7 +41,7 @@ void clitk::VFResampleGenericFilter::InitializeImageType()
 {
   //typedef itk::Vector<float,Dim> v3f;
   //ADD_IMAGE_TYPE(Dim, v3f);
-  ADD_VEC_IMAGE_TYPE(Dim, Dim, float)
+  ADD_DEFAULT_VEC_IMAGE_TYPES
 }
 //--------------------------------------------------------------------