From ed0d3cf206bf0ade38a7e81e6961bc16f5eaafa9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 26 Jan 2012 10:44:45 +0100
Subject: [PATCH] TEST: fix access to local var
---
.../Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx | 4 ++--
.../Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx | 4 ++--
.../Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx | 4 ++--
Testing/Code/BasicFilters/otbMNFImageFilter.cxx | 4 ++--
Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx | 4 ++--
Testing/Code/BasicFilters/otbPCAImageFilter.cxx | 4 ++--
Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx | 4 ++--
.../Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx
index 7123f40423..58403838d6 100644
--- a/Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx
@@ -66,8 +66,8 @@ int otbHorizontalSobelVectorImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
// Main type definition
const unsigned int Dimension = 2;
diff --git a/Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx
index 73fc063362..876ee44e43 100644
--- a/Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx
@@ -66,8 +66,8 @@ int otbLocalActivityVectorImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
unsigned int radiusX = 1;
unsigned int radiusY = 1;
if ( parseResult->IsOptionPresent("--Radius") )
diff --git a/Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx
index 9a24a83d67..87e5ee8193 100644
--- a/Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx
@@ -66,8 +66,8 @@ int otbLocalGradientVectorImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
// Main type definition
const unsigned int Dimension = 2;
diff --git a/Testing/Code/BasicFilters/otbMNFImageFilter.cxx b/Testing/Code/BasicFilters/otbMNFImageFilter.cxx
index 67855bfb4c..5e80436409 100644
--- a/Testing/Code/BasicFilters/otbMNFImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMNFImageFilter.cxx
@@ -77,8 +77,8 @@ int otbMNFImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
const unsigned int nbComponents = parseResult->IsOptionPresent("--NumComponents") ?
parseResult->GetParameterUInt("--NumComponents") : 0;
unsigned int radiusX = 1;
diff --git a/Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx
index 521fe604ba..93e3ba62c8 100644
--- a/Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx
@@ -77,8 +77,8 @@ int otbNAPCAImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
const unsigned int nbComponents = parseResult->IsOptionPresent("--NumComponents") ?
parseResult->GetParameterUInt("--NumComponents") : 0;
unsigned int radiusX = 1;
diff --git a/Testing/Code/BasicFilters/otbPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbPCAImageFilter.cxx
index bf5ecc1422..4ce4b64590 100644
--- a/Testing/Code/BasicFilters/otbPCAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPCAImageFilter.cxx
@@ -70,8 +70,8 @@ int otbPCAImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
const unsigned int nbComponents = parseResult->IsOptionPresent("--NumComponents") ?
parseResult->GetParameterUInt("--NumComponents") : 0;
const bool normalization = parseResult->IsOptionPresent("--NormalizeVariance");
diff --git a/Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx
index 24f1cd4f03..14679e6357 100644
--- a/Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx
@@ -64,8 +64,8 @@ int otbSobelVectorImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
// Main type definition
const unsigned int Dimension = 2;
diff --git a/Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx
index 3cf2317a4c..102eeaa996 100644
--- a/Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx
@@ -65,8 +65,8 @@ int otbVerticalSobelVectorImageFilterTest ( int argc, char* argv[] )
return EXIT_FAILURE;
}
- const char * inputImageName = parseResult->GetInputImage().c_str();
- const char * outputImageName = parseResult->GetOutputImage().c_str();
+ std::string inputImageName = parseResult->GetInputImage();
+ std::string outputImageName = parseResult->GetOutputImage();
// Main type definition
const unsigned int Dimension = 2;
--
GitLab