Added macro ADD_DEFAULT_IMAGE_TYPES to ensure that the same types are compiled for...

diff --git a/common/clitkImageToImageGenericFilterBase.h b/common/clitkImageToImageGenericFilterBase.h
index 26c75685eeeff380093c3f81ce813a0616b437b6..601a752fc55f56021e2803e6dfcf8987a727ba4a 100644 (file)
--- a/common/clitkImageToImageGenericFilterBase.h
+++ b/common/clitkImageToImageGenericFilterBase.h
@@ -112,6 +112,13 @@ 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>();
+#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"
 

diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx
index fb474906162521437fc73fb188aac1278190ea31..a35a7304c802c4e5e63b2e6418af4a74afdbcf5f 100644 (file)
--- a/filters/clitkBinarizeImageGenericFilter.txx
+++ b/filters/clitkBinarizeImageGenericFilter.txx
@@ -44,14 +44,7 @@ namespace clitk
   template<class args_info_type>
   template<unsigned int Dim>
   void BinarizeImageGenericFilter<args_info_type>::InitializeImageType() {      
-    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, uint16);
-    ADD_IMAGE_TYPE(Dim, float);
-    ADD_IMAGE_TYPE(Dim, double);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
   }
   //--------------------------------------------------------------------
   

diff --git a/filters/clitkFooImageGenericFilter.txx b/filters/clitkFooImageGenericFilter.txx
index e8a47970a00e25a1bb3ff9a361130694617d0430..d0967afd0493fabd8e4f86d41d2e668ef68a3ab6 100644 (file)
--- a/filters/clitkFooImageGenericFilter.txx
+++ b/filters/clitkFooImageGenericFilter.txx
@@ -51,13 +51,7 @@ FooImageGenericFilter<args_info_type>::FooImageGenericFilter():
 template<class args_info_type>
 template<unsigned int Dim>
 void FooImageGenericFilter<args_info_type>::InitializeImageType() {
-    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);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
 }
 //--------------------------------------------------------------------
 

diff --git a/filters/clitkImageArithmGenericFilter.txx b/filters/clitkImageArithmGenericFilter.txx
index 336f0d074d77b46616ab2a3664830a98b103a058..9679d028e4ffa1cd5dd4f846954b79a2c999371d 100644 (file)
--- a/filters/clitkImageArithmGenericFilter.txx
+++ b/filters/clitkImageArithmGenericFilter.txx
@@ -37,13 +37,7 @@ namespace clitk
   template<class args_info_type>
   template<unsigned int Dim>
   void ImageArithmGenericFilter<args_info_type>::InitializeImageType() {      
-    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);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
   }
   //--------------------------------------------------------------------
 

diff --git a/filters/clitkImageConvertGenericFilter.cxx b/filters/clitkImageConvertGenericFilter.cxx
index 9f35379c0e1a59d71d8354e31ada484370e9aae9..c6afba85cb7cb0c6b97129f4baade53a17b7e431 100644 (file)
--- a/filters/clitkImageConvertGenericFilter.cxx
+++ b/filters/clitkImageConvertGenericFilter.cxx
@@ -37,13 +37,7 @@ clitk::ImageConvertGenericFilter::ImageConvertGenericFilter():
 //--------------------------------------------------------------------
 template<unsigned int Dim>
 void clitk::ImageConvertGenericFilter::InitializeImageType() {      
-  ADD_IMAGE_TYPE(Dim, char);
-  ADD_IMAGE_TYPE(Dim, unsigned char);
-  ADD_IMAGE_TYPE(Dim, short);
-  ADD_IMAGE_TYPE(Dim, unsigned short);
-  ADD_IMAGE_TYPE(Dim, int);
-  ADD_IMAGE_TYPE(Dim, float);
-  ADD_IMAGE_TYPE(Dim, double);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
 }
 //--------------------------------------------------------------------
 

diff --git a/filters/clitkImageResampleGenericFilter.cxx b/filters/clitkImageResampleGenericFilter.cxx
index 12670f5484a3db3dac853e45bbb74d28f69897fa..3e4e28e19f92c9e9eabff1cb77134b321a25370e 100644 (file)
--- a/filters/clitkImageResampleGenericFilter.cxx
+++ b/filters/clitkImageResampleGenericFilter.cxx
@@ -60,13 +60,7 @@ clitk::ImageResampleGenericFilter::ImageResampleGenericFilter():
 //--------------------------------------------------------------------
 template<unsigned int Dim>
 void clitk::ImageResampleGenericFilter::InitializeImageTypeWithDim() {      
-    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);
+  ADD_DEFAULT_IMAGE_TYPES(Dim);
 }
 //--------------------------------------------------------------------
 

diff --git a/filters/clitkMedianImageGenericFilter.txx b/filters/clitkMedianImageGenericFilter.txx
index 696124c95749dfb5c97197718909a566524eacaa..807c86706cdbaa0213fc32abee551d08e9ddfd31 100644 (file)
--- a/filters/clitkMedianImageGenericFilter.txx
+++ b/filters/clitkMedianImageGenericFilter.txx
@@ -32,13 +32,7 @@ namespace clitk
   template<class args_info_type>
   template<unsigned int Dim>
   void MedianImageGenericFilter<args_info_type>::InitializeImageType() {      
-    ADD_IMAGE_TYPE(Dim, char);
-    ADD_IMAGE_TYPE(Dim, uchar);
-    ADD_IMAGE_TYPE(Dim, short);
-    ADD_IMAGE_TYPE(Dim, int);
-    ADD_IMAGE_TYPE(Dim, float);
-    ADD_IMAGE_TYPE(Dim, double);
-    ADD_IMAGE_TYPE(Dim, unsigned short); 
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
   }
   //--------------------------------------------------------------------
   

diff --git a/filters/clitkSplitImageGenericFilter.cxx b/filters/clitkSplitImageGenericFilter.cxx
index d8f8a6e110d49415485346834afcf57346791833..e887b04e566da052bbfc4f705712b13d6821c4e8 100644 (file)
--- a/filters/clitkSplitImageGenericFilter.cxx
+++ b/filters/clitkSplitImageGenericFilter.cxx
@@ -40,11 +40,7 @@ clitk::SplitImageGenericFilter::SplitImageGenericFilter():
 //--------------------------------------------------------------------
 template<unsigned int Dim>
 void clitk::SplitImageGenericFilter::InitializeImageType() {      
-  ADD_IMAGE_TYPE(Dim, char);
-  ADD_IMAGE_TYPE(Dim, unsigned char);
-  ADD_IMAGE_TYPE(Dim, short);
-  ADD_IMAGE_TYPE(Dim, int);
-  ADD_IMAGE_TYPE(Dim, float);
+  ADD_DEFAULT_IMAGE_TYPES(Dim);
   ADD_VEC_IMAGE_TYPE(Dim, 3,float);
 }
 //--------------------------------------------------------------------

diff --git a/filters/clitkUnsharpMaskGenericFilter.txx b/filters/clitkUnsharpMaskGenericFilter.txx
index 92aab25b2efd6d1966e81b2fcdc60c88087f61a6..ce7c181178fa30570b1997848a1cc0bc72d6611d 100644 (file)
--- a/filters/clitkUnsharpMaskGenericFilter.txx
+++ b/filters/clitkUnsharpMaskGenericFilter.txx
@@ -50,13 +50,7 @@ UnsharpMaskGenericFilter<args_info_type>::UnsharpMaskGenericFilter():
 template<class args_info_type>
 template<unsigned int Dim>
 void UnsharpMaskGenericFilter<args_info_type>::InitializeImageType() {
-    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);
+    ADD_DEFAULT_IMAGE_TYPES(Dim);
 }
 //--------------------------------------------------------------------