ENH: Correcting Vegetation Index tests.

Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx

@@ -25,7 +25,7 @@
 #include "otbVegetationIndex.h"
 
 template<class TInputImage, class TOutputImage, class TFunction>
-int generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
+void generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
 {
   typedef otb::ImageFileReader<TInputImage> ReaderType;
   typedef otb::ImageFileWriter<TOutputImage> WriterType;
@@ -65,17 +65,15 @@ int otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter(int argc, char * ar
   std::string strArgv(argv[1]);
   argc--;
   argv++;
-  if ( strArgv == "PVI" ) return( generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter<InputImageType, OutputImageType,
+  if ( strArgv == "PVI" ) generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter<InputImageType, OutputImageType,
 				  otb::Functor::PVI<     InputImageType::InternalPixelType,
 				  InputImageType::InternalPixelType,
 				  OutputImageType::PixelType> >
-				  (argc,argv) );
-  else if ( strArgv == "TSAVI" ) return( generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter<InputImageType, OutputImageType,
+				  (argc,argv);
+  else if ( strArgv == "TSAVI" ) generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter<InputImageType, OutputImageType,
 					 otb::Functor::TSAVI<     InputImageType::InternalPixelType,
 					 InputImageType::InternalPixelType,
 					 OutputImageType::PixelType> >
-					 (argc,argv) );
-  else
-    return EXIT_FAILURE;
+					 (argc,argv);
   return EXIT_SUCCESS;
 }

Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx

@@ -24,7 +24,7 @@
 #include "otbVegetationIndex.h"
 
 template<class TInputRImage, class TInputNIRImage, class TOutputImage, class TFunction>
-int generic_SetASetBRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
+void generic_SetASetBRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
 {
   typedef otb::ImageFileReader<TInputRImage> RReaderType;
   typedef otb::ImageFileReader<TInputNIRImage> NIRReaderType;
@@ -53,9 +53,6 @@ int generic_SetASetBRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
   filter->GetFunctor().SetB(b);
   writer->SetInput( filter->GetOutput() );
   writer->Update();
-
- 
-  return EXIT_SUCCESS;
 }
 
 
@@ -71,17 +68,15 @@ int otbSetASetBRAndNIRVegetationIndexImageFilter(int argc, char * argv[])
   std::string strArgv(argv[1]);
   argc--;
   argv++;
-  if ( strArgv == "PVI" ) return( generic_SetASetBRAndNIRVegetationIndexImageFilter<InputRImageType, InputNIRImageType, OutputImageType,
-				  otb::Functor::PVI<     InputRImageType::PixelType,
-				  InputNIRImageType::PixelType,
-				  OutputImageType::PixelType> >
-				  (argc,argv) );
-  else if ( strArgv == "TSAVI" ) return( generic_SetASetBRAndNIRVegetationIndexImageFilter<InputRImageType, InputNIRImageType, OutputImageType,
-					 otb::Functor::TSAVI<     InputRImageType::PixelType,
-					 InputNIRImageType::PixelType,
-					 OutputImageType::PixelType> >
-					 (argc,argv) );
-  else
-    return EXIT_FAILURE;
+  if ( strArgv == "PVI" ) generic_SetASetBRAndNIRVegetationIndexImageFilter<InputRImageType, InputNIRImageType, OutputImageType,
+			    otb::Functor::PVI<     InputRImageType::PixelType,
+			    InputNIRImageType::PixelType,
+			    OutputImageType::PixelType> >
+			    (argc,argv);
+  else if ( strArgv == "TSAVI" ) generic_SetASetBRAndNIRVegetationIndexImageFilter<InputRImageType, InputNIRImageType, OutputImageType,
+				   otb::Functor::TSAVI<     InputRImageType::PixelType,
+				   InputNIRImageType::PixelType,
+				   OutputImageType::PixelType> >
+				   (argc,argv);
   return EXIT_SUCCESS;
 }