Merge branch 'release-5.8' of https://git.orfeo-toolbox.org/git/otb into release-5.8

Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx

@@ -253,8 +253,15 @@ private:
         m_CalculatorList->SetNbOfSamplesAllClasses(countList, partitionMode);
         }
       break;
-      // percent 
+      // smallest class
       case 2:
+        {
+        otbAppLogINFO("Sampling strategy : fit the number of samples based on the smallest class");
+        m_CalculatorList->SetMinimumNbOfSamplesByClass(partitionMode);
+        }
+      break;
+      // percent
+      case 3:
         {
         std::vector<itksys::String> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.percent.p"),' ');
         std::vector<double> percentList;
@@ -283,7 +290,7 @@ private:
       break;
 
       // total
-      case 3:
+      case 4:
         {
         std::vector<itksys::String> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.total.v"),' ');
         std::vector<unsigned long> totalList;
@@ -305,14 +312,6 @@ private:
         m_CalculatorList->SetTotalNumberOfSamples(totalList, partitionMode);
         }
       break;
-
-      // smallest class
-      case 4:
-        {
-        otbAppLogINFO("Sampling strategy : fit the number of samples based on the smallest class");
-        m_CalculatorList->SetMinimumNbOfSamplesByClass(partitionMode);
-        }
-      break;
       // all samples
       case 5:
         {