From 6de9c5fee8f1873fdfc2a77c325afed1a6d0f0c5 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Wed, 10 Sep 2008 13:04:09 +0000
Subject: [PATCH] ENH: Correcting Vegetation Index tests.
---
...annelRAndNIRVegetationIndexImageFilter.cxx | 12 ++++-----
...ASetBRAndNIRVegetationIndexImageFilter.cxx | 27 ++++++++-----------
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index b0961a8994..c0d43f11f0 100644
--- a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/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;
}
diff --git a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
index b31027367a..cf8ed1236a 100644
--- a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
+++ b/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;
}
--
GitLab