diff --git a/Code/MultiScale/otbWaveletHighPassOperator.h b/Code/MultiScale/otbWaveletHighPassOperator.h
index e285479dad82b6881ea15bd83afc7ca4ad28ca7c..36f71301103c394ac2376155f68ea2a04a6ff05a 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 2b72ee68ec03ff338171f25d84cbbc381aefa55a..b000583fd3d1af607f4749b435f587a49045b950 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);