diff --git a/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx b/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
index 889e909cc54301fb53eeb952783e9d1f4325fa20..cf142f76f6e10e01f490abfe47c53e71d21527db 100644
--- a/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
+++ b/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
@@ -57,7 +57,7 @@ private:
m_CalculatorList = RateCalculatorListType::New();
}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("MultiImageSamplingRate");
SetDescription("Compute sampling rate for an input set of images.");
@@ -186,11 +186,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
// Clear state
m_CalculatorList->Clear();
diff --git a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
index a9c2b07fbde06f288706a67fb9b7b999cb7de076..63615e03cc6e125ce5af99c1487bbb31fc7c442a 100644
--- a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
+++ b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
@@ -53,7 +53,7 @@ public:
private:
SampleExtraction() {}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("SampleExtraction");
SetDescription("Extracts samples values from an image.");
@@ -119,7 +119,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
if ( HasValue("vec") )
{
@@ -149,7 +149,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
ogr::DataSource::Pointer vectors;
ogr::DataSource::Pointer output;
diff --git a/Modules/Applications/AppClassification/app/otbSampleSelection.cxx b/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
index b41f20470f2ac4fe5d2321011cc6c806a66ebb03..8faee83496bea3ce7c76313ef11409c5df36d026 100644
--- a/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
+++ b/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
@@ -80,7 +80,7 @@ private:
m_RateCalculator = RateCalculatorType::New();
}
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("SampleSelection");
SetDescription("Selects samples from a training vector data set.");
@@ -227,7 +227,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
if ( HasValue("vec") )
{
@@ -257,7 +257,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
// Clear state
m_RateCalculator->ClearRates();
diff --git a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
index f37eb3020f4934146d3ad4cfa9d402c19d058026..9de1efb8b1c46a1b060b1a4abcec84b611644c39 100644
--- a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
@@ -54,7 +54,7 @@ public:
typedef ContingencyTableType::Pointer ContingencyTablePointerType;
protected:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName( "TrainVectorClassifier" );
SetDescription( "Train a classifier based on labeled geometries and a "
@@ -73,12 +73,12 @@ protected:
Superclass::DoInit();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
Superclass::DoUpdateParameters();
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
m_FeaturesInfo.SetClassFieldNames( GetChoiceNames( "cfield" ), GetSelectedItems( "cfield" ) );
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
index 1cbc567c562948f356f55b84f0a4bf42a7f7b0da..8d52132dec7c1409335d747639f22213427e47b0 100644
--- a/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
@@ -68,7 +68,7 @@ public:
typedef otb::DimensionalityReductionModelFactory<ValueType, ValueType> ModelFactoryType;
private:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("TrainDimensionalityReduction");
SetDescription("Train a dimensionality reduction model");
@@ -115,11 +115,11 @@ private:
" value_5 value_6 value_7 value_8 value_9");
}
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
std::string shapefile = GetParameterString("io.vd");
diff --git a/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx b/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
index ec91b7e53b6c04b398a1e3d854475758d1f9d21e..6c949a2b9db9db9b2d590c963d39b65bb0c95e8d 100644
--- a/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
+++ b/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
@@ -57,7 +57,7 @@ public:
typedef itk::ComplexToPhaseImageFilter<ComplexFloatImageType, FloatImageType> PhaseFilterType;
private:
- void DoInit()
+ void DoInit() ITK_OVERRIDE
{
SetName("ComputeModulusAndPhase");
SetDescription("This application computes the modulus and the phase of a complex SAR image.");
@@ -100,12 +100,12 @@ private:
}
// DoUpdateParameters() is called as soon as a parameter value change.
- void DoUpdateParameters()
+ void DoUpdateParameters() ITK_OVERRIDE
{
}
// DoExecute() contains the application core.
- void DoExecute()
+ void DoExecute() ITK_OVERRIDE
{
m_Modulus = ModulusFilterType::New();
m_Phase = PhaseFilterType::New();
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
index d1022824dd0e256cc1563d390a1cd4aa225266e4..1d4f15234a91ec364784cccb2b18b7bcea22b0c5 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
@@ -92,11 +92,11 @@ protected:
WaveletImageFilter();
virtual ~WaveletImageFilter();
- virtual void GenerateInputRequestedRegion();
+ virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
- virtual void GenerateData();
+ virtual void GenerateData() ITK_OVERRIDE;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
index 52030d844481d53f103a928a62d887878332009c..1b286665265c905145ac1a07b3a844fd992e9cfa 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
@@ -87,17 +87,17 @@ public:
itkSetMacro(NumberOfDecompositions,unsigned int);
/** If the filter is modified, the internal filters need to be modified too */
- virtual void Modified() const;
+ virtual void Modified() const ITK_OVERRIDE;
protected:
WaveletInverseImageFilter();
virtual ~WaveletInverseImageFilter();
- virtual void GenerateInputRequestedRegion();
+ virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
- virtual void GenerateData();
+ virtual void GenerateData() ITK_OVERRIDE;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletInverseImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index 2c3225cf242c539ce0fb70fa0ebab2fa40875841..ea26fe6226dcdec41ba1a2850714b684609266d5 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
@@ -68,19 +68,19 @@ public:
protected:
/** Main computation method */
- virtual void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId);
+ virtual void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
- virtual void GenerateOutputInformation(void);
+ virtual void GenerateOutputInformation(void) ITK_OVERRIDE;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
/** Constructor */
WaveletsBandsListToWaveletsSynopsisImageFilter();
@@ -89,7 +89,7 @@ protected:
virtual ~WaveletsBandsListToWaveletsSynopsisImageFilter();
/**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
WaveletsBandsListToWaveletsSynopsisImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
index 5714fc1cab95a78fa1ed7a6ce00a84790e27cd00..a19c09bacb5e71783d608eea23d001211c79f770 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
@@ -80,7 +80,7 @@ public:
itkGetMacro(DecimationRatio,unsigned int);
/** If the filter is modified, the extract list need to be regenerated */
- virtual void Modified() const;
+ virtual void Modified() const ITK_OVERRIDE;
protected:
/** Constructor */
@@ -90,16 +90,16 @@ protected:
virtual ~WaveletsSynopsisImageToWaveletsBandsListFilter();
/**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
/** Generate the input requested region from the first element in the list. */
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
/** Generate the output information by building the output list. */
- virtual void GenerateOutputInformation(void);
+ virtual void GenerateOutputInformation(void) ITK_OVERRIDE;
/** Main computation method */
- virtual void GenerateData(void);
+ virtual void GenerateData(void) ITK_OVERRIDE;
private:
WaveletsSynopsisImageToWaveletsBandsListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 14205f0cd81aa2053d22b7bf90bfc78b5bebfe39..ee58a9428bc0be054352c547666ef91af7485bae 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -119,8 +119,8 @@ public:
itkGetMacro(LearningCurveFileName,std::string);
itkSetMacro(LearningCurveFileName,std::string);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
@@ -155,14 +155,14 @@ protected:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
virtual void DoPredictBatch(
const InputListSampleType *,
const unsigned int & startIndex,
const unsigned int & size,
TargetListSampleType *,
- ConfidenceListSampleType * quality = ITK_NULLPTR) const;
+ ConfidenceListSampleType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
private:
/** Internal Network */
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index d5538c1700538d6e77adb78c0358108e9730ce73..e3fdf5d8f5b0013e1b2d03a23939aed985d15984 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -115,7 +115,7 @@ protected:
~ImageDimensionalityReductionFilter() ITK_OVERRIDE {}
/** Generate output information */
- virtual void GenerateOutputInformation();
+ virtual void GenerateOutputInformation() ITK_OVERRIDE;
/** Threaded generate data */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index dd8f7a6992b1b3898608c90b47ead64db1a45c8a..064ca263daef7b492c19b60b42176a6f9478c3a1 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -80,8 +80,8 @@ public:
itkSetMacro(WriteEigenvectors, bool);
itkGetMacro(WriteEigenvectors, bool);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
@@ -94,7 +94,7 @@ protected:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
virtual void DoPredictBatch(
const InputListSampleType *,
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 7f6fb2b08e4a4f0a2e443e90549e1a6461b31d10..5aa7130a6a3c7b2759f3b94c79fdbbbad3fd653c 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -101,11 +101,11 @@ public:
itkSetMacro(Seed, unsigned int);
itkGetMacro(Seed, unsigned int);
- bool CanReadFile(const std::string & filename);
- bool CanWriteFile(const std::string & filename);
+ bool CanReadFile(const std::string & filename) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string & filename) ITK_OVERRIDE;
- void Save(const std::string & filename, const std::string & name="") ;
- void Load(const std::string & filename, const std::string & name="") ;
+ void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
void Train() ITK_OVERRIDE;
@@ -118,7 +118,7 @@ private:
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
/** Map size (width, height) */
SizeType m_MapSize;
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 8d2c0c81233c5e5486ec8068f86298a2f7053ab8..162aa10255707ab6ff0f2c38855541dbe12c6bfc 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -148,7 +148,7 @@ protected:
virtual void DoPredictBatch(const InputListSampleType *, const unsigned int & startIndex, const unsigned int & size, TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const ITK_OVERRIDE;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
SharkRandomForestsMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
index 313d9db9a1a581f0c6e7e9064f21cad3f20c4d74..7361ee38cc31897bc1ad46515b20e50ead307ce2 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- virtual const char* GetITKSourceVersion(void) const;
- virtual const char* GetDescription(void) const;
+ virtual const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
+ virtual const char* GetDescription(void) const ITK_OVERRIDE;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index ef74d52f4063a3cca332312c14bb4cbac0c95d57..a479248e1e17ecc2475455c28bbb9c1e303f7b11 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -140,7 +140,7 @@ protected:
DataType NormalizeData(const DataType &data) const;
/** PrintSelf method */
- void PrintSelf(std::ostream &os, itk::Indent indent) const;
+ void PrintSelf(std::ostream &os, itk::Indent indent) const ITK_OVERRIDE;
private:
SharkKMeansMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
index a072d5d71921f24cc483e0193d3f0d04a4ab41d2..3c9ed55da18ae06a15688c34454e903c8f53ef0e 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- virtual const char* GetITKSourceVersion(void) const;
- virtual const char* GetDescription(void) const;
+ virtual const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
+ virtual const char* GetDescription(void) const ITK_OVERRIDE;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/Radiometry/Simulation/include/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
index ea021d2811178d4c2d55ffbdad044e00e60b2356..c2264c104c0c54d6c02e8ced82f4aed923938396 100644
--- a/Modules/Radiometry/Simulation/include/otbProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
@@ -115,7 +115,7 @@ class ITK_EXPORT ProSailParameters : public itk::DataObject
/** Destructor */
virtual ~ProSailParameters() {};
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
private:
diff --git a/Modules/Wrappers/SWIG/src/python/itkPyCommand.h b/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
index d65c4eea7bf23a3cabdca32d58978110f4522f96..f7f28333ea6e0db8e7098fb0319384738f1b46d0 100644
--- a/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
+++ b/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
@@ -70,8 +70,8 @@ public:
PyObject * GetCommandCallable();
- void Execute(Object *, const EventObject&);
- void Execute(const Object *, const EventObject&);
+ void Execute(Object *, const EventObject&) ITK_OVERRIDE;
+ void Execute(const Object *, const EventObject&) ITK_OVERRIDE;
protected:
PyCommand();