From ea4a6656db5a19b5c1ec0a20c2c5cceacb26d8fd Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Wed, 26 Apr 2017 17:18:16 +0200
Subject: [PATCH] COMP: issue with enum SampleStrategy on gcc 4.1
---
.../AppClassification/app/otbTrainImagesClassifier.cxx | 4 ++--
.../AppClassification/include/otbTrainImagesBase.h | 4 ++--
.../AppClassification/include/otbTrainImagesBase.txx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
index 2a84ff53e7..c841489f79 100644
--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
@@ -146,7 +146,7 @@ public:
// {
ComputePolygonStatistics( imageList, vectorFileList, fileNames.polyStatTrainOutputs );
ComputeSamplingRate( fileNames.polyStatTrainOutputs, fileNames.rateTrainOut, rates.fmt );
- SelectAndExtractTrainSamples( fileNames, imageList, vectorFileList, SamplingStrategy::CLASS );
+ SelectAndExtractTrainSamples( fileNames, imageList, vectorFileList, Superclass::CLASS );
// }
// else // Select training samples base on geometric sampling if no input vector is provided
// {
@@ -224,4 +224,4 @@ private :
} // end namespace Wrapper
} // end namespace otb
-OTB_APPLICATION_EXPORT( otb::Wrapper::TrainImagesClassifier )
\ No newline at end of file
+OTB_APPLICATION_EXPORT( otb::Wrapper::TrainImagesClassifier )
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
index a01eb6c430..3ca86e31cd 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
@@ -62,10 +62,10 @@ public:
protected:
- enum SamplingStrategy
+ typedef enum
{
CLASS, GEOMETRIC
- };
+ } SamplingStrategy;
struct SamplingRates;
class TrainFileNamesHandler;
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
index deb34bfc73..93605b2807 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
@@ -335,7 +335,7 @@ void TrainImagesBase::SelectAndExtractValidationSamples(const TrainFileNamesHand
{
SelectAndExtractSamples( imageList->GetNthElement( i ), validationVectorFileList[i],
fileNames.sampleValidOutputs[i], fileNames.polyStatValidOutputs[i],
- fileNames.ratesValidOutputs[i], SamplingStrategy::CLASS );
+ fileNames.ratesValidOutputs[i], Self::CLASS );
}
}
--
GitLab