From 5cea77ea455bed6b5703716b07277eccc37852d2 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Wed, 30 Apr 2014 14:10:03 +0200
Subject: [PATCH] ENH: avoid using template method GetParameterImage when not
necessary
---
Applications/Classification/otbComputeConfusionMatrix.cxx | 4 ++--
Applications/Classification/otbSOMClassification.cxx | 2 +-
Applications/DisparityMap/otbGeneratePlyFile.cxx | 4 ++--
Applications/FeatureExtraction/otbDimensionalityReduction.cxx | 4 ++--
Applications/Hyperspectral/otbHyperspectralUnmixing.cxx | 4 ++--
Applications/Hyperspectral/otbVertexComponentAnalysis.cxx | 2 +-
Applications/Utils/otbExtractROI.cxx | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Applications/Classification/otbComputeConfusionMatrix.cxx b/Applications/Classification/otbComputeConfusionMatrix.cxx
index 3968684a82..1912f50acf 100644
--- a/Applications/Classification/otbComputeConfusionMatrix.cxx
+++ b/Applications/Classification/otbComputeConfusionMatrix.cxx
@@ -216,7 +216,7 @@ private:
void DoExecute()
{
- Int32ImageType* input = this->GetParameterImage<Int32ImageType> ("in");
+ Int32ImageType* input = this->GetParameterInt32Image("in");
std::string field;
int nodata = this->GetParameterInt("nodatalabel");
@@ -228,7 +228,7 @@ private:
if (GetParameterString("ref") == "raster")
{
- reference = this->GetParameterImage<Int32ImageType> ("ref.raster.in");
+ reference = this->GetParameterInt32Image("ref.raster.in");
}
else
{
diff --git a/Applications/Classification/otbSOMClassification.cxx b/Applications/Classification/otbSOMClassification.cxx
index 6260b48340..5f4bebfa4f 100644
--- a/Applications/Classification/otbSOMClassification.cxx
+++ b/Applications/Classification/otbSOMClassification.cxx
@@ -188,7 +188,7 @@ private:
m_UseMask = false;
if (HasValue("vm"))
{
- mask = GetParameterImage<LabeledImageType>("vm");
+ mask = GetParameterUInt16Image("vm");
if (input->GetLargestPossibleRegion()
!= mask->GetLargestPossibleRegion())
{
diff --git a/Applications/DisparityMap/otbGeneratePlyFile.cxx b/Applications/DisparityMap/otbGeneratePlyFile.cxx
index e1a64b8111..0e3f7c339e 100644
--- a/Applications/DisparityMap/otbGeneratePlyFile.cxx
+++ b/Applications/DisparityMap/otbGeneratePlyFile.cxx
@@ -98,10 +98,10 @@ private:
{
std::string outfname = GetParameterString("out");
- FloatVectorImageType::Pointer demPtr = this->GetParameterImage<FloatVectorImageType>("indem");
+ FloatVectorImageType::Pointer demPtr = this->GetParameterImage("indem");
demPtr->Update();
- FloatVectorImageType::Pointer colorPtr = this->GetParameterImage<FloatVectorImageType>("incolor");
+ FloatVectorImageType::Pointer colorPtr = this->GetParameterImage("incolor");
// First, find the footprint in the color image
diff --git a/Applications/FeatureExtraction/otbDimensionalityReduction.cxx b/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
index 87dd730c51..26a0c27215 100644
--- a/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
+++ b/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
@@ -182,7 +182,7 @@ private:
{
if (HasValue("in"))
{
- FloatVectorImageType::Pointer inImage = this->GetParameterImage<FloatVectorImageType> ("in");
+ FloatVectorImageType::Pointer inImage = this->GetParameterImage("in");
inImage->UpdateOutputInformation();
// Update the values of the channels to be selected
@@ -211,7 +211,7 @@ private:
}
this->DisableParameter("outmatrix");
- FloatVectorImageType::Pointer inImage = this->GetParameterImage<FloatVectorImageType> ("in");
+ FloatVectorImageType::Pointer inImage = this->GetParameterImage("in");
inImage->UpdateOutputInformation();
// Update the values of the channels to be selected
diff --git a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
index 4dd933bdb2..d419b7e841 100644
--- a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
+++ b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
@@ -150,8 +150,8 @@ private:
{
m_ProcessObjects.clear();
- DoubleVectorImageType::Pointer inputImage = GetParameterImage<DoubleVectorImageType>("in");
- DoubleVectorImageType::Pointer endmembersImage = GetParameterImage<DoubleVectorImageType>("ie");
+ DoubleVectorImageType::Pointer inputImage = GetParameterDoubleVectorImage("in");
+ DoubleVectorImageType::Pointer endmembersImage = GetParameterDoubleVectorImage("ie");
/*
* Transform Endmembers image to matrix representation
diff --git a/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx b/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
index ef22ca2368..5cf08ee534 100644
--- a/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
+++ b/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
@@ -88,7 +88,7 @@ private:
void DoExecute()
{
- DoubleVectorImageType::Pointer inputImage = GetParameterImage<DoubleVectorImageType>("in");
+ DoubleVectorImageType::Pointer inputImage = GetParameterDoubleVectorImage("in");
DoubleVectorImageType::Pointer endmembersImage;
const unsigned int nbEndmembers = GetParameterInt("ne");
diff --git a/Applications/Utils/otbExtractROI.cxx b/Applications/Utils/otbExtractROI.cxx
index ad4c319cdf..827e723251 100644
--- a/Applications/Utils/otbExtractROI.cxx
+++ b/Applications/Utils/otbExtractROI.cxx
@@ -224,7 +224,7 @@ private:
// Setup the DEM Handler
otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"mode.fit.elev");
- FloatVectorImageType::Pointer referencePtr = this->GetParameterImage<FloatVectorImageType>("mode.fit.ref");
+ FloatVectorImageType::Pointer referencePtr = this->GetParameterImage("mode.fit.ref");
referencePtr->UpdateOutputInformation();
RSTransformType::Pointer rsTransform = RSTransformType::New();
--
GitLab