X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FclitkImageToImageGenericFilterBase.cxx;h=c538ac0d196a3773508918f110b093785a8be7e8;hb=0adc791a05c6a4e5e4d68409cf2e9e3a762babce;hp=18d911826f747773a458c4a970a77aa2d4cf0311;hpb=0fe907bc305f611ba8bc2ab95e287658efaefede;p=clitk.git

diff --git a/common/clitkImageToImageGenericFilterBase.cxx b/common/clitkImageToImageGenericFilterBase.cxx
index 18d9118..c538ac0 100644
--- a/common/clitkImageToImageGenericFilterBase.cxx
+++ b/common/clitkImageToImageGenericFilterBase.cxx
@@ -306,6 +306,7 @@ DEF_SetNextOutput_And_GetInput(int, 3);
 DEF_SetNextOutput_And_GetInput(float, 3);
 DEF_SetNextOutput_And_GetInput(double, 3);
 
+/*
 DEF_SetNextOutput_And_GetInput_WithCompo(unsigned char, 2, 2);
 DEF_SetNextOutput_And_GetInput_WithCompo(unsigned char, 2, 3);
 DEF_SetNextOutput_And_GetInput_WithCompo(unsigned char, 2, 4);
@@ -355,6 +356,7 @@ DEF_SetNextOutput_And_GetInput_WithCompo(int, 3, 4);
 DEF_SetNextOutput_And_GetInput_WithCompo(int, 4, 2);
 DEF_SetNextOutput_And_GetInput_WithCompo(int, 4, 3);
 DEF_SetNextOutput_And_GetInput_WithCompo(int, 4, 4);
+*/
 
 DEF_SetNextOutput_And_GetInput_WithCompo(float, 2, 2);
 DEF_SetNextOutput_And_GetInput_WithCompo(float, 2, 3);
@@ -410,7 +412,7 @@ typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsig
       return typename ImageType::Pointer(const_cast<ImageType*>(vvImageToITK<ImageType>(m_InputVVImages[n]).GetPointer()));
     else {
       assert(false); //No input, this shouldn't happen
-      return typename ImageType::Pointer(NULL);
+      return typename ImageType::Pointer((ImageType*)ITK_NULLPTR);
     }
   }
 }