no more useful

[clitk.git] / common / clitkImageToImageGenericFilter.txx

diff --git a/common/clitkImageToImageGenericFilter.txx b/common/clitkImageToImageGenericFilter.txx
index 9029197db416f290ffc025b083a39f5b6894c80b..7959ba36eaa6e157a2fc623763860b32df5171dc 100644 (file)
--- a/common/clitkImageToImageGenericFilter.txx
+++ b/common/clitkImageToImageGenericFilter.txx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: clitkImageToImageGenericFilter.txx,v $
   Language:  C++
-  Date:      $Date: 2010/02/10 14:59:49 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2010/02/18 14:47:20 $
+  Version:   $Revision: 1.6 $
   Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
              David Sarrut <david.sarrut@creatis.insa-lyon.fr>
 
@@ -41,9 +41,6 @@ void clitk::ImageToImageGenericFilterBase::SetNextOutput(typename ImageType::Poi
 
 
 //--------------------------------------------------------------------
-#ifdef _MSC_VER\r
-#  pragma warning(disable: 4715) //Disable "The specified function can potentially not return a value"
-#endif
 template<class ImageType> 
 typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsigned int n) {
   if (mInputFilenames.size() > n) {
@@ -52,7 +49,10 @@ typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsig
   else if (mInputVVImages.size() > n)
     return typename ImageType::Pointer(const_cast<ImageType*>(vvImageToITK<ImageType>(mInputVVImages[n]).GetPointer()));
   else
+  {
     assert(false); //No input, this shouldn't happen
+    return typename ImageType::Pointer(NULL);
+  }
 }
 //--------------------------------------------------------------------