From ddff05acd011f074f68057e89e29476e5c9992ea Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Sat, 5 Mar 2011 23:08:10 -0800
Subject: [PATCH] COMP: remove switch case
---
Code/MultiScale/otbWaveletHighPassOperator.h | 17 +++++++----------
Code/MultiScale/otbWaveletLowPassOperator.h | 11 ++++-------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/Code/MultiScale/otbWaveletHighPassOperator.h b/Code/MultiScale/otbWaveletHighPassOperator.h
index e285479dad..36f7130110 100644
--- a/Code/MultiScale/otbWaveletHighPassOperator.h
+++ b/Code/MultiScale/otbWaveletHighPassOperator.h
@@ -76,17 +76,14 @@ protected:
CoefficientVector GenerateCoefficients()
{
CoefficientVector coeff;
- switch (DirectionOfTransformation)
+ if (DirectionOfTransformation == Wavelet::FORWARD)
{
- case Wavelet::FORWARD:
- this->m_WaveletGenerator->GetHighPassCoefficientVector(coeff);
- break;
- case Wavelet::INVERSE:
- this->m_WaveletGenerator->GetLowPassCoefficientVector(coeff);
- Superclass::GenerateInverseHighPassFilterFromLowPassFilter(coeff);
- break;
- default: // Here to prevent from compilation warnings
- break;
+ this->m_WaveletGenerator->GetHighPassCoefficientVector(coeff);
+ }
+ if (DirectionOfTransformation == Wavelet::INVERSE)
+ {
+ this->m_WaveletGenerator->GetLowPassCoefficientVector(coeff);
+ Superclass::GenerateInverseHighPassFilterFromLowPassFilter(coeff);
}
Superclass::UpSamplingCoefficients(coeff);
diff --git a/Code/MultiScale/otbWaveletLowPassOperator.h b/Code/MultiScale/otbWaveletLowPassOperator.h
index 2b72ee68ec..b000583fd3 100644
--- a/Code/MultiScale/otbWaveletLowPassOperator.h
+++ b/Code/MultiScale/otbWaveletLowPassOperator.h
@@ -75,17 +75,14 @@ protected:
CoefficientVector GenerateCoefficients()
{
CoefficientVector coeff;
- switch (DirectionOfTransformation)
+ if (DirectionOfTransformation == Wavelet::FORWARD)
{
- case Wavelet::FORWARD:
this->m_WaveletGenerator->GetLowPassCoefficientVector(coeff);
- break;
- case Wavelet::INVERSE:
+ }
+ if (DirectionOfTransformation == Wavelet::INVERSE)
+ {
this->m_WaveletGenerator->GetHighPassCoefficientVector(coeff);
Superclass::GenerateInverseLowPassFilterFromHighPassFilter(coeff);
- break;
- default: // Here to prevent from compilation warnings
- break;
}
Superclass::UpSamplingCoefficients(coeff);
--
GitLab