diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
index 1ee320daeb0e3d5c4b6cf95bfbedd7255bd89a02..fa00e3615bfaf4d6c6fe824813e5c483d905a7fc 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
@@ -48,19 +48,19 @@ public:
itkTypeMacro(CurlHelper, CurlHelperInterface);
itkNewMacro(Self);
- bool TestUrlAvailability(const std::string& url) const ITK_OVERRIDE;
+ bool TestUrlAvailability(const std::string& url) const override;
bool IsCurlReturnHttpError(const std::string& url) const;
- int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const ITK_OVERRIDE;
+ int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const override;
- int RetrieveFile(const std::string& urlString, std::string filename) const ITK_OVERRIDE;
+ int RetrieveFile(const std::string& urlString, std::string filename) const override;
- int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const ITK_OVERRIDE;
+ int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const override;
int RetrieveFileMulti(const std::vector<std::string>& listURLs,
const std::vector<std::string>& listFiles,
- int maxConnect) const ITK_OVERRIDE;
+ int maxConnect) const override;
itkGetMacro(Timeout,long int);
@@ -71,7 +71,7 @@ protected:
m_Browser("Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) "
"Gecko/20071127 Firefox/2.0.0.11"),
m_Timeout(10) {}
- ~CurlHelper() ITK_OVERRIDE {}
+ ~CurlHelper() override {}
private:
CurlHelper(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
index 8fed05b3d2c27c82dea4ec3e0c33da89676d6c14..a5cb6a56a02f7f18af6d2811b652b64c7d6dc470 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
@@ -66,7 +66,7 @@ public:
protected:
CurlHelperInterface() {}
- ~CurlHelperInterface() ITK_OVERRIDE {}
+ ~CurlHelperInterface() override {}
private:
CurlHelperInterface(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
index 58d56edaad576ea44ca7fa7ef8a13c243ac14ece..5393b36ff511a9220441495c3bab318b50408c09 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
@@ -47,20 +47,20 @@ public:
itkNewMacro(Self);
- bool TestUrlAvailability(const std::string& url) const ITK_OVERRIDE;
+ bool TestUrlAvailability(const std::string& url) const override;
- int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const ITK_OVERRIDE;
+ int RetrieveUrlInMemory(const std::string& urlString, std::string& output) const override;
- int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const ITK_OVERRIDE;
+ int RetrieveFile(const std::ostringstream& urlStream, std::string filename) const override;
- int RetrieveFile(const std::string& urlString, std::string filename) const ITK_OVERRIDE;
+ int RetrieveFile(const std::string& urlString, std::string filename) const override;
int RetrieveFileMulti(const std::vector<std::string>& listURLs,
const std::vector<std::string>& listFiles,
- int maxConnect) const ITK_OVERRIDE;
+ int maxConnect) const override;
protected:
CurlHelperStub() {}
- ~CurlHelperStub() ITK_OVERRIDE {}
+ ~CurlHelperStub() override {}
private:
CurlHelperStub(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
index a9021f5efd7e37c886862e73eeca0ed1275f9649..39bd3f07067a6ab118d90f9e51258a8de0d644f5 100644
--- a/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
+++ b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
@@ -94,7 +94,7 @@ protected:
}
}
- ~CurlResource() ITK_OVERRIDE
+ ~CurlResource() override
{
curl_easy_cleanup(m_Curl);
}
@@ -140,7 +140,7 @@ protected:
}
}
- ~CurlMultiResource() ITK_OVERRIDE
+ ~CurlMultiResource() override
{
curl_multi_cleanup(m_Curl);
}
@@ -187,7 +187,7 @@ public:
protected:
CurlFileDescriptorResource(){}
- ~CurlFileDescriptorResource() ITK_OVERRIDE
+ ~CurlFileDescriptorResource() override
{
fclose(m_File);
}
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
index 14e9f815ca1d4afe0d43bf4c2a4c9596a9cff47e..9306c6575b8389d3adcd540950a378f7600a5a93 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
@@ -159,10 +159,10 @@ protected:
GeometriesSet(ogr::Layer layer);
/** Destructor. */
- ~GeometriesSet() ITK_OVERRIDE;
+ ~GeometriesSet() override;
/** Prints self to stream. */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
typedef boost::variant<ogr::DataSource::Pointer, ogr::Layer> AnyGeometriesSetType;
AnyGeometriesSetType m_GeometriesSet;
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
index 7361aa0c23d8d1a121baf54420246d6b24c92ef1..5b8c8626710c003927905880a1d272a47668db6c 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
@@ -119,7 +119,7 @@ public:
* initializing them.
* \post <tt>GetOutput() != NULL</tt>
*/
- void PrepareOutputs() ITK_OVERRIDE;
+ void PrepareOutputs() override;
protected:
/** Default constructor.
@@ -129,7 +129,7 @@ protected:
/** Destructor.
* Does nothing.
*/
- ~GeometriesSource() ITK_OVERRIDE;
+ ~GeometriesSource() override;
/** Ensures that the output geometries are allocated before processing.
* If the output hasn't been set, at this point, the default output geometries
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index 5f3ce2267578b13a85a1750cab18046cf680f9c7..26089652fb5ea7920c3db3dd751b14d81d9b5114 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -91,13 +91,13 @@ protected:
/** Destructor.
* Does nothing.
*/
- ~GeometriesToGeometriesFilter() ITK_OVERRIDE;
+ ~GeometriesToGeometriesFilter() override;
/** Processes the input to fill the output.
* This is the main processing function. It either works \em in-place or by
* \em copying the transformed input \c Feature s into the output.
*/
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
/** \e In-place processing function.
@@ -364,7 +364,7 @@ protected:
/** Default constructor. */
DefaultGeometriesToGeometriesFilter();
/** Destructor. */
- ~DefaultGeometriesToGeometriesFilter() ITK_OVERRIDE;
+ ~DefaultGeometriesToGeometriesFilter() override;
/**
* Hook that actually filters an OGR \c Layer.
@@ -376,7 +376,7 @@ protected:
* \note When <tt>source == destination</tt>, it means this is an \em in-place
* filter.
*/
- void DoProcessLayer(ogr::Layer const& source, ogr::Layer & destination) const ITK_OVERRIDE;
+ void DoProcessLayer(ogr::Layer const& source, ogr::Layer & destination) const override;
/**
* Hook used to define the fields of the new layer.
* \param[in] source source \c Layer -- for reference
@@ -385,7 +385,7 @@ protected:
* Just forwards the fields definition to the \c FieldTransformationPolicy
* inherited from the \c TransformationFunctorDispatcherType.
*/
- void DoDefineNewLayerFields(ogr::Layer const& source, ogr::Layer & dest) const ITK_OVERRIDE
+ void DoDefineNewLayerFields(ogr::Layer const& source, ogr::Layer & dest) const override
{
this->DefineFields(source, dest);
}
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index bf6d799fd52d88e66a4164d1c50d02aae58e84a7..eb6daff5f0510f2a9908ac88f3c5566df747ebd2 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -291,7 +291,7 @@ public:
* meta information of another data source and use the same underlying \c
* GDALDataset.
*/
- void Graft(const itk::DataObject *data) ITK_OVERRIDE;
+ void Graft(const itk::DataObject *data) override;
/**
* Resets current data source with the one in parameter.
@@ -515,12 +515,12 @@ protected:
/** Destructor.
* \post The \c GDALDataset owned is released (if not null).
*/
- ~DataSource() ITK_OVERRIDE;
+ ~DataSource() override;
static Pointer OpenDataSource(std::string const& datasourceName, Modes::type mode);
/** Prints self into stream. */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/**
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
index d83540cac509ce7c6550e641487b4a4612f05e60..d3468a20ecf8961f74821b90f0e7f889763db891 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
@@ -132,7 +132,7 @@ template
* <tt> = T</tt>)
*
* \internal
- * This ITK_OVERRIDE is required because of the particular nature of the
+ * This override is required because of the particular nature of the
* <tt>char**</tt> type chosen by OGR API, plus the fact this is the only
* const-correct getter...
* \since OTB v 3.14.0
@@ -262,7 +262,7 @@ template
* <tt> = T</tt>)
*
* \internal
- * This ITK_OVERRIDE is required because of the particular nature of the
+ * This override is required because of the particular nature of the
* <tt>char**</tt> type chosen by OGR API.
* \since OTB v 3.14.0
*/
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
index 3e12cbe3b50416a2e38df83d49dfc6d45ecf2e64..109f67dba72f39d3c56b35ebe552c585d83c4299 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
@@ -49,7 +49,7 @@ public:
protected:
DEMConvertAdapter();
- ~DEMConvertAdapter() ITK_OVERRIDE;
+ ~DEMConvertAdapter() override;
private:
DEMConvertAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
index dc7a552e2a1efd3174474e5048f4522913a75a5b..498b0374d2775c910a01b6e76351a157990176d2 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
@@ -169,9 +169,9 @@ public:
protected:
DEMHandler();
- ~DEMHandler() ITK_OVERRIDE {}
+ ~DEMHandler() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
// Ossim does not allow retrieving the geoid file path
// We therefore must keep it on our side
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
index 0d4101c1f9dfd26f8421f61936d39ecba3fe02c5..5a0a3d4855efc5bd8e731e61f068a50aa43b5213 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
@@ -85,7 +85,7 @@ public:
protected:
DateTimeAdapter();
- ~DateTimeAdapter() ITK_OVERRIDE;
+ ~DateTimeAdapter() override;
private:
DateTimeAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
index 539d8b0e8bad5759a2e182308b2443222ca6705e..d6a6de8e302ad8ea491f75bfc1a6f06f47e006b3 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
@@ -67,7 +67,7 @@ public:
protected:
EllipsoidAdapter();
- ~EllipsoidAdapter() ITK_OVERRIDE;
+ ~EllipsoidAdapter() override;
private:
EllipsoidAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
index 065197b830079d8f175e5d32e98f41aceeaa8254..2e835d0cdee2d7e54177a2ec5ac69db8fb27ec4d 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
@@ -103,10 +103,10 @@ protected:
/** Constructor */
FilterFunctionValues();
/** Destructor */
- ~FilterFunctionValues() ITK_OVERRIDE {}
+ ~FilterFunctionValues() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FilterFunctionValues(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
index 690deb7b910c8b93c157608846cd1c430d10b3a4..02173165dc376ecd0fe92ac7cf6548968c255845 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
@@ -78,7 +78,7 @@ public:
protected:
GeometricSarSensorModelAdapter();
- ~GeometricSarSensorModelAdapter() ITK_OVERRIDE;
+ ~GeometricSarSensorModelAdapter() override;
private:
GeometricSarSensorModelAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
index 7ba5ffe592361e2203ba0fa015c67834b4a2e337..ed71e227f00bc8e1e9610b2503f2b24ee0f66142 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
@@ -89,7 +89,7 @@ public:
protected:
MapProjectionAdapter();
- ~MapProjectionAdapter() ITK_OVERRIDE;
+ ~MapProjectionAdapter() override;
private:
MapProjectionAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
index 2f74ac90a866ec946b24f9b50b3c4013fd18a3a3..ea770482aa1729fe1c81c73b62a057ab91ff24e0 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
@@ -78,7 +78,7 @@ public:
protected:
PlatformPositionAdapter();
- ~PlatformPositionAdapter() ITK_OVERRIDE;
+ ~PlatformPositionAdapter() override;
private:
PlatformPositionAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbSarSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbSarSensorModelAdapter.h
index 8a713883b6720d0dd9b8e0ce89c03ae924cd75c9..48e05c89417e9ebf7dda34db83ecd6ea16e72425 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbSarSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbSarSensorModelAdapter.h
@@ -106,7 +106,7 @@ public:
protected:
SarSensorModelAdapter();
- virtual ~SarSensorModelAdapter() ITK_OVERRIDE;
+ virtual ~SarSensorModelAdapter() override;
private:
SarSensorModelAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
index d6099e9a73da9c7f0fe24fc6032554fa6d008979..fe55f03488e8875df4efacf8f902fba64f222294 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
@@ -111,7 +111,7 @@ public:
protected:
SensorModelAdapter();
- ~SensorModelAdapter() ITK_OVERRIDE;
+ ~SensorModelAdapter() override;
private:
SensorModelAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
index 668930e92202047b758e168f77eb37f22c381620..b2ec075b68b420a8971c40246db133739081bfa8 100644
--- a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
+++ b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
@@ -43,7 +43,7 @@ public:
itkTypeMacro(MultivariateAlterationDetector, otb::Wrapper::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("MultivariateAlterationDetector");
SetDescription("Change detection by Multivariate Alteration Detector (MAD) algorithm");
@@ -110,11 +110,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
typedef otb::MultivariateAlterationDetectorImageFilter<
FloatVectorImageType,
diff --git a/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
index 269a6f5bf5b7f9525380233d3a5414f6c9a82948..7f8b71c8d7e488e5fc8ab3624c6e7de374f8aefa 100644
--- a/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
+++ b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
@@ -57,7 +57,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ClassificationMapRegularization");
SetDescription("Filters the input labeled image using Majority Voting in a ball shaped neighbordhood.");
@@ -125,12 +125,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Majority Voting
m_NeighMajVotingFilter = NeighborhoodMajorityVotingFilterType::New();
diff --git a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
index 4bee3df4fe9bd1ca3220428adc28f4ed91c7e9e2..d009f21f0a619ae1a6efc0433f5ae67bc9ec0979 100644
--- a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
@@ -103,7 +103,7 @@ private:
};
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ComputeConfusionMatrix");
SetDescription("Computes the confusion matrix of a classification");
@@ -183,7 +183,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("ref.vector.in") )
{
@@ -363,7 +363,7 @@ private:
return sid;
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
StreamingInitializationData sid = InitStreamingData();
diff --git a/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx
index 0956eb7a0068264402c218687efd3c89feacfc76..055bc703e8364b49ad88a4de736008466d210833 100644
--- a/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx
@@ -45,7 +45,7 @@ public:
itkTypeMacro(ComputeImagesStatistics, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ComputeImagesStatistics");
SetDocName("Compute Images second order statistics");
@@ -85,12 +85,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
//Statistics estimator
typedef otb::StreamingStatisticsVectorImageFilter<FloatVectorImageType> StreamingStatisticsVImageFilterType;
diff --git a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
index 5f108a9a13e1ee408449082bb89f980b00761c94..0774475d1d9d6dd3c2bf3d29eb4a0278e1371def 100644
--- a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
@@ -46,7 +46,7 @@ public:
;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ComputeOGRLayersFeaturesStatistics");
SetDescription("Compute statistics of the features in a set of OGR Layers");
@@ -75,7 +75,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("inshp") )
{
@@ -117,7 +117,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
clock_t tic = clock();
diff --git a/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
index 1e098e7846e0bd13aa19f2cb61fd07d05ca0cdde..1c9c715bed02a7fa1d849feb36a765bfa3c47a7b 100644
--- a/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
@@ -76,7 +76,7 @@ public:
;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ComputePolylineFeatureFromImage");
SetDescription("This application compute for each studied polyline, contained in the input VectorData, the chosen descriptors.");
@@ -116,12 +116,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Vector Data into Image projection
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
index 336c447c2a2a3214f185a765b0344b5f0d0fb021..60a49e14782f8bfb40d6a20bcf2f9adfbaa0b139 100644
--- a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
+++ b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
@@ -51,12 +51,12 @@ typedef itk::AmoebaOptimizer OptimizerType;
typedef const OptimizerType * OptimizerPointer;
-void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE
+void Execute(itk::Object *caller, const itk::EventObject & event) override
{
Execute( (const itk::Object *)caller, event);
}
-void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE
+void Execute(const itk::Object * object, const itk::EventObject & event) override
{
OptimizerPointer optimizer =
dynamic_cast< OptimizerPointer >( object );
@@ -115,7 +115,7 @@ public:
itkTypeMacro(DSFuzzyModelEstimation, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DSFuzzyModelEstimation");
SetDescription("Estimate feature fuzzy model parameters using 2 vector data (ground truth samples and wrong samples).");
@@ -183,7 +183,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
@@ -193,7 +193,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
//Instantiate
diff --git a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
index b31ae21c16d927de64135bdd47b1f07ebb9d595e..4fa71c70e5cf371db67b8e70c57088f29d4c5a43 100644
--- a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
+++ b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
@@ -93,7 +93,7 @@ public:
itkTypeMacro(FusionOfClassifications, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("FusionOfClassifications");
SetDescription("Fuses several classifications maps of the same image on the basis of class labels.");
@@ -173,7 +173,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
@@ -285,7 +285,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Clear any previous filter
m_Filters.clear();
diff --git a/Modules/Applications/AppClassification/app/otbImageClassifier.cxx b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
index 1f94d2714355e37db5137cfd85d3de72b3927e57..59f3cd2936e063053862000c47e6d1d59d7aefa9 100644
--- a/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
@@ -67,13 +67,13 @@ public:
protected:
- ~ImageClassifier() ITK_OVERRIDE
+ ~ImageClassifier() override
{
MachineLearningModelFactoryType::CleanFactories();
}
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ImageClassifier");
SetDescription("Performs a classification of the input image according to a model file.");
@@ -141,12 +141,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Load input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx b/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx
index a5a44e6b4e1ad0f62248d0f879096657c3a6199c..52e0d6b426d7defb6343113029c17abe6dcacd15 100644
--- a/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx
+++ b/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx
@@ -394,7 +394,7 @@ public:
itkTypeMacro(Self, Superclass);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("KMeansClassification");
SetDescription("Unsupervised KMeans image classification");
@@ -448,11 +448,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
if (IsParameterEnabled("vm") && HasValue("vm")) Superclass::ConnectKMClassificationMask();
diff --git a/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx b/Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
index 85bed4e53ba73895d2619c590ed6b474718acac6..0b60504fed8ea033038900f466b86054bc6402b3 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() override
{
SetName("MultiImageSamplingRate");
SetDescription("Compute sampling rate for an input set of images.");
@@ -186,11 +186,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() override
{
}
- void DoExecute()
+ void DoExecute() override
{
// Clear state
m_CalculatorList->Clear();
diff --git a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
index a29b0bc527a1d280f596177323e66bbfcfcd2140..86a2d7066d8f4242c6cbcd2815ae0b327e5e5b63 100644
--- a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
@@ -55,7 +55,7 @@ public:
;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("OGRLayerClassifier");
SetDescription("Classify an OGR layer based on a machine learning model and a list of features to consider.");
@@ -94,7 +94,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("inshp") )
{
@@ -135,7 +135,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
#ifdef OTB_USE_LIBSVM
diff --git a/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx b/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx
index 4a35145462f48ac18220bafc08c5ab2998426f35..3fa23e056d2da13e362692fb1bb06d43e866bc14 100644
--- a/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx
@@ -67,7 +67,7 @@ private:
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("PolygonClassStatistics");
SetDescription("Computes statistics on a training polygon set.");
@@ -127,7 +127,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("vec") )
{
@@ -173,7 +173,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
otb::ogr::DataSource::Pointer vectors =
otb::ogr::DataSource::New(this->GetParameterString("vec"));
diff --git a/Modules/Applications/AppClassification/app/otbPredictRegression.cxx b/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
index 8a4401679f240d9edfb086e520e21d519acea157..0c8dce2d8618d2b6c1e7f44d6cd57d93f00ece40 100644
--- a/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
+++ b/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
@@ -107,13 +107,13 @@ public:
protected:
- ~PredictRegression() ITK_OVERRIDE
+ ~PredictRegression() override
{
MachineLearningModelFactoryType::CleanFactories();
}
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("PredictRegression");
SetDescription("Performs a prediction of the input image according to a regression model file.");
@@ -182,12 +182,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Load input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppClassification/app/otbSOMClassification.cxx b/Modules/Applications/AppClassification/app/otbSOMClassification.cxx
index 86572e90ad0eebd83dbc8ec8ee3e338677984af6..1b0b7ffcc7da5682e3c02550ef4f026cf0371eb9 100644
--- a/Modules/Applications/AppClassification/app/otbSOMClassification.cxx
+++ b/Modules/Applications/AppClassification/app/otbSOMClassification.cxx
@@ -76,7 +76,7 @@ private:
m_Classifier = ClassificationFilterType::New();
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SOMClassification");
SetDescription("SOM image classification.");
@@ -178,12 +178,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// initiating random number generation
itk::Statistics::MersenneTwisterRandomVariateGenerator::Pointer
diff --git a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
index 4c3d40b56077b7ad605758e92c59a76c9919ff74..2c48308344b02b27744c3c362a07603ceb348c47 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() override
{
SetName("SampleExtraction");
SetDescription("Extracts samples values from an image.");
@@ -119,7 +119,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() override
{
if ( HasValue("vec") )
{
@@ -149,7 +149,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() 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 cd3542db8e2db78a0c8e0f4cf624e88ab62575ed..681e0630774f278c714121d51bd433f3b627dc9a 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() override
{
SetName("SampleSelection");
SetDescription("Selects samples from a training vector data set.");
@@ -227,7 +227,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() override
{
if ( HasValue("vec") )
{
@@ -257,7 +257,7 @@ private:
}
}
- void DoExecute()
+ void DoExecute() override
{
// Clear state
m_RateCalculator->ClearRates();
diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
index 7bdb39044373e59b0dadb11c84b64853181c438d..26b11023f6e5e1a441b5b592d991d2a601b210e8 100644
--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
@@ -35,7 +35,7 @@ public:
itkNewMacro( Self )
itkTypeMacro( Self, Superclass )
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "TrainImagesClassifier" );
SetDescription( "Train a classifier from multiple pairs of images and training vector data." );
@@ -86,7 +86,7 @@ public:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if( HasValue( "io.vd" ) && IsParameterEnabled( "io.vd" ))
{
@@ -157,7 +157,7 @@ public:
}
- void DoExecute()
+ void DoExecute() override
{
TrainFileNamesHandler fileNames;
std::vector<std::string> vectorFileList;
diff --git a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
index 9d22eb9d1afd45fe82224e62e57d6e7267f06e35..90009e31523c4283eea4b819c9fced52e52d82d7 100644
--- a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
@@ -98,7 +98,7 @@ protected:
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("TrainRegression");
SetDescription(
@@ -198,7 +198,7 @@ void DoInit() ITK_OVERRIDE
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
if (HasValue("io.csv") && IsParameterEnabled("io.csv"))
{
@@ -279,7 +279,7 @@ void ParseCSVPredictors(std::string path, ListSampleType* outputList)
ifs.close();
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
GetLogger()->Debug("Entering DoExecute\n");
//Create training and validation for list samples and label list samples
diff --git a/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
index c1f6a9456ddf2ad5c419464d3fb557a6c75ca470..4243c21766ac88d1ca1f915bf1def5018ec5af8b 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() override
{
SetName( "TrainVectorClassifier" );
SetDescription( "Train a classifier based on labeled geometries and a "
@@ -73,12 +73,12 @@ protected:
Superclass::DoInit();
}
- void DoUpdateParameters()
+ void DoUpdateParameters() override
{
Superclass::DoUpdateParameters();
}
- void DoExecute()
+ void DoExecute() override
{
m_FeaturesInfo.SetClassFieldNames( GetChoiceNames( "cfield" ), GetSelectedItems( "cfield" ) );
diff --git a/Modules/Applications/AppClassification/app/otbVectorClassifier.cxx b/Modules/Applications/AppClassification/app/otbVectorClassifier.cxx
index df1aef66be62d2c57c3178fa9141122d21f55c5f..abc87f0098e65f42903a1bbb57a7a0bdc527df64 100644
--- a/Modules/Applications/AppClassification/app/otbVectorClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbVectorClassifier.cxx
@@ -80,13 +80,13 @@ public:
typedef itk::Statistics::ListSample<InputSampleType> ListSampleType;
typedef otb::Statistics::ShiftScaleSampleListFilter<ListSampleType, ListSampleType> ShiftScaleFilterType;
- ~VectorClassifier() ITK_OVERRIDE
+ ~VectorClassifier() override
{
MachineLearningModelFactoryType::CleanFactories();
}
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorClassifier");
SetDescription("Performs a classification of the input vector data according to a model file.");
@@ -162,7 +162,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("in") )
{
@@ -196,7 +196,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
clock_t tic = clock();
diff --git a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
index 05ddb93a0582162c20dbfe1ff3d4d2e009287798..61a8908f9cab792791aa2c7a5ca54837ff57a1c8 100644
--- a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
+++ b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
@@ -58,7 +58,7 @@ public:
itkTypeMacro(VectorDataDSValidation, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDataDSValidation");
SetDescription("Vector data validation based on the fusion of features using Dempster-Shafer evidence theory framework.");
@@ -106,7 +106,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
@@ -116,7 +116,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
//Read the vector data
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
index e71be6402140e11227b8c4373dc14cfdb896c7b6..72e87a389ce73951061e25bd0c0760d26ef5afa0 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
@@ -121,7 +121,7 @@ public:
protected:
LearningApplicationBase();
- ~LearningApplicationBase() ITK_OVERRIDE;
+ ~LearningApplicationBase() override;
/** Generic method to train and save the machine learning model. This method
* uses specific train methods depending on the chosen model.*/
@@ -135,7 +135,7 @@ protected:
std::string modelPath);
/** Init method that creates all the parameters for machine learning models */
- void DoInit() ITK_OVERRIDE;
+ void DoInit() override;
/** Flag to switch between classification and regression mode.
* False by default, child classes may change it in their constructor */
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
index 9bcf6df3862b1d85e0f026de44fc98dee34885e5..300b1b5879d05d7682fb944649e3f12bc482a882 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
@@ -180,9 +180,9 @@ protected:
TargetListSampleType::Pointer m_PredictedList;
FeaturesInfo m_FeaturesInfo;
- void DoInit() ITK_OVERRIDE;
- void DoUpdateParameters() ITK_OVERRIDE;
- void DoExecute() ITK_OVERRIDE;
+ void DoInit() override;
+ void DoUpdateParameters() override;
+ void DoExecute() override;
};
diff --git a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
index 04cf50df4d626be84da6288cdd740e9b2f10db55..4c9e3bbc45375ce478142d263477395a70fdaae7 100644
--- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
+++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
@@ -80,7 +80,7 @@ public:
itkTypeMacro(HomologousPointsExtraction, otb::Wrapper::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("HomologousPointsExtraction");
SetDocName("Homologous points extraction");
@@ -200,7 +200,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
@@ -324,7 +324,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
OGRMultiLineString mls;
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
index d783a3df7535f9f2848ab50fe55867c30a4610ea..2721c1232c42ab7cf208430bb8548dbde859ca74 100644
--- a/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
@@ -89,7 +89,7 @@ public:
;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DimensionalityReduction");
SetDescription("Perform Dimension reduction of the input image.");
@@ -183,7 +183,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if (HasValue("in"))
{
@@ -231,7 +231,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get Parameters
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbImageDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbImageDimensionalityReduction.cxx
index c221302c033c889e1ddb601662ab840f01257a22..1df2c463fc26c531095154515039a9245d0ba5c1 100644
--- a/Modules/Applications/AppDimensionalityReduction/app/otbImageDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbImageDimensionalityReduction.cxx
@@ -116,13 +116,13 @@ public:
protected:
- ~ImageDimensionalityReduction() ITK_OVERRIDE
+ ~ImageDimensionalityReduction() override
{
DimensionalityReductionModelFactoryType::CleanFactories();
}
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DimensionalityReduction");
SetDescription("Performs dimensionality reduction of the input image "
@@ -182,12 +182,12 @@ private:
SetDocExampleParameterValue("out", "ReducedImageQB1.tif");
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Load input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
index 1cbc567c562948f356f55b84f0a4bf42a7f7b0da..34390791ab52ba160523ae8fbbe4e5e0fbbdc241 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() 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() override
{
}
- void DoExecute()
+ void DoExecute() override
{
std::string shapefile = GetParameterString("io.vd");
diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
index 132e13875cbffdc0d6152601173c7a24e89afd9a..24e7ba98ffeb4268e6adea854a0c44971477b1e3 100644
--- a/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
@@ -75,13 +75,13 @@ public:
ListSampleType, ListSampleType> ShiftScaleFilterType;
protected:
- ~VectorDimensionalityReduction() ITK_OVERRIDE
+ ~VectorDimensionalityReduction() override
{
DimensionalityReductionModelFactoryType::CleanFactories();
}
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDimensionalityReduction");
SetDescription("Performs dimensionality reduction of the input vector data "
@@ -163,7 +163,7 @@ private:
//SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("in") )
{
@@ -188,7 +188,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
clock_t tic = clock();
diff --git a/Modules/Applications/AppDomainTransform/app/otbDomainTransform.cxx b/Modules/Applications/AppDomainTransform/app/otbDomainTransform.cxx
index e66c5a35fc92a4c7a129b0ddc5c565208e5ab6af..dbaced29bca148c94a1e056fbd7e2fd4239942bb 100644
--- a/Modules/Applications/AppDomainTransform/app/otbDomainTransform.cxx
+++ b/Modules/Applications/AppDomainTransform/app/otbDomainTransform.cxx
@@ -81,7 +81,7 @@ public:
private:
DomainTransform() {}
- ~DomainTransform() ITK_OVERRIDE
+ ~DomainTransform() override
{
}
@@ -99,7 +99,7 @@ private:
#endif
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DomainTransform");
SetDescription("Domain Transform application for wavelet and fourier");
@@ -173,12 +173,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
int dir = GetParameterInt("direction");
int mode = GetParameterInt("mode");
diff --git a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
index a608338ddefab721dc1c8b0a4f0f0b6f035f8c49..cbadc412bb8edd5ff8654c459c5ae03c1e707a02 100644
--- a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
+++ b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
@@ -61,7 +61,7 @@ itkTypeMacro(EdgeExtraction, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("EdgeExtraction");
SetDescription(
@@ -142,12 +142,12 @@ SetDocExampleParameterValue("out", "Edges.tif");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
index 588e8e1ff6af8a3497495c6962fd316147fb1888..5884e33d17d6fedcc427f8c25ea629e4c4f85e5f 100644
--- a/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
+++ b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
@@ -53,7 +53,7 @@ public:
itkTypeMacro(LineSegmentDetection, otb::Wrapper::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("LineSegmentDetection");
SetDescription("Detect line segments in raster");
@@ -99,11 +99,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
typedef otb::VectorImageToAmplitudeImageFilter<FloatVectorImageType, FloatImageType>
VectorImageToAmplitudeImageFilterType;
diff --git a/Modules/Applications/AppFiltering/app/otbSmoothing.cxx b/Modules/Applications/AppFiltering/app/otbSmoothing.cxx
index 5f93a6b87183e62b5d40581f00d1a918b7794b0d..550cc25350e186deaf52f88ca3189d08d1f0da4d 100644
--- a/Modules/Applications/AppFiltering/app/otbSmoothing.cxx
+++ b/Modules/Applications/AppFiltering/app/otbSmoothing.cxx
@@ -55,7 +55,7 @@ public:
itkTypeMacro(Smoothing, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "Smoothing" );
SetDescription( "Apply a smoothing filter to an image" );
@@ -136,12 +136,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
GetLogger()->Debug("Entering DoExecute\n");
diff --git a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
index bd52a805c544f79c16b7a02699498cbf92716006..40a439e340ec8f4fc0734eee148cd0ba690bdeaa 100644
--- a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
+++ b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
@@ -42,7 +42,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("BundleToPerfectSensor");
SetDescription("Perform P+XS pansharpening");
@@ -85,12 +85,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
UpdateInternalParameters("superimpose");
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
ExecuteInternal("superimpose");
diff --git a/Modules/Applications/AppFusion/app/otbPansharpening.cxx b/Modules/Applications/AppFusion/app/otbPansharpening.cxx
index 15fa33cc7e8cb2e995dc16383b14f78824d1a680..fce89cc116cddd05c4d3271cbc0d05304cff703a 100644
--- a/Modules/Applications/AppFusion/app/otbPansharpening.cxx
+++ b/Modules/Applications/AppFusion/app/otbPansharpening.cxx
@@ -73,7 +73,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Pansharpening");
SetDescription("Perform P+XS pansharpening");
@@ -138,12 +138,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType* panchroV = GetParameterImage("inp");
if ( panchroV->GetNumberOfComponentsPerPixel() != 1 )
diff --git a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
index 3a5032af1f3a37fbda3d8a534a832dff8b31e63a..13c2306602d67449e1c280474c643b48a6e40358 100644
--- a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
+++ b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
@@ -88,7 +88,7 @@ public:
itkTypeMacro(HyperspectralUnmixing, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("HyperspectralUnmixing");
SetDescription("Estimate abundance maps from an hyperspectral image and a set of endmembers.");
@@ -154,12 +154,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
m_ProcessObjects.clear();
diff --git a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
index 1dc286bb9cf35ea88dfc8f8da5402a0780aaad36..e919d57f5d110ad42a682d2363effa88d1b17e2d 100644
--- a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
+++ b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
@@ -47,7 +47,7 @@ public:
itkTypeMacro(VertexComponentAnalysis, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VertexComponentAnalysis");
SetDescription("Given a set of mixed spectral vectors, estimate"
@@ -99,12 +99,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
DoubleVectorImageType::Pointer inputImage = GetParameterDoubleVectorImage("in");
DoubleVectorImageType::Pointer endmembersImage;
diff --git a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
index d68776716981ea94e1b691020bdbcd3d243595c2..929633021b58cc5e5cd3b4cb5639554ab5e586a6 100644
--- a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
@@ -248,7 +248,7 @@ public:
<FloatImageType, LabelImageType> CasterToLabelImageType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ColorMapping");
SetDescription("Maps an input label image to 8-bits RGB using look-up tables.");
@@ -397,7 +397,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Make sure the operation color->label is not called with methods continuous or image.
// These methods are not implemented for this operation yet.
@@ -411,7 +411,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
if(GetParameterInt("op")==0)
{
diff --git a/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx b/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx
index d376e56b5c0172dd5039fe2b35296025c5bfc6ae..fab3a3d9096e3d71ad39c26c182dfe8e41424271 100644
--- a/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx
@@ -49,7 +49,7 @@ public:
typedef otb::StreamingCompareImageFilter<FloatImageType> StreamingCompareImageFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("CompareImages");
SetDescription("Estimator between 2 images.");
@@ -134,7 +134,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Set channel interval
if( HasValue("ref.in") )
@@ -169,7 +169,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Init filters
m_ExtractRefFilter = ExtractROIMonoFilterType::New();
diff --git a/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx b/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx
index 185872b828b9299a1e807ee02d48b5da26f67931..7e3459d154b7e919115d129c5084259b51792130 100644
--- a/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx
@@ -54,7 +54,7 @@ public:
typedef ObjectList<ExtractROIFilterType> ExtractROIFilterListType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ConcatenateImages");
SetDescription("Concatenate a list of images of the same size into a single multi-channel one.");
@@ -91,7 +91,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
@@ -101,7 +101,7 @@ private:
m_ExtractorList = ExtractROIFilterListType::New();
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image list
FloatVectorImageListType::Pointer inList = this->GetParameterImageList("il");
diff --git a/Modules/Applications/AppImageUtils/app/otbConvert.cxx b/Modules/Applications/AppImageUtils/app/otbConvert.cxx
index 2a553a76803cb3b682adfdd8247e8fe05afe2e21..706406e190ace7d4fb198341e3f585dd30a4c6f1 100644
--- a/Modules/Applications/AppImageUtils/app/otbConvert.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbConvert.cxx
@@ -85,7 +85,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Convert");
SetDescription("Convert an image to a different format, optionally rescaling the data"
@@ -192,7 +192,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Read information
if ( HasValue("in") )
@@ -482,7 +482,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
switch ( this->GetParameterOutputImagePixelType("out") )
{
diff --git a/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx b/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx
index 3e79f0ad67be01a4f00562120800bd1df7a90f6e..cee406ad9f6f47ec5fbcbecad72067241582bb52 100644
--- a/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx
@@ -45,7 +45,7 @@ public:
itkTypeMacro(DEMConvert, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DEMConvert");
SetDescription("Converts a geo-referenced DEM image into a general raster file compatible with OTB DEM handling.");
@@ -75,7 +75,7 @@ private:
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// nothing to update
}
@@ -85,7 +85,7 @@ void DoUpdateParameters() ITK_OVERRIDE
* (.ras, .geom and . omd)
*/
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
// Load input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx b/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
index 28d51f406ee07f1cce78c5616864bd8e6bab4b8d..beaf1b516ef0dd1e22e12593dd6f39109b896b59 100644
--- a/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
@@ -85,7 +85,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DynamicConvert");
SetDescription("Change the pixel type and rescale the image's dynamic");
@@ -212,7 +212,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Read information
if ( HasValue("in") )
diff --git a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
index 6bbd121c894926d7c97a5b469f32638e58dff5d6..fd773fe9cad85082d67e2ccd85480823e85c7e44 100644
--- a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
@@ -63,7 +63,7 @@ public:
private:
void
- DoInit() ITK_OVERRIDE
+ DoInit() override
{
SetName("ExtractROI");
SetDescription("Extract a ROI defined by the user.");
@@ -247,7 +247,7 @@ private:
}
void
- DoUpdateParameters() ITK_OVERRIDE
+ DoUpdateParameters() override
{
if ( HasValue("in") )
{
@@ -674,7 +674,7 @@ private:
}
void
- DoExecute() ITK_OVERRIDE
+ DoExecute() override
{
ImageType* inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
index 8f0b43cfece666f796756d4b38fbf934783dc0d9..c38a88f29804fb7462ebb8393958da8ccf9507b9 100644
--- a/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
@@ -58,7 +58,7 @@ public:
typedef otb::ChangeInformationImageFilter<FloatVectorImageType> ChangeInfoFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ManageNoData");
SetDescription("Manage No-Data");
@@ -123,13 +123,13 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inputPtr = this->GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
index 8117e4c165fd95ced9c8d2cec4485508b647d947..15c5e1ea5acc615e114f98a50e95a915df777c9f 100644
--- a/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
@@ -58,7 +58,7 @@ public:
FloatVectorImageType> ShrinkFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("MultiResolutionPyramid");
SetDescription("Build a multi-resolution pyramid of the image.");
@@ -113,14 +113,14 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
// Reinitialize the internal process used
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Initializing the process
m_SmoothingFilter = SmoothingVectorImageFilterType::New();
diff --git a/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
index 03f1351b8dd5d3a11bafa9b1aa4caa2fa18e57c5..80c55244c8de69e0ba860acb9eb91751a06f92c7 100644
--- a/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
@@ -48,7 +48,7 @@ public:
itkTypeMacro(PixelValue, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("PixelValue");
SetDescription("Get the value of a pixel.");
@@ -120,7 +120,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if ( HasValue("in") )
{
@@ -206,7 +206,7 @@ private:
return box;
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
std::string mode = GetParameterString( "mode" );
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx b/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx
index f7f9db4a94e1364db0426c874fa7a65608e9fb89..978740d95ecd1eba022252b3be4bb6818359d026 100644
--- a/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx
@@ -53,7 +53,7 @@ public:
<ExtractROIFilterType::OutputImageType, ExtractROIFilterType::OutputImageType> ShrinkImageFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Quicklook");
SetDescription("Generates a subsampled version of an image extract");
@@ -121,7 +121,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Update the sizes only if the user does not defined a size
if ( HasValue("in") )
@@ -203,7 +203,7 @@ bool CropRegionOfInterest()
return false;
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
InputImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
index 1aabf57ca8acf3b6c1be4e951ba03e56b87ae82a..54e38669174e69349a7be93759944f2e79410b4d 100644
--- a/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
@@ -48,7 +48,7 @@ public:
itkTypeMacro(ReadImageInfo, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ReadImageInfo");
SetDescription("Get information about the image");
@@ -248,12 +248,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
std::ostringstream ossOutput;
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbRescale.cxx b/Modules/Applications/AppImageUtils/app/otbRescale.cxx
index f5c08c80a24bed127fb76e1fbc93f13d54d40915..a94e8440ac341c8a4964734145096686c3b89dcd 100644
--- a/Modules/Applications/AppImageUtils/app/otbRescale.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbRescale.cxx
@@ -49,7 +49,7 @@ public:
typedef otb::VectorRescaleIntensityImageFilter<FloatVectorImageType> RescaleImageFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Rescale");
SetDescription("Rescale the image between two given values.");
@@ -90,12 +90,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx b/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx
index e23eaa57eb5697fc6805aeac63725d69c76f342c..fba6fb7580027a544875ca533104d631593e0a05 100644
--- a/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx
@@ -49,7 +49,7 @@ public:
FloatVectorImageType::InternalPixelType> FilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SplitImage");
SetDescription("Split a N multiband image into N images.");
@@ -83,12 +83,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx b/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx
index 5dd80bc10e6bc37c46f3302b8978272a6be973e7..fd53f599b9ab23dd9f12548e539c84e14cc9cdf8 100644
--- a/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx
@@ -45,7 +45,7 @@ public:
typedef otb::TileImageFilter<FloatVectorImageType> TileFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("TileFusion");
SetDescription("Fusion of an image made of several tile files.");
@@ -80,12 +80,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to be done
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image list
FloatVectorImageListType::Pointer tileList = this->GetParameterImageList("il");
diff --git a/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx b/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx
index 7204d68c7e2dae14ecb4ade41479c0205f6bba44..c9e5bdcb563de7a4d496a69e1d9a7a9af1ebff13 100644
--- a/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx
+++ b/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx
@@ -129,7 +129,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("RadiometricIndices");
SetDescription("Compute radiometric indices.");
@@ -438,7 +438,7 @@ private:
}
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
//Nothing to do here
}
@@ -488,7 +488,7 @@ private:
otbAppLogINFO(<< m_Map[GetSelectedItems("list")[idx]].item << " added.");\
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
int nbChan = GetParameterImage("in")->GetNumberOfComponentsPerPixel();
diff --git a/Modules/Applications/AppKMZ/app/otbKmzExport.cxx b/Modules/Applications/AppKMZ/app/otbKmzExport.cxx
index efda73d3c981aa5015f0a5c573d738eea4b8692d..6d00a5e411f90a1b247bb7928ce84228f53e0f08 100644
--- a/Modules/Applications/AppKMZ/app/otbKmzExport.cxx
+++ b/Modules/Applications/AppKMZ/app/otbKmzExport.cxx
@@ -45,7 +45,7 @@ public:
itkTypeMacro(KmzExport, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("KmzExport");
SetDescription("Export the input image in a KMZ product.");
@@ -91,12 +91,12 @@ private:
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
typedef otb::KmzProductWriter<FloatVectorImageType> KmzProductWriterType;
diff --git a/Modules/Applications/AppMathParser/app/otbBandMath.cxx b/Modules/Applications/AppMathParser/app/otbBandMath.cxx
index 37a9054ec90fca6c5a9cb629d6d5db56608459c1..2503d924eb04d348d1d5062e87195466ce0f1608 100644
--- a/Modules/Applications/AppMathParser/app/otbBandMath.cxx
+++ b/Modules/Applications/AppMathParser/app/otbBandMath.cxx
@@ -53,7 +53,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "BandMath" );
@@ -132,7 +132,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Check if the expression is correctly set
if (HasValue("il"))
@@ -203,7 +203,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image list
FloatVectorImageListType::Pointer inList = GetParameterImageList("il");
diff --git a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
index 90be1a12b3512f386f74760c5e7673cfef4df5ed..f07a4c1af978e6822b669e514e382dad1a3e53c5 100644
--- a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
+++ b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
@@ -55,7 +55,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "BandMathX" );
@@ -251,7 +251,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// check if input context should be used
bool useContext = this->ContextCheck();
@@ -345,7 +345,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image list
FloatVectorImageListType::Pointer inList = GetParameterImageList("il");
diff --git a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
index f04bb70a5a3c81e225704bff1d1dd179c5950d5e..095da8b17f0c1a4bbce2b64ad4dcdb82fe816eea 100644
--- a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
+++ b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
@@ -53,7 +53,7 @@ itkTypeMacro(LocalStatisticExtraction, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("LocalStatisticExtraction");
SetDescription("Computes local statistical moments on every pixel in the selected channel of the input image");
@@ -95,12 +95,12 @@ SetDocExampleParameterValue("out", "Statistics.tif");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx
index c4a59616b605639201acb521129a3d9cd91033e6..dada95c498c8546e5ccf87d5456a58e3f7061df8 100644
--- a/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx
+++ b/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx
@@ -74,7 +74,7 @@ itkTypeMacro(BinaryMorphologicalOperation, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName( "BinaryMorphologicalOperation" );
SetDescription( "Performs morphological operations on an input image channel" );
@@ -183,12 +183,12 @@ SetDocExampleParameterValue("filter", "erode");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx
index e35aad5d0c0361706ad991cd7fcc691a5f699183..1e9a059f6e295a26eb3b0b5836dae23cdb813877 100644
--- a/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx
+++ b/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx
@@ -74,7 +74,7 @@ itkTypeMacro(GrayScaleMorphologicalOperation, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("GrayScaleMorphologicalOperation");
SetDescription("Performs morphological operations on a grayscale input image");
@@ -142,12 +142,12 @@ SetDocExampleParameterValue("filter", "erode");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppMorphology/app/otbMorphologicalClassification.cxx b/Modules/Applications/AppMorphology/app/otbMorphologicalClassification.cxx
index a117a2f178b4739695cc08ce4f50858b3ba988c9..bd47a89c76fa513d62c17a7226df82582de5527b 100644
--- a/Modules/Applications/AppMorphology/app/otbMorphologicalClassification.cxx
+++ b/Modules/Applications/AppMorphology/app/otbMorphologicalClassification.cxx
@@ -70,7 +70,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "MorphologicalClassification" );
SetDescription( "Performs morphological convex, concave and flat "
@@ -153,12 +153,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage( "in" );
diff --git a/Modules/Applications/AppMorphology/app/otbMorphologicalMultiScaleDecomposition.cxx b/Modules/Applications/AppMorphology/app/otbMorphologicalMultiScaleDecomposition.cxx
index fc27fd88fad25b353ece317f50185d287578468d..052e8d9be3cf5eb312f5b542e4a47bec2a3841c4 100644
--- a/Modules/Applications/AppMorphology/app/otbMorphologicalMultiScaleDecomposition.cxx
+++ b/Modules/Applications/AppMorphology/app/otbMorphologicalMultiScaleDecomposition.cxx
@@ -65,7 +65,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "MorphologicalMultiScaleDecomposition" );
SetDescription( "Perform a geodesic morphology based image analysis on an input image channel" );
@@ -155,12 +155,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage( "in" );
int nBComp = inImage->GetNumberOfComponentsPerPixel();
diff --git a/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx b/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
index c314b8d6ac2f8733fe1cfd91e1736a3f6073a910..a7bc15c56bfde1cc0cd1615327be8810a50f9b74 100644
--- a/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
+++ b/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
@@ -71,7 +71,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName( "MorphologicalProfilesAnalysis" );
SetDescription( "Performs morphological profiles analysis on an input image channel." );
@@ -173,12 +173,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage( "in" );
diff --git a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
index 3c843fa5ac6112fb1b3e85442bdb9149c9eddc9b..1bd81011be8314c66bedd7b8dd641ae27b2cae8c 100644
--- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
+++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
@@ -124,7 +124,7 @@ private:
std::string m_inImageName;
bool m_currentEnabledStateOfFluxParam;
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("OpticalCalibration");
SetDescription("Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5, Pleiades, Spot6, Spot7. For other sensors the application also allows providing calibration parameters manually.");
@@ -356,7 +356,7 @@ private:
m_currentEnabledStateOfFluxParam=false;
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
std::ostringstream ossOutput;
//ossOutput << std::endl << "--DoUpdateParameters--" << std::endl;
@@ -560,7 +560,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
//Main filters instantiations
m_ImageToRadianceFilter = ImageToRadianceImageFilterType::New();
diff --git a/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx
index 088428ef667cf4a89e8a47a29fe0baade21b9d56..e1be569af52ef6e8c3673712eadafbf6ae3ec757 100644
--- a/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx
+++ b/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx
@@ -50,7 +50,7 @@ public:
typedef otb::GenericRSTransform<> TransformType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ConvertCartoToGeoPoint");
SetDescription("Convert cartographic coordinates to geographic ones.");
@@ -93,11 +93,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the projectionRef
std::string inputProjRef = MapProjectionParametersHandler::GetProjectionRefFromChoice(this, "mapproj");
diff --git a/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx
index c7e6ee3619254f9e901f058d0b33c46f848b8ab3..51f7ebc29cac09bc0acbc4b9b54c2c10a0fc1b48 100644
--- a/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx
+++ b/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx
@@ -49,7 +49,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ConvertSensorToGeoPoint");
SetDescription("Sensor to geographic coordinates conversion.");
@@ -101,11 +101,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get input Image
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
index 1e3691514c23b39cd9b203a723d09b9817432009..c4b4b58d7df6ef3af0709c14d94012ca1d82f658 100644
--- a/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
+++ b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
@@ -57,7 +57,7 @@ public:
itkTypeMacro(GenerateRPCSensorModel, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("GenerateRPCSensorModel");
SetDescription("Generate a RPC sensor model from a list of Ground Control Points.");
@@ -108,12 +108,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
OGRMultiLineString mls;
diff --git a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
index 750913f778e08afb6417812b9b05f40f8c26b04f..9df8a550f39702db9a5e998496bf898515a4384c 100644
--- a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
+++ b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
@@ -104,7 +104,7 @@ private:
m_DisplacementFieldCaster = DisplacementFieldCastFilterType::New();
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("GridBasedImageResampling");
SetDescription("Resamples an image according to a resampling grid");
@@ -188,12 +188,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
// Get the input image
FloatVectorImageType* inImage = GetParameterImage("io.in");
diff --git a/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx b/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx
index cda6b1fc64307e1a0fabc79c508d934b03156a1c..d276558e6ffff0b7d056cf11f06efe11fe31d763 100644
--- a/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx
+++ b/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx
@@ -49,7 +49,7 @@ public:
<FloatVectorImageType, VectorDataType> EnvelopeFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ImageEnvelope");
SetDescription("Extracts an image envelope.");
@@ -93,12 +93,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to be done
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer input = GetParameterImage("in");
diff --git a/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx
index 0cfa820b268b01b54df2452170129a0d285ad9f8..3e3a0765facc654571e7a0c5d534d6b6f06264f4 100644
--- a/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx
+++ b/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx
@@ -47,11 +47,11 @@ private:
{
}
- ~ObtainUTMZoneFromGeoPoint() ITK_OVERRIDE
+ ~ObtainUTMZoneFromGeoPoint() override
{
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ObtainUTMZoneFromGeoPoint");
SetDescription("UTM zone determination from a geographic point.");
@@ -84,12 +84,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
int utmZone = otb::Utils::GetZoneFromGeoPoint(GetParameterFloat("lon"),
GetParameterFloat("lat"));
diff --git a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
index 5918102d7e096b4a45cf5e23485c0f96951666c7..7fd5b47b89c65369d27805cf8b6886db0f8fb43d 100644
--- a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
+++ b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
@@ -87,7 +87,7 @@ public:
typedef otb::BCOInterpolateImageFunction<FloatVectorImageType> BCOInterpolationType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("OrthoRectification");
std::ostringstream oss;
@@ -237,7 +237,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if (HasValue("io.in"))
{
@@ -601,7 +601,7 @@ private:
} // if (HasValue("io.in"))
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input image
FloatVectorImageType* inImage = GetParameterImage("io.in");
diff --git a/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
index e5829eb1643d79c2ab859eee304960cb8c7b0232..653a4b77b8e278ca2a43336a87a6775640ec8f41 100644
--- a/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
+++ b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
@@ -56,7 +56,7 @@ public:
itkTypeMacro(RefineSensorModel, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("RefineSensorModel");
SetDescription("Perform least-square fit of a sensor model to a set of tie points");
@@ -105,12 +105,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
OGRMultiLineString mls;
diff --git a/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
index 01a9d01124657247bdc64c8933b6047c4cf68bd4..1c1f5f2103c760ba0a7789b64f2525ce6729edba 100644
--- a/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
+++ b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
@@ -80,7 +80,7 @@ public:
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("RigidTransformResample");
SetDescription("Resample an image with a rigid transform");
@@ -176,12 +176,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType* inputImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
index 2f5786587b999d404edf1f2a82f20dd59ab5fd29..df13e6edae2c9e774f839697a63085ca34905c18 100644
--- a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
+++ b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
@@ -81,7 +81,7 @@ public:
FloatVectorImageType> BasicResamplerType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Superimpose");
SetDescription("Using available image metadata, project one image onto another one");
@@ -159,7 +159,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if(!HasUserValue("mode") && HasValue("inr") && HasValue("inm") && otb::PleiadesPToXSAffineTransformCalculator::CanCompute(GetParameterImage("inr"),GetParameterImage("inm")))
{
@@ -169,7 +169,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the inputs
FloatVectorImageType* refImage = GetParameterImage("inr");
diff --git a/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
index fe9e070a8b592c14e2fc63b6d8f16a65e79cd2a7..9d82850935c8c6f9fed0900a21e6ff3e1f2fb97b 100644
--- a/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
+++ b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
@@ -60,7 +60,7 @@ public:
;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDataReprojection");
std::ostringstream oss;
@@ -117,12 +117,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
GetLogger()->Debug("Entering DoExecute\n");
diff --git a/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx b/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx
index 0709ad8007ff37fd6dafd0d3fa6b9a00d59ce738..4eeef9744704ad47d34cbe9afb4e75b77da80c8f 100644
--- a/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx
+++ b/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx
@@ -45,7 +45,7 @@ public:
FloatImageType> CalibrationFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SARCalibration");
SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.\n");
@@ -90,12 +90,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input complex image
ComplexFloatImageType* floatComplexImage = GetParameterComplexFloatImage("in");
diff --git a/Modules/Applications/AppSARCalibration/app/otbSARDeburst.cxx b/Modules/Applications/AppSARCalibration/app/otbSARDeburst.cxx
index 01e09464a313ffdabb1871be4266b8ade73948a0..e86f601529532b4c2dbf0a1c08946a182ce0b754 100644
--- a/Modules/Applications/AppSARCalibration/app/otbSARDeburst.cxx
+++ b/Modules/Applications/AppSARCalibration/app/otbSARDeburst.cxx
@@ -44,7 +44,7 @@ public:
typedef otb::SarDeburstImageFilter<FloatVectorImageType> DeburstFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SARDeburst");
SetDescription("This application performs deburst of Sentinel1 IW SLC images by removing redundant lines.\n");
@@ -88,10 +88,10 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input complex image
FloatVectorImageType* in = GetParameterImage("in");
diff --git a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
index 796d3f4e26a9fd34b7e7891f81846dab6fa95c2a..2a6ccbcf089a62151541d4a69b242edd943003af 100644
--- a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
+++ b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
@@ -84,7 +84,7 @@ public:
itkTypeMacro(SARDecompositions, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SARDecompositions");
SetDescription("From one-band complex images (each one related to an element of the Sinclair matrix), returns the selected decomposition.");
@@ -160,12 +160,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
bool inhv = HasUserValue("inhv");
diff --git a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
index 657643541d477617e13a196a4a2853f76920f569..c6a4122b0bb8c9e36e0ad727bbe839c5566f7fa8 100644
--- a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
+++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
@@ -184,7 +184,7 @@ public:
itkTypeMacro(SARPolarMatrixConvert, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SARPolarMatrixConvert");
SetDescription("This applications allows converting classical polarimetric matrices to each other.");
@@ -356,7 +356,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
int convType = GetParameterInt("conv");
@@ -440,7 +440,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
//****************************************
diff --git a/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx b/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx
index 3db956847e1dba701365e3c1823e8d5370525063..8fb514d814f055b415f186d8b86e88dcc8fd195c 100644
--- a/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx
+++ b/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx
@@ -44,7 +44,7 @@ public:
itkTypeMacro(SARPolarSynth, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("SARPolarSynth");
SetDescription("Gives, for each pixel, the power that would have been received by a SAR system with a basis different from the classical (H,V) one (polarimetric synthetis).");
@@ -154,12 +154,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
m_MCPSFilter = MCPSFilterType::New();
diff --git a/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx b/Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
index ec91b7e53b6c04b398a1e3d854475758d1f9d21e..d6f580b773730ef3c1c28da95c495271f5d4fd8e 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() 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() override
{
}
// DoExecute() contains the application core.
- void DoExecute()
+ void DoExecute() override
{
m_Modulus = ModulusFilterType::New();
m_Phase = PhaseFilterType::New();
diff --git a/Modules/Applications/AppSARUtils/app/otbDespeckle.cxx b/Modules/Applications/AppSARUtils/app/otbDespeckle.cxx
index f469402397ec95185ecdfb5ed8c99009b550b594..e1fd6c833371edd93aebf563691e3494aac945fe 100644
--- a/Modules/Applications/AppSARUtils/app/otbDespeckle.cxx
+++ b/Modules/Applications/AppSARUtils/app/otbDespeckle.cxx
@@ -54,7 +54,7 @@ public:
itkTypeMacro(Despeckle, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Despeckle");
SetDescription("Perform speckle noise reduction on SAR image.");
@@ -167,12 +167,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType* inVImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
index b9bc876f11d21efe230cbbea773c60e99cd78c55..fa1acfa4d9cea51d6bf49a721e88268c945726cd 100644
--- a/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
@@ -69,7 +69,7 @@ public:
<VectorDataType, VectorDataType> VectorDataProjectionFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ConnectedComponentSegmentation");
SetDescription("Connected component segmentation and object based image filtering of the input image according to user-defined criterions.");
@@ -124,12 +124,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
InputVectorImageType::Pointer inputImage = GetParameterImage("in");
diff --git a/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx
index 7588f4eb873b073f9c101ce568b1c6c0c941ba67..34d62c2ecbeba6d40f0cca68a49d017553c3ccf4 100644
--- a/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx
@@ -130,7 +130,7 @@ public:
<FloatPixelType, Int16PixelType> > HooverColorFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("HooverCompareSegmentation");
SetDescription("Compare two segmentations with Hoover metrics");
@@ -202,12 +202,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
UInt32ImageType::Pointer inputGT = GetParameterUInt32Image("ingt");
UInt32ImageType::Pointer inputMS = GetParameterUInt32Image("inms");
diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
index 280faee001b8f12462b2799e26a0e187572c4027..1d1fe5e17c187f1a1f92a72ccea9287990fd576e 100644
--- a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
@@ -90,7 +90,7 @@ public:
LSMSSegmentation(): m_FinalReader(),m_ImportGeoInformationFilter(),m_FilesToRemoveAfterExecute(),m_TmpDirCleanup(false){}
- ~LSMSSegmentation() ITK_OVERRIDE{}
+ ~LSMSSegmentation() override{}
private:
LabelImageReaderType::Pointer m_FinalReader;
@@ -214,7 +214,7 @@ private:
return vrtfname;
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("LSMSSegmentation");
SetDescription("This application performs the second step of the exact Large-Scale Mean-Shift segmentation workflow (LSMS) [1].");
@@ -319,11 +319,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
m_FilesToRemoveAfterExecute.clear();
@@ -718,7 +718,7 @@ private:
SetParameterOutputImage("out",m_ImportGeoInformationFilter->GetOutput());
}
- void AfterExecuteAndWriteOutputs() ITK_OVERRIDE
+ void AfterExecuteAndWriteOutputs() override
{
// Release input files
m_FinalReader = ITK_NULLPTR;
diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
index 14c8354a143503d61ddbc3680512d5eb6ccb5143..afda10be1c517d130f6bce3162fae18681ed3172 100644
--- a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
@@ -73,7 +73,7 @@ public:
private:
ChangeLabelImageFilterType::Pointer m_ChangeLabelFilter;
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("LSMSSmallRegionsMerging");
SetDescription("This application performs the third (optional) step of the exact Large-Scale Mean-Shift segmentation workflow [1].");
@@ -144,11 +144,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
clock_t tic = clock();
diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx
index 166b87141dc47b313e1eb5b388f55cbfd2dccb01..9881309a6b921cadf3de84dcf428dfd563513879 100644
--- a/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx
@@ -66,7 +66,7 @@ public:
itkTypeMacro(Vectorization, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("LSMSVectorization");
SetDescription("This application performs the fourth step of the exact Large-Scale Mean-Shift segmentation workflow [1].");
@@ -124,11 +124,11 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
clock_t tic = clock();
diff --git a/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx b/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx
index 05ca673b6434030bab8d22067c9fcdc7219f4eaf..4422d5096f61414a4ecf9f9f7897453d9a41767d 100644
--- a/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx
@@ -50,7 +50,7 @@ public:
itkTypeMacro(LargeScaleMeanShift, otb::CompositeApplication);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("LargeScaleMeanShift");
SetDescription("Large-scale segmentation using MeanShift");
@@ -152,10 +152,10 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
bool isVector(GetParameterString("mode") == "vector");
std::string outPath(isVector ?
diff --git a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
index d8980392b05ebf8fc2694057e59bda0554de7239..3b8dca5976ca3ca7c8ee1fba11e4efa1b42e8563 100644
--- a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
@@ -46,7 +46,7 @@ public:
itkTypeMacro(MeanShiftSmoothing, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("MeanShiftSmoothing");
SetDescription("This application smooths an image using the MeanShift algorithm.");
@@ -174,10 +174,10 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType* input = GetParameterImage("in");
diff --git a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
index 6978349e6401c67aebf778455263f373f64ff3cb..2e86378055b27049db5842abe36e7170d2555a46 100644
--- a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
@@ -137,7 +137,7 @@ public:
itkTypeMacro(Segmentation, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Segmentation");
SetDescription("Performs segmentation of an image, and output either a raster or a vector file. In vector mode, large input datasets are supported.");
@@ -344,7 +344,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
@@ -453,7 +453,7 @@ private:
return streamingVectorizedFilter->GetStreamSize();
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Switch on segmentation mode
const std::string segModeType = GetParameterString("mode");
diff --git a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
index 41c9257ac04acd9256df53ad382608a17f26110b..138da7fef51fbf90a67e9fc92d4115dad34b68a2 100644
--- a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
+++ b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
@@ -124,7 +124,7 @@ private:
m_VMedianFilter = MedianFilterType::New();
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("BlockMatching");
SetDescription("Performs block-matching to estimate pixel-wise disparities"
@@ -425,7 +425,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if(IsParameterEnabled("mask.variancet") || IsParameterEnabled("mask.nodata"))
{
@@ -458,7 +458,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatImageType::Pointer leftImage = GetParameterFloatImage("io.inleft");
FloatImageType::Pointer rightImage = GetParameterFloatImage("io.inright");
diff --git a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
index 25e4b96189fc1549b2875f9e55c255a75611cd38..551ad0f1e4b267f87d2b57659ee9e27df61c88c5 100644
--- a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
+++ b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
@@ -62,7 +62,7 @@ private:
m_DispToElev = DisparityToElevationFilterType::New();
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("DisparityMapToElevationMap");
SetDescription("Projects a disparity map into a regular elevation map.");
@@ -163,12 +163,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer inputDisp = this->GetParameterImage("io.in");
FloatVectorImageType::Pointer sensorLeft = this->GetParameterImage("io.left");
diff --git a/Modules/Applications/AppStereo/app/otbFineRegistration.cxx b/Modules/Applications/AppStereo/app/otbFineRegistration.cxx
index a7fed89a0e400d60eeeae15067c35f10e9e76293..64bf6ca0e4fc62c24b6c200dde2eb2b72b29ddf9 100644
--- a/Modules/Applications/AppStereo/app/otbFineRegistration.cxx
+++ b/Modules/Applications/AppStereo/app/otbFineRegistration.cxx
@@ -114,7 +114,7 @@ public:
typedef otb::ImageFileReader<VectorImageType> InternalReaderType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("FineRegistration");
SetDescription("Estimate disparity map between two images.");
@@ -266,12 +266,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
FloatVectorImageType::Pointer refImage = GetParameterImage("ref"); // fixed
FloatVectorImageType::Pointer secImage = GetParameterImage("sec"); // moved
diff --git a/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx b/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx
index 928b1da3e6f9303a2c72fb39ce97e335e063abd1..4f1fce4ee29c2307c2c60dc6a6a01acaeb328d80 100644
--- a/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx
+++ b/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx
@@ -52,7 +52,7 @@ public:
private:
GeneratePlyFile(){}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("GeneratePlyFile");
SetDescription("Generate a 3D Ply file from a DEM and a color image.");
@@ -115,13 +115,13 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Update the UTM zone params
MapProjectionParametersHandler::InitializeUTMParameters(this, "incolor", "map");
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
std::string outfname = GetParameterString("out");
diff --git a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
index b077adb1abdae581bc2c5ade1c51828fa5ea0aae..01cd7ad687b9bbb284a0287554f4572cce7c526c 100644
--- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
+++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
@@ -311,7 +311,7 @@ private:
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
// TODO : implement this application as a CompositeApplication...
SetName("StereoFramework");
@@ -580,7 +580,7 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
if( HasValue("input.il") )
{
@@ -646,7 +646,7 @@ private:
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Setup the DSM Handler
otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this, "elev");
diff --git a/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
index 616594a6bb40d025e53535a344b3e4fadea294e0..c95a08e1d4e0dd52eca5480dac962ea8f2e598e4 100644
--- a/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
+++ b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
@@ -99,7 +99,7 @@ private:
m_StatisticsFilter = StatisticsFilterType::New();
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("StereoRectificationGridGenerator");
SetDescription("Generates two deformation fields to resample in epipolar "
@@ -249,12 +249,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
m_DisplacementFieldSource->SetLeftImage(GetParameterImage("io.inleft"));
m_DisplacementFieldSource->SetRightImage(GetParameterImage("io.inright"));
diff --git a/Modules/Applications/AppTest/app/otbTestApplication.cxx b/Modules/Applications/AppTest/app/otbTestApplication.cxx
index 4407d76ed36a5da9f329b31edd215ba6ebcbaaca..42f11fb32742a8f606a53f762b72516e3acde470 100644
--- a/Modules/Applications/AppTest/app/otbTestApplication.cxx
+++ b/Modules/Applications/AppTest/app/otbTestApplication.cxx
@@ -42,7 +42,7 @@ public:
itkTypeMacro(TestApplication, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("TestApplication");
SetDescription("This application helps developers to test parameters types");
@@ -113,10 +113,10 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
if( HasValue("il") && IsParameterEnabled("il") )
{
diff --git a/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
index 43e6b0b0e1e69e44a6eac18428c299e2bbe5e316..fdf5f44e7c3f5c48e362711a2162c578878fa083 100644
--- a/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
+++ b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
@@ -67,7 +67,7 @@ itkTypeMacro(HaralickTextureExtraction, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("HaralickTextureExtraction");
SetDescription("Computes Haralick textural features on the selected channel of the input image");
@@ -192,12 +192,12 @@ SetDocExampleParameterValue("out", "HaralickTextures.tif");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
index 94fcc42905368aaf7678202968ae887d4b930d1f..13ade82049253a6e60d39e36e34b126b735ea904 100644
--- a/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
+++ b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
@@ -56,7 +56,7 @@ itkTypeMacro(SFSTextureExtraction, otb::Application);
private:
-void DoInit() ITK_OVERRIDE
+void DoInit() override
{
SetName("SFSTextureExtraction");
SetDescription("Computes Structural Feature Set textures on every pixel of the "
@@ -129,12 +129,12 @@ SetDocExampleParameterValue("out", "SFSTextures.tif");
SetOfficialDocLink();
}
-void DoUpdateParameters() ITK_OVERRIDE
+void DoUpdateParameters() override
{
// Nothing to do here : all parameters are independent
}
-void DoExecute() ITK_OVERRIDE
+void DoExecute() override
{
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
inImage->UpdateOutputInformation();
diff --git a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
index 9ddef6c295fc4d12a2d60cbeeef7e1242c73be61..4c0b30ae6e11e01f744a51d04c51cf46e76aa907 100644
--- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
+++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
@@ -60,7 +60,7 @@ public:
typedef otb::OGRDataSourceToLabelImageFilter<FloatImageType> OGRDataSourceToMapFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("Rasterization");
SetDescription("Rasterize a vector dataset.");
@@ -144,13 +144,13 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
otb::ogr::DataSource::Pointer ogrDS;
UInt8ImageType::Pointer referenceImage;
diff --git a/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx b/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx
index 92b972eafc02587d0636bdfaf3771625b8824beb..d8b51471a3444be2777efbbb4be56c9bf8d4795e 100644
--- a/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx
+++ b/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx
@@ -47,7 +47,7 @@ public:
typedef otb::ConcatenateVectorDataFilter<VectorDataType> ConcatenateFilterType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("ConcatenateVectorData");
SetDescription("Concatenate vector data files");
@@ -81,12 +81,12 @@ private:
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the input VectorData list
VectorDataListType* vectorDataList = GetParameterVectorDataList("vd");
diff --git a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
index ba625b5f4862f0f0377ee4d0f082193dcd0815e7..389b0f0cf0c19e09f5d3eb2473568eb0fb47e2f7 100644
--- a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
+++ b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
@@ -50,7 +50,7 @@ public:
typedef otb::OSMDataToVectorDataGenerator VectorDataProviderType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("OSMDownloader");
SetDescription("Download vector data from OSM and store it to file");
@@ -112,7 +112,7 @@ private:
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// CASE: when the -print option is not required and the User
// does not set the option OSMKey or the option Output or does not
@@ -129,7 +129,7 @@ private:
}
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
typedef otb::ImageToEnvelopeVectorDataFilter<FloatVectorImageType, VectorDataType>
EnvelopeFilterType;
diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx
index 1b4e8c8bf7cb404e6e117735310b24059d63f538..de6f6f9db7b816dd86f6f73645915cac9ded4778 100644
--- a/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx
+++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx
@@ -65,7 +65,7 @@ public:
typedef otb::RemoteSensingRegion<double> RemoteSensingRegionType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDataExtractROI");
SetDescription("Perform an extract ROI on the input vector data according to the input image extent");
@@ -106,12 +106,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do here for the parameters : all are independent
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the inputs
VectorDataType* vd = GetParameterVectorData("io.vd");
diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx
index 696a48a7f2dd1f29f8a7b609be96f85d2b8c1344..21d09e16cea1076610cb3f65f45e709b9febfa9d 100644
--- a/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx
+++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx
@@ -43,7 +43,7 @@ public:
itkTypeMacro(VectorDataSetField, otb::Application);
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDataSetField");
SetDescription("Set a field in vector data.");
@@ -76,12 +76,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// Nothing to do (for now)
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
m_InputData = GetParameterVectorData("in");
diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx
index be163190893c063b32711abab1f45f8c77e67d13..ba4614d77b0cf1852dac326d721e334d98d878bc 100644
--- a/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx
+++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx
@@ -54,7 +54,7 @@ public:
typedef itk::CenteredSimilarity2DTransform<double> TransformType;
private:
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
SetName("VectorDataTransform");
SetDescription("Apply a transform to each vertex of the input VectorData");
@@ -129,12 +129,12 @@ private:
SetOfficialDocLink();
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
// nothing to update
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
// Get the support image
FloatVectorImageType* inImage = GetParameterImage("in");
diff --git a/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h b/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
index ba7fc9601fb30cc21c925ac51d8e6c97ecd0d377..0132979d2fbb9f76e939abf7894f9aea1b4ef339 100644
--- a/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
+++ b/Modules/Core/CommandLineParser/include/otbCommandLineArgumentParser.h
@@ -140,7 +140,7 @@ public:
// const char *GetOptionParameter(const char *option, unsigned int number = 0);
int GetNumberOfParameters(const std::string& option);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
#define otbGetParameterMacro(name, type) \
virtual type GetParameter ## name (const std::string& option, unsigned int number = 0) const \
@@ -170,7 +170,7 @@ public:
protected:
CommandLineArgumentParseResult();
- ~CommandLineArgumentParseResult() ITK_OVERRIDE;
+ ~CommandLineArgumentParseResult() override;
private:
template<typename TypeValeur>
@@ -254,7 +254,7 @@ public:
protected:
CommandLineArgumentParser();
- ~CommandLineArgumentParser() ITK_OVERRIDE;
+ ~CommandLineArgumentParser() override;
private:
diff --git a/Modules/Core/Common/include/otbChannelSelectorFunctor.h b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
index d1cf2304d92a961127f83600edb4b57a4b14f991..f758fb7b2a3d4e5d4ceb508af5a9c43ddfa7bc2f 100644
--- a/Modules/Core/Common/include/otbChannelSelectorFunctor.h
+++ b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
@@ -248,7 +248,7 @@ protected:
}
/** Destructor */
- ~ChannelSelectorFunctor() ITK_OVERRIDE {}
+ ~ChannelSelectorFunctor() override {}
private:
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index c9e553703b6105cf5491b0b717c521c29f8a71eb..14e61cb8109e1ff9056e9f83d81017cfdd5047f3 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -48,9 +48,9 @@ protected:
public:
typedef const TFilter * FilterPointer;
- void Execute(itk::Object *caller, const itk::EventObject& event) ITK_OVERRIDE;
+ void Execute(itk::Object *caller, const itk::EventObject& event) override;
- void Execute(const itk::Object * object, const itk::EventObject& event) ITK_OVERRIDE;
+ void Execute(const itk::Object * object, const itk::EventObject& event) override;
};
} // end namespace otb
diff --git a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
index e98900b9c3169382f04e6db29aa4be3b95018acb..a3faddf351878151e4ae6d5bc5f9efd42e7c2bf0 100644
--- a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
+++ b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
@@ -99,7 +99,7 @@ public:
protected:
ComplexToIntensityImageFilter() {}
- ~ComplexToIntensityImageFilter() ITK_OVERRIDE {}
+ ~ComplexToIntensityImageFilter() override {}
private:
ComplexToIntensityImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
index 377f537ee0b40732381092abc4a95007f4c7c0db..85598ccecb2531dd6a877ee90d040b4783445952 100644
--- a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
+++ b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
@@ -140,7 +140,7 @@ public:
protected:
ComplexToVectorImageCastFilter() {}
- ~ComplexToVectorImageCastFilter() ITK_OVERRIDE {}
+ ~ComplexToVectorImageCastFilter() override {}
template<class T>
bool PixelIsSingle(const T& /*dummy*/)
@@ -154,7 +154,7 @@ protected:
return false;
}
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
InputPixelType dummy;
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
index 49dc8e5df19a5f952ec2f16eda5bd13a9b0deb18..1112606acaf981d26dd9934864352ffd54434c71 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.h
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.h
@@ -140,9 +140,9 @@ public:
protected:
DotProductImageFilter();
- ~DotProductImageFilter() ITK_OVERRIDE {}
+ ~DotProductImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DotProductImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index a126c9c3d1ef80a9b48f8d4c3def985c85c03c7d..29098833a9a38e56cd7218145887f4ebf27fafe9 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -108,11 +108,11 @@ public:
protected:
FunctionToImageFilter();
- ~FunctionToImageFilter() ITK_OVERRIDE {}
+ ~FunctionToImageFilter() override {}
/** Validate the presence of all three inputs. If one or more inputs
* are missing, throw an exception. */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** SpatialFunctionImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -125,7 +125,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
FunctionToImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index d5e32b6564fe7903723d88f76a903395f99fd673..060b01ba29d41ce91d0980157745d31297b2e873 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -163,7 +163,7 @@ public:
/** Set the input images of this process object. */
using Superclass::SetInput;
- void SetInput(const InputImageType *input) ITK_OVERRIDE;
+ void SetInput(const InputImageType *input) override;
void SetVectorInput(const VectorInputImageType *input);
/** Get the input images of this process object. */
@@ -215,12 +215,12 @@ public:
protected:
ImageAndVectorImageOperationFilter();
- ~ImageAndVectorImageOperationFilter() ITK_OVERRIDE;
+ ~ImageAndVectorImageOperationFilter() override;
/** This is a source, so it must set the spacing, size, and largest possible
* region for the output image that it will produce.
* \sa ProcessObject::GenerateOutputInformation() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
ImageAndVectorImageOperationFilter(const ImageAndVectorImageOperationFilter &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 3d65acecdc627ee0c8e514123d1270772e26f873..91bdde52147caa8a9d460e498a3d4a2ea0006467 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -123,16 +123,16 @@ public:
* necessary.
*/
unsigned int GetNumberOfSplits(const RegionType& region,
- unsigned int requestedNumber) ITK_OVERRIDE;
+ unsigned int requestedNumber) override;
/** Calling this method will set the image region and the requested
* number of splits, and call the EstimateSplitMap() method if
* necessary. */
RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType& region) ITK_OVERRIDE;
+ const RegionType& region) override;
/** Make the Modified() method update the IsUpToDate flag */
- void Modified() const ITK_OVERRIDE
+ void Modified() const override
{
// Call superclass implementation
Superclass::Modified();
@@ -149,8 +149,8 @@ protected:
m_IsUpToDate(false)
{}
- ~ImageRegionAdaptativeSplitter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageRegionAdaptativeSplitter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** This methods actually estimate the split map and stores it in a
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
index 497122f769051da7170d6b226e9489ab63771084..dfd3132fb6017f4df1a3cc182951f745aef5b006 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -97,18 +97,18 @@ public:
* method returns a number less than or equal to the requested number
* of pieces. */
unsigned int GetNumberOfSplits(const RegionType& region,
- unsigned int requestedNumber) ITK_OVERRIDE;
+ unsigned int requestedNumber) override;
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType& region) ITK_OVERRIDE;
+ const RegionType& region) override;
protected:
ImageRegionNonUniformMultidimensionalSplitter() {}
- ~ImageRegionNonUniformMultidimensionalSplitter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageRegionNonUniformMultidimensionalSplitter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageRegionNonUniformMultidimensionalSplitter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
index 3665210b5db9d99a7d431302ef747a3d3bf670b7..a26e4f826963c360cd4cd4f1d4c5bd7f356bcbe3 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
@@ -113,13 +113,13 @@ public:
* a certain dimensions, then some splits will not be possible.
*/
unsigned int GetNumberOfSplits(const RegionType& region,
- unsigned int requestedNumber) ITK_OVERRIDE;
+ unsigned int requestedNumber) override;
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType& region) ITK_OVERRIDE;
+ const RegionType& region) override;
itkGetMacro(TileSizeAlignment, unsigned int);
itkSetMacro(TileSizeAlignment, unsigned int);
@@ -128,8 +128,8 @@ public:
protected:
ImageRegionSquareTileSplitter() : m_SplitsPerDimension(0U), m_TileDimension(0), m_TileSizeAlignment(16) {}
- ~ImageRegionSquareTileSplitter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageRegionSquareTileSplitter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageRegionSquareTileSplitter(const ImageRegionSquareTileSplitter &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
index d8dd4dc0bc9017955c797ba4da7b38af5016ccd6..091ff9e88f159a5ebd09a42065711671e625bca9 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
@@ -114,18 +114,18 @@ public:
* method returns a number less than or equal to the requested number
* of pieces. */
unsigned int GetNumberOfSplits(const RegionType& region,
- unsigned int requestedNumber) ITK_OVERRIDE;
+ unsigned int requestedNumber) override;
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType& region) ITK_OVERRIDE;
+ const RegionType& region) override;
protected:
ImageRegionTileMapSplitter() : m_AlignStep(256){}
- ~ImageRegionTileMapSplitter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageRegionTileMapSplitter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageRegionTileMapSplitter(const ImageRegionTileMapSplitter &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
index f6cc79abffbcf280be0d202a13781e62f6801f72..32192a68331ffd3c7aa19365f2eaf742a48fdbcb 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
@@ -86,12 +86,12 @@ public:
/** Return the output image direction */
OutputImageDirectionType * GetOutputDirection();
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
protected:
ImageToModulusAndDirectionImageFilter();
- ~ImageToModulusAndDirectionImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageToModulusAndDirectionImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToModulusAndDirectionImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
index 9ee44c5a2dbb28644a9298c7bcae2a7c5cd93679..26e99427a92c0c9dc4fdcb57b46bb2e9368f8ca0 100644
--- a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
+++ b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
@@ -92,7 +92,7 @@ public:
protected:
ImaginaryImageToComplexImageFilter() {}
- ~ImaginaryImageToComplexImageFilter() ITK_OVERRIDE {}
+ ~ImaginaryImageToComplexImageFilter() override {}
private:
ImaginaryImageToComplexImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
index 9f21873c3c5c8a57fe4f5132577a3737f551c519..4965422f0665652b2af5c59b5ecefb7bf94fdea4 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.h
+++ b/Modules/Core/Common/include/otbImportImageFilter.h
@@ -143,26 +143,26 @@ public:
protected:
ImportImageFilter();
- ~ImportImageFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImportImageFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** This filter does not actually "produce" any data, rather it "wraps"
* the user supplied data into an itk::Image. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** This is a source, so it must set the spacing, size, and largest possible
* region for the output image that it will produce.
* \sa ProcessObject::GenerateOutputInformation() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** This filter can only produce the amount of data that it is given,
- * so we must ITK_OVERRIDE ProcessObject::EnlargeOutputRequestedRegion()
+ * so we must override ProcessObject::EnlargeOutputRequestedRegion()
* (The default implementation of a source produces the amount of
* data requested. This source, however, can only produce what it is
* given.)
*
* \sa ProcessObject::EnlargeOutputRequestedRegion() */
- void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject *output) override;
private:
ImportImageFilter(const ImportImageFilter &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
index c7db035c2581d9d555eab57be384e855b71a48c6..b333f99ac9fbeb9c004b87de0dfe1cfdc99db5b5 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.h
@@ -160,7 +160,7 @@ protected:
virtual void GenerateOutputInformation();
/** This filter can only produce the amount of data that it is given,
- * so we must ITK_OVERRIDE ProcessObject::EnlargeOutputRequestedRegion()
+ * so we must override ProcessObject::EnlargeOutputRequestedRegion()
* (The default implementation of a source produces the amount of
* data requested. This source, however, can only produce what it is
* given.)
diff --git a/Modules/Core/Common/include/otbLogger.h b/Modules/Core/Common/include/otbLogger.h
index 3e69d173c0a9c75c0451919930fb3068b25b66e2..d252a93d3116f3d132698dd0dd96c363b82e1e12 100644
--- a/Modules/Core/Common/include/otbLogger.h
+++ b/Modules/Core/Common/include/otbLogger.h
@@ -49,7 +49,7 @@ public:
itkNewMacro(Self);
// Overwrite this to provide custom formatting of log entries
- std::string BuildFormattedEntry(itk::Logger::PriorityLevelType, std::string const&) ITK_OVERRIDE;
+ std::string BuildFormattedEntry(itk::Logger::PriorityLevelType, std::string const&) override;
void LogSetupInformation();
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index 1bb6180576b50fc517e10733d56c261981a0c944..758c887ac9cd301aa6187b831c06d02228623079 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -130,8 +130,8 @@ public:
protected:
ModelComponentBase();
- ~ModelComponentBase() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ModelComponentBase() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
virtual void GenerateData();
diff --git a/Modules/Core/Common/include/otbModelComponentBase.txx b/Modules/Core/Common/include/otbModelComponentBase.txx
index ff48935796f1178550e1637bd37bf407256fe5e5..74bf396ded0ee54cc40ca1bdf5239a9e4ef9dbd6 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.txx
+++ b/Modules/Core/Common/include/otbModelComponentBase.txx
@@ -188,7 +188,7 @@ void
ModelComponentBase<TSample>
::GenerateData()
{
- /** subclasses should ITK_OVERRIDE this function to perform
+ /** subclasses should override this function to perform
* parameter estimation. But it allows switching m_SampleModified
* when necessary.
*/
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index cf3a1d8b272a53dfa82e729f7c2ee12980df9b0f..0373dbf769d80e83d4c1dfc3db3fedf4da7d83c2 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -142,11 +142,11 @@ public:
protected:
QuaternaryFunctorImageFilter();
- ~QuaternaryFunctorImageFilter() ITK_OVERRIDE {}
+ ~QuaternaryFunctorImageFilter() override {}
/** Validate the presence of all three inputs. If one or more inputs
* are missing, throw an exception. */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** QuaternaryFunctorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -159,7 +159,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
QuaternaryFunctorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
index 8384c3c81522ec2c3cbbfed51a1a9545ea7c5956..45741fb683821c4d4abe239eeaa363b7af005afb 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
@@ -66,8 +66,8 @@ public:
protected:
RGBAPixelConverter(){}
- ~RGBAPixelConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~RGBAPixelConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
@@ -103,8 +103,8 @@ public:
protected:
RGBAPixelConverter(){}
- ~RGBAPixelConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~RGBAPixelConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
@@ -140,8 +140,8 @@ public:
protected:
RGBAPixelConverter(){}
- ~RGBAPixelConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~RGBAPixelConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Common/include/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
index b5da22fd45c6146ead97a8113458bc2b564f3c79..17a90c6c29b538c57126ab1b7f93e8fa19c06868 100644
--- a/Modules/Core/Common/include/otbRectangle.h
+++ b/Modules/Core/Common/include/otbRectangle.h
@@ -100,10 +100,10 @@ protected:
};
/** Destructor */
- ~Rectangle() ITK_OVERRIDE {}
+ ~Rectangle() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** */
virtual double ComputeEuclideanDistanceMetricToSegment(VertexType q1, VertexType q2, VertexType p) const;
diff --git a/Modules/Core/Common/include/otbStandardFilterWatcher.h b/Modules/Core/Common/include/otbStandardFilterWatcher.h
index 2e4670bc86c04622cf4b5e4c0ae0468f4a2db866..f9216d5077b0657450c879bd3eabc16f478fa6d9 100644
--- a/Modules/Core/Common/include/otbStandardFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardFilterWatcher.h
@@ -83,13 +83,13 @@ public:
protected:
/** Callback method to show the ProgressEvent */
- void ShowProgress() ITK_OVERRIDE;
+ void ShowProgress() override;
/** Callback method to show the StartEvent */
- void StartFilter() ITK_OVERRIDE;
+ void StartFilter() override;
/** Callback method to show the EndEvent */
- void EndFilter() ITK_OVERRIDE;
+ void EndFilter() override;
private:
diff --git a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
index 0f7ba0fe6ab6fecdab2de992374aae17f778720a..9ee3992b0b04f1de5d28226ba49d904dc063a31d 100644
--- a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
@@ -77,13 +77,13 @@ public:
protected:
/** Callback method to show the ProgressEvent */
- void ShowProgress() ITK_OVERRIDE;
+ void ShowProgress() override;
/** Callback method to show the StartEvent */
- void StartFilter() ITK_OVERRIDE;
+ void StartFilter() override;
/** Callback method to show the EndEvent */
- void EndFilter() ITK_OVERRIDE;
+ void EndFilter() override;
private:
diff --git a/Modules/Core/Common/include/otbStandardWriterWatcher.h b/Modules/Core/Common/include/otbStandardWriterWatcher.h
index b66b1997925d126b7af27feabc7d99339ff47a13..ab3936d9b7a85bf5ee96e246b7103c97d01c0074 100644
--- a/Modules/Core/Common/include/otbStandardWriterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardWriterWatcher.h
@@ -87,22 +87,22 @@ public:
protected:
/** Callback method to show the ProgressEvent */
- void ShowWriterProgress() ITK_OVERRIDE;
+ void ShowWriterProgress() override;
/** Callback method to show the StartEvent */
- void StartWriter() ITK_OVERRIDE;
+ void StartWriter() override;
/** Callback method to show the EndEvent */
- void EndWriter() ITK_OVERRIDE;
+ void EndWriter() override;
/** Callback method to show the ProgressEvent */
- void ShowFilterProgress() ITK_OVERRIDE;
+ void ShowFilterProgress() override;
/** Callback method to show the StartEvent */
- void StartFilter() ITK_OVERRIDE {}
+ void StartFilter() override {}
/** Callback method to show the EndEvent */
- void EndFilter() ITK_OVERRIDE {}
+ void EndFilter() override {}
/** This is the method invoked by ShowFilterProgress() and ShowWriterProgress() */
virtual void ShowProgress();
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
index 8301929fd1fb441372de6ce178827b294ace920c..1b80e8f8cff93230da6967a209d80199873596d4 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
@@ -166,7 +166,7 @@ public:
/** Set the index.
* It is moved to the next available (usable) index.
* \sa GetIndex */
- void SetIndex(const IndexType& ind) ITK_OVERRIDE;
+ void SetIndex(const IndexType& ind) override;
/** Get the Index. */
IndexType GetIndex() const
diff --git a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
index 2217de58baf54d756792382afc2c6080ccda5ddd..bfffcd8ad244755abaf5343309b70c03cb021810 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
@@ -58,7 +58,7 @@ public:
protected:
UnaryFunctorImageFilter() {};
- ~UnaryFunctorImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorImageFilter() override {}
/** UnaryFunctorImageFilter can produce an image which has a different number of bands
* than its input image. As such, UnaryFunctorImageFilter
@@ -68,7 +68,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index e38717f813bcf96bff0bb80f5f95997613d15610..bdd7dfbf72e33bdb706b63b71357a7e08908414e 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -108,7 +108,7 @@ public:
protected:
UnaryFunctorNeighborhoodVectorImageFilter();
- ~UnaryFunctorNeighborhoodVectorImageFilter() ITK_OVERRIDE { }
+ ~UnaryFunctorNeighborhoodVectorImageFilter() override { }
/** UnaryFunctorNeighborhoodVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -121,13 +121,13 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
* this method to set the proper number of component on the filter output.
*/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
RadiusType m_Radius;
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index b83b659424aff4f3d53e8a968eb6fc391fc363a0..cd24feafdf3e0c5db8e89404a8fcaccb3d84e8e5 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -93,7 +93,7 @@ public:
protected:
UnaryFunctorVectorImageFilter();
- ~UnaryFunctorVectorImageFilter() ITK_OVERRIDE { }
+ ~UnaryFunctorVectorImageFilter() override { }
/** UnaryFunctorVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -106,13 +106,13 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
* this method to set the proper number of component on the filter output.
*/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
private:
UnaryFunctorVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index edd0854c39eecc0e8ce15fe885122b156dcb95b5..ddaeca2e00b2ff946da0016ae9b9c8be5d8e884a 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -111,7 +111,7 @@ protected:
/**
* Destructor
*/
- ~UnaryFunctorWithIndexWithOutputSizeImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorWithIndexWithOutputSizeImageFilter() override {}
/** UnaryFunctorWithIndexWithOutputSizeImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -123,12 +123,12 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* Pad the input requested region by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** UnaryFunctorWithIndexWithOutputSizeImageFilter can produce an image which has a different number of bands
* than its input image. As such, UnaryFunctorImageFilter
@@ -138,7 +138,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
index 365df014e7b43a4cdd330b4a7141f22628e656f5..79c0c9718c6300bddefbba01e23fb8601dea4d82 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
@@ -73,8 +73,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Attempt to use inexistant implementation of the converter!"
@@ -116,8 +116,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Attempt to use inexistant implementation of the converter!"
@@ -157,8 +157,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Converter: std::vector<std::vector<RealType>> => VariableLengthVector<RealType>"
@@ -198,8 +198,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Converter: std::vector<std::vector<std::complex<RealType>>> => VariableLengthVector<RealType>"
@@ -239,8 +239,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Converter: itk::FixedArray<RealType, VArrayDimension> => VariableLengthVector<RealType>"
@@ -279,8 +279,8 @@ public:
protected:
VariableLengthVectorConverter(){}
- ~VariableLengthVectorConverter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~VariableLengthVectorConverter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << "Converter: itk::Statistics::Histogram<RealType, VMeasurementVectorSize, TFrequencyContainer> => VariableLengthVector<RealType>"
diff --git a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
index 36844c6136b3036de508cce021d167f5213f7270..9fa9bb3bc4927a48715f5763dddd45a6619f3479 100644
--- a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
+++ b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
@@ -66,7 +66,7 @@ public:
protected:
VectorImageToASImageAdaptor() {}
- ~VectorImageToASImageAdaptor() ITK_OVERRIDE {}
+ ~VectorImageToASImageAdaptor() override {}
private:
VectorImageToASImageAdaptor(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index 52f45375d65a95ca0a8fe8ffba5159edce928334..e094ef471a3382b3062b8803a015c2c7f090bf52 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -80,17 +80,17 @@ public:
OutputImageType::ImageDimension);
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
protected:
ExtractROI();
- ~ExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ExtractROI
*
* \sa ExtractROIBase::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
ExtractROI(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index 6fbe6ed2947b25b536b192d510ec578c8d787fce..07906dfe078b6c7d90bb3885a645f765088e14dd 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -108,10 +108,10 @@ public:
protected:
ExtractROIBase();
- ~ExtractROIBase() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ExtractROIBase() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** ExtractROIBase can produce an image which is a different
* resolution than its input image. As such, ExtractROIBase
@@ -121,7 +121,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** This function calls the actual region copier to do the mapping from
* output image space to input image space. It uses a
@@ -134,7 +134,7 @@ protected:
*
* \sa ImageToImageFilter::CallCopyRegion() */
void CallCopyOutputRegionToInputRegion(InputImageRegionType& destRegion,
- const OutputImageRegionType& srcRegion) ITK_OVERRIDE;
+ const OutputImageRegionType& srcRegion) override;
/** ExtractROIBase can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData()
@@ -149,7 +149,7 @@ protected:
// ATTENTION bizarre
void ThreadedGenerateData(const OutputImageRegionType& /*outputRegionForThread*/,
- itk::ThreadIdType /*threadId*/) ITK_OVERRIDE
+ itk::ThreadIdType /*threadId*/) override
{
diff --git a/Modules/Core/ImageBase/include/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
index 3bec599c720a7fbbfc72ecae5d44a537517a4826..109a5571436888420cfa87cf9178d95637e0c482 100644
--- a/Modules/Core/ImageBase/include/otbImage.h
+++ b/Modules/Core/ImageBase/include/otbImage.h
@@ -245,14 +245,14 @@ public:
virtual void SetImageKeywordList(const ImageKeywordlistType& kwl);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/// Copy metadata from a DataObject
- void CopyInformation(const itk::DataObject *) ITK_OVERRIDE;
+ void CopyInformation(const itk::DataObject *) override;
protected:
Image();
- ~Image() ITK_OVERRIDE {}
+ ~Image() override {}
private:
Image(const Self &) = delete;
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
index 82ae1aa0847ee6423f9c25028ef48354c8edb258..2daa2aaefa584a8ffa5086edfc15d16be968dd57 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
@@ -88,17 +88,17 @@ class ITK_EXPORT ImageFunctionAdaptor :
itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
// Evalulate the function at specified index //
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
// Evaluate the function at non-integer positions //
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -111,8 +111,8 @@ class ITK_EXPORT ImageFunctionAdaptor :
protected:
ImageFunctionAdaptor();
- ~ImageFunctionAdaptor() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageFunctionAdaptor() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageFunctionAdaptor(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbImageIOBase.h b/Modules/Core/ImageBase/include/otbImageIOBase.h
index e1c1d8411192d71b1d5b375d3f7d3bc2320a9cbb..6a7bf4e12d80c329ffb9ecf97e080f123ad48c99 100644
--- a/Modules/Core/ImageBase/include/otbImageIOBase.h
+++ b/Modules/Core/ImageBase/include/otbImageIOBase.h
@@ -429,8 +429,8 @@ public:
protected:
ImageIOBase();
- ~ImageIOBase() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageIOBase() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Used internally to keep track of the type of the pixel. */
IOPixelType m_PixelType;
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index 21910ccb709e067c18a46948c39d7db447e6b1e8..40c2f86725b928723b2011145af5ff1e56d89fe4 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -86,8 +86,8 @@ public:
protected:
ImageOfVectorsToMonoChannelExtractROI();
- ~ImageOfVectorsToMonoChannelExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageOfVectorsToMonoChannelExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ExtractImageFilter can produce an image which is a different
* resolution than its input image. As such, ExtractImageFilter
@@ -97,13 +97,13 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** ExtractImageFilter can be implemented as a multithreaded filter.
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
ImageOfVectorsToMonoChannelExtractROI(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
index 79f863b989c561bc2241d7e2994bd4197eeec516..d8eba8a50a4ae20d1015af12c7c4be3dc72de38c 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
@@ -75,7 +75,7 @@ public:
typedef std::vector<FunctionPointerType> FunctionContainerType;
/** Evaluate the function at the given location */
- OutputType Evaluate(const PointType & point) const ITK_OVERRIDE;
+ OutputType Evaluate(const PointType & point) const override;
/** Add a new function to the functions vector */
void AddFunction(FunctionType * function);
@@ -100,10 +100,10 @@ protected:
MetaImageFunction();
/** Destructor */
- ~MetaImageFunction() ITK_OVERRIDE;
+ ~MetaImageFunction() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
MetaImageFunction(const Self& ); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index a087a123990b1f5522a917ec51922f306eaf6bc7..cf17b63d3c82fffa47bb713b26a206d70ef7e799 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -115,8 +115,8 @@ public:
protected:
MultiChannelExtractROI();
- ~MultiChannelExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MultiChannelExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** MultiChannelExtractROI can produce an image which is a different
* resolution than its input image. As such, MultiChannelExtractROI
@@ -126,7 +126,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Reinitialize channels vector for multiple Update.*/
void ChannelsReInitialization();
@@ -137,7 +137,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
MultiChannelExtractROI(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index 2724bcf8e608fe9163a542fb09a6ab591499cc06..4733af545023ae341e5ed3cb1048187bffd6bf6d 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -93,8 +93,8 @@ public:
protected:
MultiToMonoChannelExtractROI();
- ~MultiToMonoChannelExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MultiToMonoChannelExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ExtractImageFilter can produce an image which is a different
* resolution than its input image. As such, ExtractImageFilter
@@ -104,13 +104,13 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** ExtractImageFilter can be implemented as a multithreaded filter.
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
MultiToMonoChannelExtractROI(const Self &); //purposely not implemented
diff --git a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
index 82eb5eebd4cd70beabc808bf84bc1616afa8d283..3c000d43bbbcef8369edb2bbd0b8e947e57eb897 100644
--- a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
+++ b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
@@ -81,7 +81,7 @@ public:
/** ImageRegion typedef needed by the GetImageRegion() method */
typedef itk::ImageRegion<2> ImageRegionType;
- typename Superclass::RegionType GetRegionType() const ITK_OVERRIDE
+ typename Superclass::RegionType GetRegionType() const override
{return Superclass::ITK_STRUCTURED_REGION; }
/** Constructor. RemoteSensingRegion is a lightweight object that is not reference
@@ -106,7 +106,7 @@ public:
/** Destructor. RemoteSensingRegion is a lightweight object that is not reference
* counted, so the destructor is public. */
- ~RemoteSensingRegion() ITK_OVERRIDE{}
+ ~RemoteSensingRegion() override{}
/** operator=. RemoteSensingRegion is a lightweight object that is not reference
* counted, so operator= is public. */
@@ -334,7 +334,7 @@ public:
protected:
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
os << std::setprecision(15);
os << indent << "RemoteSensingRegion" << std::endl;
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
index 2fa39e599a1811ef98b7930931c37a5031e19cd9..dcb2ec23770462997586915932ca1412843a18c8 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.h
+++ b/Modules/Core/ImageBase/include/otbVectorImage.h
@@ -164,9 +164,9 @@ public:
virtual void SetImageKeywordList(const ImageKeywordlistType& kwl);
/// Copy metadata from a DataObject
- void CopyInformation(const itk::DataObject *) ITK_OVERRIDE;
+ void CopyInformation(const itk::DataObject *) override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Return the Pixel Accessor object */
// AccessorType GetPixelAccessor( void )
@@ -194,7 +194,7 @@ public:
protected:
VectorImage();
- ~VectorImage() ITK_OVERRIDE {}
+ ~VectorImage() override {}
private:
VectorImage(const Self &); //purposely not implemented
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index 460414ab79219738a2423898ecd7ee16b6017bc3..6acb8b23acdb474d4799538dbf078ad8fe91af3c 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -109,12 +109,12 @@ public:
*
* ImageFunction::IsInsideBuffer() can be used to check bounds before
* calling the method. */
- OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE = 0;
+ OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override = 0;
protected:
BCOInterpolateImageFunctionBase() : m_Radius(2), m_WinSize(5), m_Alpha(-0.5) {};
- ~BCOInterpolateImageFunctionBase() ITK_OVERRIDE {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BCOInterpolateImageFunctionBase() override {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Compute the BCO coefficients. */
virtual CoefContainerType EvaluateCoef( const ContinuousIndexValueType & indexValue ) const;
@@ -157,12 +157,12 @@ public:
typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
typedef typename Superclass::CoefContainerType CoefContainerType;
- OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE;
+ OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override;
protected:
BCOInterpolateImageFunction() {};
- ~BCOInterpolateImageFunction() ITK_OVERRIDE {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BCOInterpolateImageFunction() override {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BCOInterpolateImageFunction( const Self& ); //purposely not implemented
@@ -196,12 +196,12 @@ public:
typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
typedef typename Superclass::CoefContainerType CoefContainerType;
- OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE;
+ OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override;
protected:
BCOInterpolateImageFunction() {};
- ~BCOInterpolateImageFunction() ITK_OVERRIDE {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BCOInterpolateImageFunction() override {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BCOInterpolateImageFunction( const Self& ); //purposely not implemented
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
index d4199249b6cf7b0c06f173af6a9299483a0f61bc..627b18af548011794a8892d546149d59d8beb7f7 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
@@ -77,10 +77,10 @@ public:
protected:
BSplineDecompositionImageFilter();
- ~BSplineDecompositionImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BSplineDecompositionImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** These are needed by the smoothing spline routine. */
std::vector<double> m_Scratch; // temp storage for processing of Coefficients
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index c5161bcdaa67ef67e3f3e2bb4c97b57bbb4b2e6b..fb653f3bebb668c806502f1cedeb3a0774929d0d 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -108,7 +108,7 @@ public:
* ImageFunction::IsInsideBuffer() can be used to check bounds before
* calling the method. */
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& index) const ITK_OVERRIDE;
+ const ContinuousIndexType& index) const override;
/** Derivative typedef support */
typedef itk::CovariantVector<OutputType,
@@ -131,7 +131,7 @@ public:
itkGetMacro(SplineOrder, int);
/** Set the input image. This must be set by the user. */
- void SetInputImage(const TImageType * inputData) ITK_OVERRIDE;
+ void SetInputImage(const TImageType * inputData) override;
/** Update coefficients filter. Coefficient filter are computed over the buffered
region of the input image. */
@@ -139,9 +139,9 @@ public:
protected:
BSplineInterpolateImageFunction();
- ~BSplineInterpolateImageFunction() ITK_OVERRIDE {}
+ ~BSplineInterpolateImageFunction() override {}
void operator =(const Self&); //purposely not implemented
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
// These are needed by the smoothing spline routine.
std::vector<CoefficientDataType> m_Scratch; // temp storage for processing of Coefficients
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index a993e857e16d397aa286bc4e860924735cca2d64..1119453b2b358a465f8b16090fd6e9032ba57b21 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -86,7 +86,7 @@ public:
*
* ImageFunction::IsInsideBuffer() can be used to check bounds before
* calling the method. */
- OutputType EvaluateAtContinuousIndex(const ContinuousIndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtContinuousIndex(const ContinuousIndexType& index) const override;
/** Set/Get the window radius*/
virtual void SetRadius(unsigned int rad);
@@ -115,12 +115,12 @@ public:
protected:
GenericInterpolateImageFunction();
- ~GenericInterpolateImageFunction() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~GenericInterpolateImageFunction() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Call the superclass implementation and set the TablesHaveBeenGenerated
* flag to false */
- void Modified(void) const ITK_OVERRIDE;
+ void Modified(void) const override;
/** Delete tables.*/
virtual void ResetOffsetTable();
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
index 6942e5798897a14e5c64a8c562257e1b537c5e13..1a057edfced9a4743615f7d3ce10d8cd91ea8ac3 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
@@ -313,8 +313,8 @@ public:
protected:
ProlateInterpolateImageFunction();
- ~ProlateInterpolateImageFunction() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ProlateInterpolateImageFunction() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ProlateInterpolateImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
index 7bd3a885465cb04b9652ec02007324a5fd067c76..36d1d7226497c37ffbf16b80b35229ec621d866c 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -134,8 +134,8 @@ public:
protected:
WindowedSincInterpolateImageBlackmanFunction() {};
- ~WindowedSincInterpolateImageBlackmanFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageBlackmanFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
index 34d2a79699534708605db0c7edf3c28b542fe40f..94cae64c241606f728da588c33cb91f5a65b6f24 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
@@ -127,8 +127,8 @@ public:
protected:
WindowedSincInterpolateImageCosineFunction() {};
- ~WindowedSincInterpolateImageCosineFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageCosineFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
index 34be4a944d7842e77b4fac07684d8a78e4cc5321..57703395bafa91c75318c02a1bb4cf45333e5cc9 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
@@ -179,8 +179,8 @@ public:
protected:
WindowedSincInterpolateImageFunctionBase();
- ~WindowedSincInterpolateImageFunctionBase() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~WindowedSincInterpolateImageFunctionBase() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
WindowedSincInterpolateImageFunctionBase(const Self &); //purposely not implemented
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
index fde1fabcc2b226161dd15d8a268f768006b9cb85..ce0358ded4b3eee6fd7daf5885debc73c8ca54c2 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -127,8 +127,8 @@ public:
protected:
WindowedSincInterpolateImageGaussianFunction() {};
- ~WindowedSincInterpolateImageGaussianFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageGaussianFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
index d2371c037b688ce8fd701692020bbf90b8b77774..31fca5a236c6085d22efc6e1bc1747b5edf57777 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
@@ -128,8 +128,8 @@ public:
protected:
WindowedSincInterpolateImageHammingFunction() {};
- ~WindowedSincInterpolateImageHammingFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageHammingFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
index 33c51bb95741f9a817ec84c15d477d027bf88756..38da528f662a92c57e510ccc107bdcc0fe72b39f 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -138,8 +138,8 @@ public:
protected:
WindowedSincInterpolateImageLanczosFunction() {};
- ~WindowedSincInterpolateImageLanczosFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageLanczosFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
index fc1d52b85f435f57b1686d4f419bb72708108599..24245cea27a7290986647ed449edfd76da23716c 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
@@ -127,8 +127,8 @@ public:
protected:
WindowedSincInterpolateImageWelchFunction() {};
- ~WindowedSincInterpolateImageWelchFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~WindowedSincInterpolateImageWelchFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
index 342c288105c09b2500a7a653c71f8e12e5c83366..4918ff363d2f28b4929a3dfe99fb7eb740d14018 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
@@ -306,10 +306,10 @@ protected:
/** Constructor */
AttributesMapLabelObject() : m_Attributes(), m_Polygon(PolygonType::New()) {}
/** Destructor */
- ~AttributesMapLabelObject() ITK_OVERRIDE {}
+ ~AttributesMapLabelObject() override {}
/** The printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << indent << "Attributes: " << std::endl;
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
index 9573d6218a6297ab73ac0900b076d4ff79ec737a..f9d822cdd6e42d8260d6d1f77225d7917f53c320 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
@@ -105,7 +105,7 @@ public:
m_HasClassLabel = false;
}
- void CopyAttributesFrom( const LabelObjectType * lo ) ITK_OVERRIDE
+ void CopyAttributesFrom( const LabelObjectType * lo ) override
{
Superclass::CopyAttributesFrom( lo );
@@ -125,10 +125,10 @@ protected:
AttributesMapLabelObjectWithClassLabel() : m_ClassLabel(itk::NumericTraits<ClassLabelType>::Zero), m_HasClassLabel(false)
{}
/** Destructor */
- ~AttributesMapLabelObjectWithClassLabel() ITK_OVERRIDE {}
+ ~AttributesMapLabelObjectWithClassLabel() override {}
/** The printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf( os, indent );
if(m_HasClassLabel)
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
index 1e10e1783a56baf8d41d9d27487e4645bbe7abe4..c8a138ffec62e367c871cb9908e318fa0c7f5e3c 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
@@ -71,16 +71,16 @@ public:
AttributeAccessorType & GetAccessor();
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
/** Constructor */
AttributesMapOpeningLabelMapFilter();
/** Destructor */
- ~AttributesMapOpeningLabelMapFilter() ITK_OVERRIDE;
+ ~AttributesMapOpeningLabelMapFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
index 2083db54d91ce56a59b5a17b2bfd33c8156ae89b..89ffbe232659ddaf49a4a91b0da87ddc8bdd4e17 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
@@ -191,19 +191,19 @@ protected:
/** Constructor */
BandsStatisticsAttributesLabelMapFilter();
/** Destructor */
- ~BandsStatisticsAttributesLabelMapFilter() ITK_OVERRIDE {}
+ ~BandsStatisticsAttributesLabelMapFilter() override {}
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void EnlargeOutputRequestedRegion(itk::DataObject *) ITK_OVERRIDE{};
+ void EnlargeOutputRequestedRegion(itk::DataObject *) override{};
/** Before threaded data generation */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BandsStatisticsAttributesLabelMapFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
index e18b9ac7d1f084ec2c8d01b3b00cf00c723b6d7d..985e57cb9602fb889625345e6190cada1ccb1412 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
@@ -75,21 +75,21 @@ public:
typedef BandsStatisticsAttributesLabelMapFilter<LabelMapType, InputImageType> BandStatisticsLabelMapFilterType;
using Superclass::SetInput;
- void SetInput( const InputImageType *image) ITK_OVERRIDE;
+ void SetInput( const InputImageType *image) override;
virtual void SetLabeledImage( const LabeledImageType * image);
const InputImageType * GetInput(void);
const LabeledImageType * GetLabeledImage();
virtual LabelMapType* GetOutput();
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
/** Constructor */
ImageToLabelMapWithAttributesFilter();
/** Destructor */
- ~ImageToLabelMapWithAttributesFilter() ITK_OVERRIDE{};
+ ~ImageToLabelMapWithAttributesFilter() override{};
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
private:
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
index 49125da9f7e980b3400ab36116376bf597242156..d65e2b3c0403ece03023cd7772055447e52bb5c2 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
@@ -123,7 +123,7 @@ public:
protected:
KMeansAttributesLabelMapFilter();
- ~KMeansAttributesLabelMapFilter() ITK_OVERRIDE {};
+ ~KMeansAttributesLabelMapFilter() override {};
private:
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
index 7612335023218c3dc4831a25f70ec68679cc6f68..2e3c61d5c86057c570abb2646077c1d41a8ce100 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
@@ -91,9 +91,9 @@ protected:
/** Constructor */
LabelImageToLabelMapWithAdjacencyFilter();
/** Destructor */
- ~LabelImageToLabelMapWithAdjacencyFilter() ITK_OVERRIDE {};
+ ~LabelImageToLabelMapWithAdjacencyFilter() override {};
/** Printself */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
// class to store a RLE
class RLE
@@ -121,16 +121,16 @@ protected:
/** LabelImageToLabelMapWithAdjacencyFilter needs the entire input be
* available. Thus, it needs to provide an implementation of
* GenerateInputRequestedRegion(). */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** LabelImageToLabelMapWithAdjacencyFilter will produce the entire output. */
- void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)) override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** Add a new adjacency */
void AddAdjacency(LabelType label1, LabelType label2, itk::ThreadIdType threadId);
diff --git a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
index 2ae6625d77c09de60faa3932e59a1ae4fb3f7f3e..56083fc5c7041000994449a99bf31e4b85d7cf5d 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
@@ -97,17 +97,17 @@ protected:
LabelMapFeaturesFunctorImageFilter() : m_Functor() {}
/** Destructor */
- ~LabelMapFeaturesFunctorImageFilter() ITK_OVERRIDE {}
+ ~LabelMapFeaturesFunctorImageFilter() override {}
/** Threaded generate data */
- void ThreadedProcessLabelObject(LabelObjectType * labelObject) ITK_OVERRIDE
+ void ThreadedProcessLabelObject(LabelObjectType * labelObject) override
{
// Call the functor
m_Functor(labelObject);
}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
// Call superclass implementation
Superclass::PrintSelf(os, indent);
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
index 489dd06e921041c12aeebe01eafe94f85faeb663..a03be1bd837b58913f9de220fd51d944f01b8b01 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.h
@@ -64,9 +64,9 @@ public:
protected:
LabelMapSource();
- ~LabelMapSource() ITK_OVERRIDE;
+ ~LabelMapSource() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Ensure that the output vector data are cleared before processing */
virtual void AllocateOutputs();
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
index 202b7e3792570979e4316b11d00a80c96579cb1c..50dcc9f616504fdcaed77c0c03b6646c5bb60c56 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
@@ -102,13 +102,13 @@ public:
protected:
LabelMapToAttributeImageFilter();
- ~LabelMapToAttributeImageFilter() ITK_OVERRIDE {};
+ ~LabelMapToAttributeImageFilter() override {};
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
private:
/** Background pixel value */
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
index 3485f799442c4a92ebf899c57823f983f9a6fba6..55040a6e5e18d30ed6d5c161aaa404b0233fcf7b 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
@@ -96,15 +96,15 @@ public:
protected:
LabelMapToSampleListFilter();
- ~LabelMapToSampleListFilter() ITK_OVERRIDE;
+ ~LabelMapToSampleListFilter() override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Make Output */
- DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LabelMapToSampleListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
index b1d9301980733a906e92439431969f37402d1efd..3400aec812ae4601b5ab278d46010159ddb7205f 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
@@ -218,16 +218,16 @@ protected:
/** Constructor */
LabelMapWithAdjacency(){}
/** Destructor */
- ~LabelMapWithAdjacency() ITK_OVERRIDE{}
+ ~LabelMapWithAdjacency() override{}
/** Printself */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
/** Re-implement CopyInformation to pass the adjancency graph
* through */
- void CopyInformation(const itk::DataObject * data) ITK_OVERRIDE
+ void CopyInformation(const itk::DataObject * data) override
{
// Call superclass implementation
Superclass::CopyInformation(data);
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
index 5f67ba3d9562a9024ec38627e17d040b1c176022..ccc3a6dd453159b903195923dda1df73475eb269 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
@@ -75,11 +75,11 @@ public:
protected:
LabelMapWithClassLabelToClassLabelImageFilter();
- ~LabelMapWithClassLabelToClassLabelImageFilter() ITK_OVERRIDE {};
+ ~LabelMapWithClassLabelToClassLabelImageFilter() override {};
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
private:
LabelMapWithClassLabelToClassLabelImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
index bf7f6859dafecd9de8465af0f1103adb0256dd88..cd4bc3086e39649e6cc35c54c151f1d1028c6605 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
@@ -100,14 +100,14 @@ public:
protected:
LabelMapWithClassLabelToLabeledSampleListFilter();
- ~LabelMapWithClassLabelToLabeledSampleListFilter() ITK_OVERRIDE;
+ ~LabelMapWithClassLabelToLabeledSampleListFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Make Output */
- DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
private:
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
index 9a9f3251d13c57080bd37846a84fa137af398ea6..96ae25ce4cad1e44cce26d49c753119a9a9ca80d 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
@@ -89,14 +89,14 @@ public:
AttributesMapObjectType* GetMaximumOutput();
const AttributesMapObjectType* GetMaximumOutput() const;
- DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointerType MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
protected:
MinMaxAttributesLabelMapFilter();
- ~MinMaxAttributesLabelMapFilter() ITK_OVERRIDE {};
+ ~MinMaxAttributesLabelMapFilter() override {};
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
MinMaxAttributesLabelMapFilter(const Self&); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
index a3c01d3dbcdd37baf15fdfaf6040c6318fa6fc6d..afc376eabe1a218aed2172acf30bc83f416f27d8 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
@@ -143,10 +143,10 @@ protected:
NormalizeAttributesLabelMapFilter(){}
/** Destructor */
- ~NormalizeAttributesLabelMapFilter() ITK_OVERRIDE{}
+ ~NormalizeAttributesLabelMapFilter() override{}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
NormalizeAttributesLabelMapFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
index eb2dfbc8fb48ed0c381d145721f137db4a62b3f6..083b4b7c1ffb140b341133df2ca45af44d015448 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
@@ -288,19 +288,19 @@ protected:
ShapeAttributesLabelMapFilter(){}
/** Destructor */
- ~ShapeAttributesLabelMapFilter() ITK_OVERRIDE{}
+ ~ShapeAttributesLabelMapFilter() override{}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
/** Things to to before threaded data generation */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void EnlargeOutputRequestedRegion(itk::DataObject *) ITK_OVERRIDE{};
+ void EnlargeOutputRequestedRegion(itk::DataObject *) override{};
private:
ShapeAttributesLabelMapFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
index c0c2d1ed6cb4acf20ffc3c64e7585b6fbe8ea0fd..3f2826b78917e081e11c891dec588ec36d08cedd 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
@@ -195,13 +195,13 @@ protected:
StatisticsAttributesLabelMapFilter();
/** Destructor */
- ~StatisticsAttributesLabelMapFilter() ITK_OVERRIDE;
+ ~StatisticsAttributesLabelMapFilter() override;
/** Before threaded data generation */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StatisticsAttributesLabelMapFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
index 6faccb6d41034f94f2fc0eb016d0de449f84afe3..f81e74966a96b86b796b1e9505369e69044ef92d 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
@@ -75,49 +75,49 @@ public:
}
/** Get the imaging acquisition day from the ossim metadata */
- int GetDay() const ITK_OVERRIDE
+ int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition month from the ossim metadata */
- int GetMonth() const ITK_OVERRIDE
+ int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition year from the ossim metadata */
- int GetYear() const ITK_OVERRIDE
+ int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition hour from the ossim metadata */
- int GetHour() const ITK_OVERRIDE
+ int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition minute from the ossim metadata */
- int GetMinute() const ITK_OVERRIDE
+ int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production day from the ossim metadata */
- int GetProductionDay() const ITK_OVERRIDE
+ int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production month from the ossim metadata */
- int GetProductionMonth() const ITK_OVERRIDE
+ int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production year from the ossim metadata */
- int GetProductionYear() const ITK_OVERRIDE
+ int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
}
@@ -147,13 +147,13 @@ public:
}
/** Get the enhanced band names */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE
+ std::vector<std::string> GetEnhancedBandNames() const override
{
itkExceptionMacro("GetEnhancedBandNames not implemented in DefaultImageMetadataInterface, no captor type found");
}
- bool CanRead() const ITK_OVERRIDE
+ bool CanRead() const override
{
// This class is the default one, it has to be able to call every metadata
return true;
@@ -166,7 +166,7 @@ public:
* When one spectral band is available : the only band is given to the R, G and B channel.
*
*/
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE
+ std::vector<unsigned int> GetDefaultDisplay() const override
{
unsigned int i = 0;
std::vector<unsigned int> rgb(3);
@@ -193,7 +193,7 @@ public:
protected:
DefaultImageMetadataInterface(){};
- ~DefaultImageMetadataInterface() ITK_OVERRIDE {}
+ ~DefaultImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
index aa0a851a2b447706614bb9a4114ba90db41695df..0f19d38b836bc8aa0295679377c815cc70fbb6a6 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -60,7 +60,7 @@ public:
protected:
DefaultImageMetadataInterfaceFactory();
- ~DefaultImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~DefaultImageMetadataInterfaceFactory() override;
private:
DefaultImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
index df122554b542614f8dac93cb9a6649ffd996d02d..271d3d8d81fc10262edb633beb2264f2eab41b45 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
@@ -54,55 +54,55 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
/** Get Instrument */
std::string GetInstrument() const;
/** Get the enhanced band names (here nothing because the metadata did not provide band names) */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE
+ std::vector<std::string> GetEnhancedBandNames() const override
{
return this->Superclass::GetBandName();
}
@@ -114,21 +114,21 @@ public:
* in most cases, this method won't change the value, but for SPOT data, the bands are set up as
* 2 1 0 3 in the tiff file, this method which is overloaded for SPOT enables to retrieve the
* proper band. */
- unsigned int BandIndexToWavelengthPosition(unsigned int i) const ITK_OVERRIDE;
+ unsigned int BandIndexToWavelengthPosition(unsigned int i) const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
FormosatImageMetadataInterface();
- ~FormosatImageMetadataInterface() ITK_OVERRIDE {}
+ ~FormosatImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
index dcd95d08c64bcccf568ba97b09910365f17fc7d7..372212d77d5bc03ee702e28b097fc4e1937ae0d0 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
FormosatImageMetadataInterfaceFactory();
- ~FormosatImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~FormosatImageMetadataInterfaceFactory() override;
private:
FormosatImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
index f4f2ccbf45a06ca9e637893b7119232eba4c7bdf..6d39a3eafd091323af19d562a26620870ecd0368 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
@@ -54,66 +54,66 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the enhanced band names of Ikonos data*/
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE;
+ std::vector<std::string> GetEnhancedBandNames() const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
IkonosImageMetadataInterface();
- ~IkonosImageMetadataInterface() ITK_OVERRIDE {}
+ ~IkonosImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
index a0118eb5a011e5bc2d2475403ac6024b36426d23..b19c1e4d3a2cb7fa5cbd00f08f581d9268139913 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
IkonosImageMetadataInterfaceFactory();
- ~IkonosImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~IkonosImageMetadataInterfaceFactory() override;
private:
IkonosImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
index 0d4c891042db2c71d7612753d2040d9127f7d6aa..218cbe12aef16c117c102b89fc34fed5e0fdfee8 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
@@ -214,9 +214,9 @@ public:
protected:
ImageMetadataInterfaceBase();
- ~ImageMetadataInterfaceBase() ITK_OVERRIDE {}
+ ~ImageMetadataInterfaceBase() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
MetaDataDictionaryType m_MetaDataDictionary;
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
index c20f95b535f31deec54bfc0624483f58ee428181..0b1f1fd78e82136bbd6260232bcc35d02217589b 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
@@ -61,7 +61,7 @@ public:
protected:
ImageMetadataInterfaceFactory();
- ~ImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~ImageMetadataInterfaceFactory() override;
private:
ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
index da26a6f01515ed865d8c21b16d46c0d54e484e56..dcd33a74262cafd7dbb419a76ec1f44f2f1243d4 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
@@ -57,103 +57,103 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE
+ VariableLengthVectorType GetPhysicalBias() const override
{
itkExceptionMacro("GetPhysicalBias not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE
+ VariableLengthVectorType GetPhysicalGain() const override
{
itkExceptionMacro("GetPhysicalGain not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE
+ VariableLengthVectorType GetSolarIrradiance() const override
{
itkExceptionMacro("GetSolarIrradiance not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition day from the ossim metadata */
- int GetDay() const ITK_OVERRIDE
+ int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition month from the ossim metadata */
- int GetMonth() const ITK_OVERRIDE
+ int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition year from the ossim metadata */
- int GetYear() const ITK_OVERRIDE
+ int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition hour from the ossim metadata */
- int GetHour() const ITK_OVERRIDE
+ int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition minute from the ossim metadata */
- int GetMinute() const ITK_OVERRIDE
+ int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production day from the ossim metadata */
- int GetProductionDay() const ITK_OVERRIDE
+ int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production month from the ossim metadata */
- int GetProductionMonth() const ITK_OVERRIDE
+ int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production year from the ossim metadata */
- int GetProductionYear() const ITK_OVERRIDE
+ int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE
+ double GetSatElevation() const override
{
itkExceptionMacro("GetSatElevation not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE
+ double GetSatAzimuth() const override
{
itkExceptionMacro("GetSatElevation not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE
+ VariableLengthVectorType GetFirstWavelengths() const override
{
itkExceptionMacro("GetFirstWavelengths not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE
+ VariableLengthVectorType GetLastWavelengths() const override
{
itkExceptionMacro("GetLastWavelengths not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
/** Get the enhanced band names (here nothing because the sensor is not identify) */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE
+ std::vector<std::string> GetEnhancedBandNames() const override
{
std::vector<std::string> nothing;
return nothing;
}
- bool CanRead() const ITK_OVERRIDE
+ bool CanRead() const override
{
// This class is the default one, it has to be able to call every metadata
return false;
@@ -161,7 +161,7 @@ public:
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE
+ std::vector<unsigned int> GetDefaultDisplay() const override
{
std::vector<unsigned int> rgb(3);
rgb[0] = 0;
@@ -172,14 +172,14 @@ public:
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override
{
itkExceptionMacro("GetSpectralSensitivity not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
protected:
OpticalDefaultImageMetadataInterface(){};
- ~OpticalDefaultImageMetadataInterface() ITK_OVERRIDE {}
+ ~OpticalDefaultImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
index 0d8db3ce03224866cf51edc9303b23c4d5f892e1..e4226adf6b9b068105c3d31cabe0474f72cc4cab 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -60,7 +60,7 @@ public:
protected:
OpticalDefaultImageMetadataInterfaceFactory();
- ~OpticalDefaultImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~OpticalDefaultImageMetadataInterfaceFactory() override;
private:
OpticalDefaultImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
index 210534ce3d3a1abf4c5e8d5cbc83b5b44d17963f..8a948309809ad317576ba1790d82d073f89701f7 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
@@ -86,7 +86,7 @@ public:
virtual VariableLengthVectorType GetLastWavelengths() const = 0;
/** Get the enhanced band names */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE = 0;
+ std::vector<std::string> GetEnhancedBandNames() const override = 0;
/** This method is to handle the permutation of the spectral band by some image provider
* in most cases, this method won't change the value, but for SPOT data, the bands are set up as
@@ -99,9 +99,9 @@ public:
virtual WavelengthSpectralBandVectorType GetSpectralSensitivity () const = 0;
protected:
OpticalImageMetadataInterface();
- ~OpticalImageMetadataInterface() ITK_OVERRIDE {}
+ ~OpticalImageMetadataInterface() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
index 314f0b7edfecd776b9d928ca4c98701a9506c9d0..a543c766e0a1a36c65b649628d8c2009e0971211 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
@@ -61,7 +61,7 @@ public:
protected:
OpticalImageMetadataInterfaceFactory();
- ~OpticalImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~OpticalImageMetadataInterfaceFactory() override;
private:
OpticalImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
index ddc9bc114f28c37450195a5c0ece8915fb5d0092..65412134ca828c4d867e7403da1d0d83e0a1d9ab 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
@@ -54,49 +54,49 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
/** Get Instrument */
std::string GetInstrument() const;
@@ -108,25 +108,25 @@ public:
* in most cases, this method won't change the value, but for SPOT data, the bands are set up as
* 2 1 0 3 in the tiff file, this method which is overloaded for SPOT enables to retrieve the
* proper band. */
- unsigned int BandIndexToWavelengthPosition(unsigned int i) const ITK_OVERRIDE;
+ unsigned int BandIndexToWavelengthPosition(unsigned int i) const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the enhanced band names of the Pleiades data */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE;
+ std::vector<std::string> GetEnhancedBandNames() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
PleiadesImageMetadataInterface();
- ~PleiadesImageMetadataInterface() ITK_OVERRIDE {}
+ ~PleiadesImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
index 8384183d18f7e3d014420e9a81527160ee8888b7..a1a95784454ccf4b32d251e554af748ed34c77d8 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
PleiadesImageMetadataInterfaceFactory();
- ~PleiadesImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~PleiadesImageMetadataInterfaceFactory() override;
private:
PleiadesImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
index b8bd98555d890dab3254f1a97d6bc3e00d38499b..836056c5f1d10114ce0dc380f15b77371f73ca2c 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
@@ -54,65 +54,65 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : generationTime metadata value */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : generationTime metadata value */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : generationTime metadata value */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
/** Get the enhanced band names of QuickBird data */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE;
+ std::vector<std::string> GetEnhancedBandNames() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
QuickBirdImageMetadataInterface();
- ~QuickBirdImageMetadataInterface() ITK_OVERRIDE {}
+ ~QuickBirdImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
index 8f6eb08cbae6987141ea63c8d9e14bd7a2aa5b88..bd00c02bf7cce3b1476d51741940d8171b4c25d7 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
QuickBirdImageMetadataInterfaceFactory();
- ~QuickBirdImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~QuickBirdImageMetadataInterfaceFactory() override;
private:
QuickBirdImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
index 2d720a164416caf645c600142180bafb9aa62d3c..2c4d231fb3a6f8ddaa7864503e2635ae215ef448 100644
--- a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
@@ -58,40 +58,40 @@ public:
/*ImageMetadataInterfaceBase pure virtuals */
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** check sensor ID */
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
- UIntVectorType GetDefaultDisplay() const ITK_OVERRIDE;
+ UIntVectorType GetDefaultDisplay() const override;
/*SarImageMetadataInterface pure virutals rituals */
- double GetPRF() const ITK_OVERRIDE;
+ double GetPRF() const override;
- double GetRSF() const ITK_OVERRIDE;
+ double GetRSF() const override;
- double GetRadarFrequency() const ITK_OVERRIDE;
+ double GetRadarFrequency() const override;
- double GetCenterIncidenceAngle() const ITK_OVERRIDE;
+ double GetCenterIncidenceAngle() const override;
/*get lookup data for calculating backscatter */
- void CreateCalibrationLookupData(const short type) ITK_OVERRIDE;
+ void CreateCalibrationLookupData(const short type) override;
protected:
@@ -99,7 +99,7 @@ protected:
Radarsat2ImageMetadataInterface();
/* class desctructor */
- ~Radarsat2ImageMetadataInterface() ITK_OVERRIDE {}
+ ~Radarsat2ImageMetadataInterface() override {}
private:
Radarsat2ImageMetadataInterface(const Self &); //purposely not implemented
@@ -147,7 +147,7 @@ public:
}
- ~Radarsat2CalibrationLookupData() ITK_OVERRIDE
+ ~Radarsat2CalibrationLookupData() override
{
}
@@ -159,7 +159,7 @@ public:
m_Gains = gains;
}
- double GetValue(const IndexValueType x, const IndexValueType itkNotUsed(y)) const ITK_OVERRIDE
+ double GetValue(const IndexValueType x, const IndexValueType itkNotUsed(y)) const override
{
double lutVal = 1.0;
@@ -175,7 +175,7 @@ public:
return lutVal;
}
- void PrintSelf(std::ostream & os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream & os, itk::Indent indent) const override
{
os << indent << " offset:'" << m_Offset << "'" << std::endl;
os << " referenceNoiseLevel.gain: " << std::endl;
diff --git a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
index ca77603d2ea6c1db670a3978d970b3789aeedf66..df837f6e6e2b736ab03b564316f4cae682200b11 100644
--- a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
Radarsat2ImageMetadataInterfaceFactory();
- ~Radarsat2ImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~Radarsat2ImageMetadataInterfaceFactory() override;
private:
Radarsat2ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbSarCalibrationLookupData.h b/Modules/Core/Metadata/include/otbSarCalibrationLookupData.h
index 98669c72050aa55541abc2331e4ebf9f42feb104..04328dfaff0fab4177e332a72c3a91bb4ac7f234 100644
--- a/Modules/Core/Metadata/include/otbSarCalibrationLookupData.h
+++ b/Modules/Core/Metadata/include/otbSarCalibrationLookupData.h
@@ -59,7 +59,7 @@ class OTBMetadata_EXPORT SarCalibrationLookupData : public itk::LightObject {
{
}
- ~SarCalibrationLookupData() ITK_OVERRIDE
+ ~SarCalibrationLookupData() override
{
}
@@ -75,7 +75,7 @@ class OTBMetadata_EXPORT SarCalibrationLookupData : public itk::LightObject {
itkGetMacro(Type, short);
- void PrintSelf(std::ostream & os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream & os, itk::Indent indent) const override
{
os << indent << " lookup table type:'" << m_Type << "'" << std::endl;
Superclass::PrintSelf(os, indent);
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
index c842d4fcadc89f58f5d53f5802a3b54847d5ac60..0782320bfdbf82a83286b0bf872bc47d3415bc50 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
@@ -61,134 +61,134 @@ public:
typedef double RealType;
typedef PointSetType::PointType PointType;
- RealType GetRadiometricCalibrationScale() const ITK_OVERRIDE
+ RealType GetRadiometricCalibrationScale() const override
{
itkExceptionMacro("GetRadiometricCalibrationScale() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- PointSetPointer GetRadiometricCalibrationAntennaPatternNewGain() const ITK_OVERRIDE
+ PointSetPointer GetRadiometricCalibrationAntennaPatternNewGain() const override
{
itkExceptionMacro("GetRadiometricCalibrationAntennaPatternNewGain() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- PointSetPointer GetRadiometricCalibrationAntennaPatternOldGain() const ITK_OVERRIDE
+ PointSetPointer GetRadiometricCalibrationAntennaPatternOldGain() const override
{
itkExceptionMacro("GetRadiometricCalibrationAntennaPatternOldGain() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- PointSetPointer GetRadiometricCalibrationIncidenceAngle() const ITK_OVERRIDE
+ PointSetPointer GetRadiometricCalibrationIncidenceAngle() const override
{
itkExceptionMacro("GetRadiometricCalibrationIncidenceAngle() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- PointSetPointer GetRadiometricCalibrationRangeSpreadLoss() const ITK_OVERRIDE
+ PointSetPointer GetRadiometricCalibrationRangeSpreadLoss() const override
{
itkExceptionMacro("GetRadiometricCalibrationRangeSpreadLoss() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- PointSetPointer GetRadiometricCalibrationNoise() const ITK_OVERRIDE
+ PointSetPointer GetRadiometricCalibrationNoise() const override
{
itkExceptionMacro("GetRadiometricCalibrationNoise() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- IndexType GetRadiometricCalibrationAntennaPatternNewGainPolynomialDegree() const ITK_OVERRIDE
+ IndexType GetRadiometricCalibrationAntennaPatternNewGainPolynomialDegree() const override
{
itkExceptionMacro("GetRadiometricCalibrationAntennaPatternNewGainPolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- IndexType GetRadiometricCalibrationAntennaPatternOldGainPolynomialDegree() const ITK_OVERRIDE
+ IndexType GetRadiometricCalibrationAntennaPatternOldGainPolynomialDegree() const override
{
itkExceptionMacro("GetRadiometricCalibrationAntennaPatternOldGainPolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- IndexType GetRadiometricCalibrationIncidenceAnglePolynomialDegree() const ITK_OVERRIDE
+ IndexType GetRadiometricCalibrationIncidenceAnglePolynomialDegree() const override
{
itkExceptionMacro("GetRadiometricCalibrationIncidenceAnglePolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- IndexType GetRadiometricCalibrationRangeSpreadLossPolynomialDegree() const ITK_OVERRIDE
+ IndexType GetRadiometricCalibrationRangeSpreadLossPolynomialDegree() const override
{
itkExceptionMacro("GetRadiometricCalibrationRangeSpreadLossPolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- IndexType GetRadiometricCalibrationNoisePolynomialDegree() const ITK_OVERRIDE
+ IndexType GetRadiometricCalibrationNoisePolynomialDegree() const override
{
itkExceptionMacro("GetRadiometricCalibrationNoisePolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition day from the ossim metadata */
- int GetDay() const ITK_OVERRIDE
+ int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition month from the ossim metadata */
- int GetMonth() const ITK_OVERRIDE
+ int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition year from the ossim metadata */
- int GetYear() const ITK_OVERRIDE
+ int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition hour from the ossim metadata */
- int GetHour() const ITK_OVERRIDE
+ int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging acquisition minute from the ossim metadata */
- int GetMinute() const ITK_OVERRIDE
+ int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production day from the ossim metadata */
- int GetProductionDay() const ITK_OVERRIDE
+ int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production month from the ossim metadata */
- int GetProductionMonth() const ITK_OVERRIDE
+ int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the imaging production year from the ossim metadata */
- int GetProductionYear() const ITK_OVERRIDE
+ int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the PRF */
- double GetPRF() const ITK_OVERRIDE
+ double GetPRF() const override
{
itkExceptionMacro("GetPRF not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the RSF */
- double GetRSF() const ITK_OVERRIDE
+ double GetRSF() const override
{
itkExceptionMacro("GetRSF not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the radar frequency */
- double GetRadarFrequency() const ITK_OVERRIDE
+ double GetRadarFrequency() const override
{
itkExceptionMacro("GetRadarFrequency not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
/** Get the center incidence angle */
- double GetCenterIncidenceAngle() const ITK_OVERRIDE
+ double GetCenterIncidenceAngle() const override
{
itkExceptionMacro("GetCenterIncidenceAngle not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- bool CanRead() const ITK_OVERRIDE
+ bool CanRead() const override
{
// This class is the default one, it has to be able to call every metadata
return false;
@@ -196,7 +196,7 @@ public:
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- UIntVectorType GetDefaultDisplay() const ITK_OVERRIDE
+ UIntVectorType GetDefaultDisplay() const override
{
UIntVectorType rgb(3);
rgb[0] = 0;
@@ -207,7 +207,7 @@ public:
protected:
SarDefaultImageMetadataInterface(){};
- ~SarDefaultImageMetadataInterface() ITK_OVERRIDE {}
+ ~SarDefaultImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
index 957a9867e92c4785e8c3a328930d0fa723044005..3d30545b75a8d45731831f443a74501441a26d68 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -60,7 +60,7 @@ public:
protected:
SarDefaultImageMetadataInterfaceFactory();
- ~SarDefaultImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~SarDefaultImageMetadataInterfaceFactory() override;
private:
SarDefaultImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
index 32fc7e3cfca783a0198715e60cb70ec23e4d2294..efd60bd15e96fa91c51cc181ece6e841e8a154e3 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
@@ -104,7 +104,7 @@ public:
virtual const std::string GetAcquisitionMode() const;
/** Get the enhanced band names (No enhanced band name support for SAR) */
- StringVectorType GetEnhancedBandNames() const ITK_OVERRIDE
+ StringVectorType GetEnhancedBandNames() const override
{
StringVectorType nothing;
return nothing;
@@ -112,12 +112,12 @@ public:
protected:
SarImageMetadataInterface();
- ~SarImageMetadataInterface() ITK_OVERRIDE {}
+ ~SarImageMetadataInterface() override {}
PointSetPointer GetConstantValuePointSet(const RealType& value) const;
IndexType GetConstantPolynomialDegree() const;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
LookupDataPointerType m_SarLut;
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
index 9e1c1803954114325a1d44f245526364bf25f2b8..b9cd10bc282f2881ec8512f96b5dba912f902352 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
@@ -61,7 +61,7 @@ public:
protected:
SarImageMetadataInterfaceFactory();
- ~SarImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~SarImageMetadataInterfaceFactory() override;
private:
SarImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
index ebefb705539c604ff5dbe7ad587450577a056198..c8636398587041b1ce523b8481d80da0e6d70c8d 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
@@ -59,40 +59,40 @@ public:
typedef Superclass::LookupDataPointerType LookupDataPointerType;
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** check sensor ID */
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
- UIntVectorType GetDefaultDisplay() const ITK_OVERRIDE;
+ UIntVectorType GetDefaultDisplay() const override;
/*SarImageMetadataInterface pure virutals rituals */
- double GetPRF() const ITK_OVERRIDE;
+ double GetPRF() const override;
- double GetRSF() const ITK_OVERRIDE;
+ double GetRSF() const override;
- double GetRadarFrequency() const ITK_OVERRIDE;
+ double GetRadarFrequency() const override;
- double GetCenterIncidenceAngle() const ITK_OVERRIDE;
+ double GetCenterIncidenceAngle() const override;
/*get lookup data for calculating backscatter */
- void CreateCalibrationLookupData(const short type) ITK_OVERRIDE;
+ void CreateCalibrationLookupData(const short type) override;
protected:
@@ -100,7 +100,7 @@ protected:
Sentinel1ImageMetadataInterface();
/* class dtor */
- ~Sentinel1ImageMetadataInterface() ITK_OVERRIDE {}
+ ~Sentinel1ImageMetadataInterface() override {}
private:
@@ -159,7 +159,7 @@ public:
{
}
- ~Sentinel1CalibrationLookupData() ITK_OVERRIDE
+ ~Sentinel1CalibrationLookupData() override
{
}
@@ -176,7 +176,7 @@ public:
lineTimeInterval = (lt - ft) / ((lines - 1) * 1.0);
}
- double GetValue(const IndexValueType x, const IndexValueType y) const ITK_OVERRIDE
+ double GetValue(const IndexValueType x, const IndexValueType y) const override
{
const int calVecIdx = GetVectorIndex(y);
assert(calVecIdx>=0 && calVecIdx < count-1);
diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
index cfdfea8dcdd5bc0f6cfeadc304a1774e1ff4f165..fafe69dd8fc845189f3e90961f15c89f21e7f613 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
Sentinel1ImageMetadataInterfaceFactory();
- ~Sentinel1ImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~Sentinel1ImageMetadataInterfaceFactory() override;
private:
Sentinel1ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
index f3af38e7a920ce2e142729e9812ca0e16b695a25..a63b9fa3621660b46b6c2e11c1233a47a6a54411 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
@@ -54,49 +54,49 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
/** Get Instrument */
std::string GetInstrument() const;
@@ -108,25 +108,25 @@ public:
* in most cases, this method won't change the value, but for SPOT data, the bands are set up as
* 2 1 0 3 in the tiff file, this method which is overloaded for SPOT enables to retrieve the
* proper band. */
- unsigned int BandIndexToWavelengthPosition(unsigned int i) const ITK_OVERRIDE;
+ unsigned int BandIndexToWavelengthPosition(unsigned int i) const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the enhanced band names of the Spot6 data */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE;
+ std::vector<std::string> GetEnhancedBandNames() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
Spot6ImageMetadataInterface();
- ~Spot6ImageMetadataInterface() ITK_OVERRIDE {}
+ ~Spot6ImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
index 139181d54e65412f8255636282c666a5b20b2729..83e9ee40ec26535a70c4ff46885c3cdb2f74acd3 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
Spot6ImageMetadataInterfaceFactory();
- ~Spot6ImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~Spot6ImageMetadataInterfaceFactory() override;
private:
Spot6ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
index 7ccdb45d6096b652e165365f523d4ea5859d0fd6..3f855595eefdd4f86971c18a4c888b547573febc 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
@@ -54,52 +54,52 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
/** Get the enhanced band names (here nothing because the metadata did not provide band names) */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE
+ std::vector<std::string> GetEnhancedBandNames() const override
{
return this->Superclass::GetBandName();
}
@@ -114,21 +114,21 @@ public:
* in most cases, this method won't change the value, but for SPOT data, the bands are set up as
* 2 1 0 3 in the tiff file, this method which is overloaded for SPOT enables to retrieve the
* proper band. */
- unsigned int BandIndexToWavelengthPosition(unsigned int i) const ITK_OVERRIDE;
+ unsigned int BandIndexToWavelengthPosition(unsigned int i) const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
protected:
SpotImageMetadataInterface();
- ~SpotImageMetadataInterface() ITK_OVERRIDE {}
+ ~SpotImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
index 8b4af6d83d8d8ac94b3e419c36ed4b28318e289e..8516b694b5dbd0be3cf6e6a0f7d5d3bd0e10637a 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
SpotImageMetadataInterfaceFactory();
- ~SpotImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~SpotImageMetadataInterfaceFactory() override;
private:
SpotImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
index 17d8a7fde52f410d4ea7188f44a5a72b1da0760e..321623631fd442c0b77a78d6ecd6b7c89a57f4ea 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
@@ -67,28 +67,28 @@ public:
typedef double RealType;
/** Get the imaging start acquisition day from the ossim metadata */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging start acquisition month from the ossim metadata */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging start acquisition year from the ossim metadata */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging start acquisition hour from the ossim metadata */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging start acquisition minute from the ossim metadata */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : generationTime variable */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : generationTime variable */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : generationTime variable */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the calibration.calFactor : generationTime variable */
double GetCalibrationFactor() const;
@@ -115,13 +115,13 @@ public:
DoubleVectorType GetNoiseReferencePointList() const;
/** Get the radar frequency */
- double GetRadarFrequency() const ITK_OVERRIDE;
+ double GetRadarFrequency() const override;
/** Get the PRF */
- double GetPRF() const ITK_OVERRIDE;
+ double GetPRF() const override;
/** Get the RSF */
- double GetRSF() const ITK_OVERRIDE;
+ double GetRSF() const override;
/** Get the number of corner incidence angles */
unsigned int GetNumberOfCornerIncidenceAngles() const;
@@ -130,7 +130,7 @@ public:
double GetMeanIncidenceAngles() const;
/** Get the center incidence angle */
- double GetCenterIncidenceAngle() const ITK_OVERRIDE;
+ double GetCenterIncidenceAngle() const override;
/** Get the center index */
IndexType GetCenterIncidenceAngleIndex() const;
@@ -142,26 +142,26 @@ public:
IndexVectorType GetCornersIncidenceAnglesIndex() const;
/** Get the constant calibration factor */
- RealType GetRadiometricCalibrationScale() const ITK_OVERRIDE;
+ RealType GetRadiometricCalibrationScale() const override;
- PointSetPointer GetRadiometricCalibrationNoise() const ITK_OVERRIDE;
- IndexType GetRadiometricCalibrationNoisePolynomialDegree() const ITK_OVERRIDE;
+ PointSetPointer GetRadiometricCalibrationNoise() const override;
+ IndexType GetRadiometricCalibrationNoisePolynomialDegree() const override;
//PointSetPointer GetRadiometricCalibrationAntennaPatternOldGain() const;
- PointSetPointer GetRadiometricCalibrationIncidenceAngle() const ITK_OVERRIDE;
- IndexType GetRadiometricCalibrationIncidenceAnglePolynomialDegree() const ITK_OVERRIDE;
+ PointSetPointer GetRadiometricCalibrationIncidenceAngle() const override;
+ IndexType GetRadiometricCalibrationIncidenceAnglePolynomialDegree() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
protected:
TerraSarImageMetadataInterface();
- ~TerraSarImageMetadataInterface() ITK_OVERRIDE {}
+ ~TerraSarImageMetadataInterface() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Evaluate polynom with Horner scheme*/
inline double Horner(std::vector<double>& coefficients, const double tauMinusTauRef) const;
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
index 2bd3f8b7f49c8f6347cdcedb565efc546b3b6a5c..3d68e5b6de4feac9e4062ed133feeb7083580f28 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
TerraSarImageMetadataInterfaceFactory();
- ~TerraSarImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~TerraSarImageMetadataInterfaceFactory() override;
private:
TerraSarImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
index 0bcc79936a7e121411ca0c7d4ff0ea75c698bf4b..3d219588485639a79e7532190c6aa7f54cbd0d57 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
@@ -54,66 +54,66 @@ public:
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalBias() const override;
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain() const ITK_OVERRIDE;
+ VariableLengthVectorType GetPhysicalGain() const override;
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance() const ITK_OVERRIDE;
+ VariableLengthVectorType GetSolarIrradiance() const override;
/** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
- int GetDay() const ITK_OVERRIDE;
+ int GetDay() const override;
/** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value */
- int GetMonth() const ITK_OVERRIDE;
+ int GetMonth() const override;
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetYear() const ITK_OVERRIDE;
+ int GetYear() const override;
/** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value */
- int GetHour() const ITK_OVERRIDE;
+ int GetHour() const override;
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetMinute() const ITK_OVERRIDE;
+ int GetMinute() const override;
/** Get the imaging production day from the ossim metadata : generationTime metadata value */
- int GetProductionDay() const ITK_OVERRIDE;
+ int GetProductionDay() const override;
/** Get the imaging production month from the ossim metadata : generationTime metadata value */
- int GetProductionMonth() const ITK_OVERRIDE;
+ int GetProductionMonth() const override;
/** Get the imaging production year from the ossim metadata : generationTime metadata value */
- int GetProductionYear() const ITK_OVERRIDE;
+ int GetProductionYear() const override;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation() const ITK_OVERRIDE;
+ double GetSatElevation() const override;
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth() const ITK_OVERRIDE;
+ double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetFirstWavelengths() const override;
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths() const ITK_OVERRIDE;
+ VariableLengthVectorType GetLastWavelengths() const override;
- bool CanRead() const ITK_OVERRIDE;
+ bool CanRead() const override;
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
* in the order R, G, B */
- std::vector<unsigned int> GetDefaultDisplay() const ITK_OVERRIDE;
+ std::vector<unsigned int> GetDefaultDisplay() const override;
/** Vector that contains the filter function value in 6S format (step of 0.0025 micro m).
* There values a computed by 6S. */
- WavelengthSpectralBandVectorType GetSpectralSensitivity() const ITK_OVERRIDE;
+ WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
/** Get the enhanced band names from band names collected by ossim */
- std::vector<std::string> GetEnhancedBandNames() const ITK_OVERRIDE;
+ std::vector<std::string> GetEnhancedBandNames() const override;
protected:
WorldView2ImageMetadataInterface();
- ~WorldView2ImageMetadataInterface() ITK_OVERRIDE {}
+ ~WorldView2ImageMetadataInterface() override {}
private:
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
index 597306f622cf99b151cda2692d781b90fd7a836d..b48d21fa40ef08891fc618d19cf70e16c36d6e32 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -60,7 +60,7 @@ public:
protected:
WorldView2ImageMetadataInterfaceFactory();
- ~WorldView2ImageMetadataInterfaceFactory() ITK_OVERRIDE;
+ ~WorldView2ImageMetadataInterfaceFactory() override;
private:
WorldView2ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
index 4cb77bddec306437bccb05b45b81bdf71c9b9610..cc7d167bcbc506dcc2c0c1a06661dce1528f62c1 100644
--- a/Modules/Core/ObjectList/include/otbImageList.h
+++ b/Modules/Core/ObjectList/include/otbImageList.h
@@ -63,20 +63,20 @@ public:
/**
* Update images in the list.
*/
- void UpdateOutputInformation(void) ITK_OVERRIDE;
+ void UpdateOutputInformation(void) override;
void PropagateRequestedRegion(void)
- throw (itk::InvalidRequestedRegionError) ITK_OVERRIDE;
- void UpdateOutputData(void) ITK_OVERRIDE;
+ throw (itk::InvalidRequestedRegionError) override;
+ void UpdateOutputData(void) override;
- void SetRequestedRegion(const itk::DataObject * source);
+ void SetRequestedRegion(const itk::DataObject * source) override;
protected:
/** Constructor */
ImageList() {};
/** Destructor */
- ~ImageList() ITK_OVERRIDE {}
+ ~ImageList() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
index d37f0721855eb34206ddb4fd737b9b10ffb40389..1ebbd143ef80989c8b21309a83f5a6624ec662de 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.h
+++ b/Modules/Core/ObjectList/include/otbImageListSource.h
@@ -65,9 +65,9 @@ protected:
/** Constructor */
ImageListSource();
/** Destructor */
- ~ImageListSource() ITK_OVERRIDE {}
+ ~ImageListSource() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListSource(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index a322ca085af987450b13bbe4021ef8562d316f49..67c27465b62e63371957a5072edbf1f680b52eed 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -75,9 +75,9 @@ protected:
/** Constructor */
ImageListToImageFilter();
/** Destructor */
- ~ImageListToImageFilter() ITK_OVERRIDE {}
+ ~ImageListToImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListToImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
index 9501d330787ee71247e3f4312acca8bb06c69f78..9865945dc4503f92563b52308848f3a357f59e18 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
@@ -81,20 +81,20 @@ public:
/** Generate output information for the ImageList and for each image
in the list. */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region for each image in the list. */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
ImageListToImageListApplyFilter();
/** Destructor */
- ~ImageListToImageListApplyFilter() ITK_OVERRIDE {}
+ ~ImageListToImageListApplyFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListToImageListApplyFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index cde7284b199fb7f5d5acc25a4a11165a081a91cd..1a4838622037f7517cfdfb05898eb83195b72803 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -73,9 +73,9 @@ protected:
/** Constructor */
ImageListToImageListFilter();
/** Destructor */
- ~ImageListToImageListFilter() ITK_OVERRIDE {}
+ ~ImageListToImageListFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListToImageListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
index 164bb2d9bd083da3d567b12c0bc15880cacf2172..d290e9e849e043e3a303b89a45e046926d178a56 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
@@ -73,13 +73,13 @@ protected:
/** Constructor */
ImageListToSingleImageFilter();
/** Destructor */
- ~ImageListToSingleImageFilter() ITK_OVERRIDE {}
+ ~ImageListToSingleImageFilter() override {}
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
index 7149869c746a5fc581719e3633ef11c8a2daea55..ac84491ee543d5c8dcafd322fb47e6727a9d388d 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
@@ -67,26 +67,26 @@ public:
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Constructor */
ImageListToVectorImageFilter() {};
/** Destructor */
- ~ImageListToVectorImageFilter() ITK_OVERRIDE {}
+ ~ImageListToVectorImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListToVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
index 26047d998e7ba6d6a475871f305d02e5871edccb..1978e6966fa2dc94c9d11f2a0b7a30ebefad6bfe 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
@@ -71,9 +71,9 @@ protected:
/** Constructor */
ImageToImageListFilter();
/** Destructor */
- ~ImageToImageListFilter() ITK_OVERRIDE {}
+ ~ImageToImageListFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToImageListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
index b9db494becf30b3c3bf956c318f28c0d9a1cbc9a..6df4f167c879a5ffd349ef2ec587e0e6ad26fb3a 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.h
+++ b/Modules/Core/ObjectList/include/otbObjectList.h
@@ -600,9 +600,9 @@ protected:
/** Constructor */
ObjectList();
/** Destructor */
- ~ObjectList() ITK_OVERRIDE {}
+ ~ObjectList() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ObjectList(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 183c90c93def6b1d26646f5c0cb6a18de0ac2775..586bd3535a4d4649e2a93f9eaaf5c0e85879a110 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -79,7 +79,7 @@ public:
* SmartPointer to a DataObject. If a subclass of ImageSource has
* multiple outputs of different types, then that class must provide
* an implementation of MakeOutput(). */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Graft the specified DataObject onto this ProcessObject's output.
@@ -173,9 +173,9 @@ protected:
/** Constructor */
ObjectListSource();
/** Destructor */
- ~ObjectListSource() ITK_OVERRIDE {}
+ ~ObjectListSource() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Ensure that the output lists are cleared before processing */
virtual void AllocateOutputs();
@@ -190,7 +190,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
ObjectListSource(const Self &); //purposely not implemented
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.txx b/Modules/Core/ObjectList/include/otbObjectListSource.txx
index 20163671fee565e858966d3b7963fc244ad4d521..10bf6116a74291525a213f5beab47d32844f4128 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.txx
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.txx
@@ -145,7 +145,7 @@ void
ObjectListSource<TOutputList>
::GenerateData(void)
{
- itkExceptionMacro("subclass should ITK_OVERRIDE this method!!!");
+ itkExceptionMacro("subclass should override this method!!!");
}
/**
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index 28ee8ea75e246b8d2fc384eb58ab5e49fe461d1b..1b8bfec0ec7bd27269569c3a656637dd3b255156 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -77,11 +77,11 @@ protected:
/** Constructor */
ObjectListToObjectListFilter();
/** Destructor */
- ~ObjectListToObjectListFilter() ITK_OVERRIDE {}
+ ~ObjectListToObjectListFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Multi-threading implementation */
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
index 471131c726f270d7eb335778ceb7004c5f10156f..2104ebf4eae5afea2711d8c35894923df68464c0 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
@@ -134,12 +134,12 @@ ObjectListToObjectListFilter<TInputList, TOutputList>
::ThreadedGenerateData(unsigned int /*startIndex*/, unsigned int /*stopIndex*/, itk::ThreadIdType /*threadId*/)
{
// The following code is equivalent to:
- // itkExceptionMacro("subclass should ITK_OVERRIDE this method!!!");
+ // itkExceptionMacro("subclass should override this method!!!");
// The ExceptionMacro is not used because gcc warns that a
// 'noreturn' function does return
std::ostringstream message;
message << "itk::ERROR: " << this->GetNameOfClass()
- << "(" << this << "): " << "Subclass should ITK_OVERRIDE this method!!!";
+ << "(" << this << "): " << "Subclass should override this method!!!";
itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION);
throw e_;
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
index 46985fc3bdd757c3bcaa5b3b90c8b72dc30fdf41..8f6fa80b675e902c01397df9c463ea4db44cb814 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
@@ -93,15 +93,15 @@ public:
protected:
UnaryFunctorObjectListBooleanFilter();
- ~UnaryFunctorObjectListBooleanFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorObjectListBooleanFilter() override {}
/** Multi-threading implementation */
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** startIndex and stopIndex represent the indices of the Objects to
examine in thread threadId */
- void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, itk::ThreadIdType threadId) override;
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
index 3b8a023dce28e31be3cc6facaddb1bac08c1b4a2..bf101d61818fd6f45307c2588316d6ce43cbf433 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
@@ -94,15 +94,15 @@ public:
protected:
UnaryFunctorObjectListFilter();
- ~UnaryFunctorObjectListFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorObjectListFilter() override {}
/** Multi-threading implementation */
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** startIndex and stopIndex represent the indices of the Objects to
examine in thread threadId */
- void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, itk::ThreadIdType threadId) override;
/** End Multi-threading implementation */
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
index fe62ef5cc55339848336a28549a0e1e382c7cd72..dc864f192cea57f2325dad1018a98630984afb5d 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
@@ -67,22 +67,22 @@ public:
typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Generate the input requested region from the first element in the list. */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Generate the output information by building the output list. */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
VectorImageToImageListFilter() {};
/** Destructor */
- ~VectorImageToImageListFilter() ITK_OVERRIDE {}
+ ~VectorImageToImageListFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorImageToImageListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index f200163aef92ce716c2768aac3c009eda44708e2..c14ed78b7752a8a6c5d8efbc12d545e14fdf7921 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -79,14 +79,14 @@ public:
const InputImageType * GetInput();
/** Prepare the output */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
protected:
ImageToPointSetFilter();
- ~ImageToPointSetFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageToPointSetFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Multi-threading implementation */
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
index 405aa2a2b203bbe8487f383e6e89f78bd44029aa..91e3d755f64f0a2dec6013795c31293f4006cbd8 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
@@ -259,12 +259,12 @@ ImageToPointSetFilter<TInputImage, TOutputPointSet>
::ThreadedGenerateData(const InputImageRegionType&, itk::ThreadIdType)
{
// The following code is equivalent to:
- // itkExceptionMacro("subclass should ITK_OVERRIDE this method!!!");
+ // itkExceptionMacro("subclass should override this method!!!");
// The ExceptionMacro is not used because gcc warns that a
// 'noreturn' function does return
std::ostringstream message;
message << "itk::ERROR: " << this->GetNameOfClass()
- << "(" << this << "): " << "Subclass should ITK_OVERRIDE this method!!!";
+ << "(" << this << "): " << "Subclass should override this method!!!";
itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION);
throw e_;
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
index 76e3c757c011aeff35c5019b0c2c57584b33f7a2..158bfae6f745e705f21693443a6838193de54479 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.h
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
@@ -78,11 +78,11 @@ public:
protected:
PointSetExtractROI();
- ~PointSetExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PointSetExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate Requested Data */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
PointSetExtractROI(const PointSetExtractROI &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index a13340f2839c49e89a41875e028080df93b9e502..785753bac21c639a2ebbb301fc47c3679e43fa21 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -71,9 +71,9 @@ public:
protected:
PointSetFunction();
- ~PointSetFunction() ITK_OVERRIDE {}
+ ~PointSetFunction() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetFunction(const Self &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
index 8a545d4bbea96a0cc24c4ae0548b11d93af26094..601c8b65dbe63fe9a4dc2de8cdc0788dd390c025 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbPointSetSource.h
@@ -125,18 +125,18 @@ public:
* SmartPointer to a DataObject. If a subclass of MeshSource has
* multiple outputs of different types, then that class must provide
* an implementation of MakeOutput(). */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
protected:
PointSetSource();
- ~PointSetSource() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PointSetSource() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Requested region of Point Set is specified as i of N unstructured regions.
* Since all DataObjects should be able to set the requested region in
* unstructured form, just copy output->RequestedRegion all inputs. */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
private:
PointSetSource(const Self &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index f208cb6140aa6f466da2ecec6dac83a2d806771d..bbe2091f4bc3500ebb0b69e385900191a2d4568c 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -73,8 +73,8 @@ public:
protected:
PointSetToPointSetFilter();
- ~PointSetToPointSetFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PointSetToPointSetFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetToPointSetFilter(const PointSetToPointSetFilter &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
index 34f3ad64f210169f51012c136a8881e8f86b060c..e84e807a0abfe1d295bd390d1cef6a1f67b56877 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
@@ -87,9 +87,9 @@ public:
protected:
RandomPointSetSource();
- ~RandomPointSetSource() ITK_OVERRIDE {}
+ ~RandomPointSetSource() override {}
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
RandomPointSetSource(const Self &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
index 0115bbef31d7ebeddc6febc3104651c1808aca68..b3a7fca7078fe762589381479a7fc49d2aef04f3 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
@@ -84,11 +84,11 @@ public:
protected:
ThresholdImageToPointSetFilter();
- ~ThresholdImageToPointSetFilter() ITK_OVERRIDE {}
+ ~ThresholdImageToPointSetFilter() override {}
- void ThreadedGenerateData(const InputImageRegionType& inputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const InputImageRegionType& inputRegionForThread, itk::ThreadIdType threadId) override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ThresholdImageToPointSetFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
index 16f9c5e920bfaf62a649825326eb41cf0e886461..06867c5a98c4ee60bc2ee3e071850de3475bf6ef 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
@@ -75,11 +75,11 @@ public:
protected:
TransformPointSetFilter();
- ~TransformPointSetFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~TransformPointSetFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate Requested Data */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Transform to apply to all the PointSet points. */
typename TransformType::Pointer m_Transform;
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
index 6001dec77a2819f7b80d0e9f9bb985faae971fea..fd49d3ec5ead9cc22fba5877c7517fa8931c476f 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
@@ -101,10 +101,10 @@ public:
protected:
DrawLineSpatialObjectFilter();
- ~DrawLineSpatialObjectFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DrawLineSpatialObjectFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
DrawLineSpatialObjectFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
index 74e752e0438d14fa0c6422925dd22ca63916b67e..72a6854b6ec17c1d1d5a5b891aa32ed36d963a86 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
@@ -92,10 +92,10 @@ public:
protected:
DrawLineSpatialObjectListFilter();
- ~DrawLineSpatialObjectListFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DrawLineSpatialObjectListFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* compute the intersection of the segment to draw with the region
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index 673ada59a9eb4fc30dfafc7b39809892744e49a4..f4af3ce59b931ce1e8adafa1663010d1f60d2527 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -85,8 +85,8 @@ public:
protected:
ImageToLineSpatialObjectListFilter();
- ~ImageToLineSpatialObjectListFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageToLineSpatialObjectListFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToLineSpatialObjectListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
index a4adf2d0548ce1eb525d6b1804eb484455d12961..536f2b305be1f4a17fc999359a0375847560f723 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
@@ -74,19 +74,19 @@ public:
void SetPoints(PointListType& newPoints);
/** Return a point in the list given the index */
- const SpatialObjectPointType* GetPoint(IdentifierType id) const ITK_OVERRIDE
+ const SpatialObjectPointType* GetPoint(IdentifierType id) const override
{
return &(m_Points[id]);
}
/** Return a point in the list given the index */
- SpatialObjectPointType* GetPoint(IdentifierType id) ITK_OVERRIDE
+ SpatialObjectPointType* GetPoint(IdentifierType id) override
{
return &(m_Points[id]);
}
/** Return the number of points in the list */
- SizeValueType GetNumberOfPoints(void) const ITK_OVERRIDE
+ SizeValueType GetNumberOfPoints(void) const override
{
return m_Points.size();
}
@@ -94,18 +94,18 @@ public:
/** Returns true if the line is evaluable at the requested point,
* false otherwise. */
bool IsEvaluableAt(const PointType& point,
- unsigned int depth = 0, char * name = ITK_NULLPTR) const ITK_OVERRIDE;
+ unsigned int depth = 0, char * name = ITK_NULLPTR) const override;
/** Returns the value of the line at that point.
* Currently this function returns a binary value,
* but it might want to return a degree of membership
* in case of fuzzy Lines. */
bool ValueAt(const PointType& point, double& value,
- unsigned int depth = 0, char * name = ITK_NULLPTR) const ITK_OVERRIDE;
+ unsigned int depth = 0, char * name = ITK_NULLPTR) const override;
/** Returns true if the point is inside the line, false otherwise. */
bool IsInside(const PointType& point,
- unsigned int depth, char * name) const ITK_OVERRIDE;
+ unsigned int depth, char * name) const override;
/** Test whether a point is inside or outside the object
* For computational speed purposes, it is faster if the method does not
@@ -113,15 +113,15 @@ public:
virtual bool IsInside(const PointType& point) const;
/** Compute the boundaries of the line.*/
- bool ComputeLocalBoundingBox() const ITK_OVERRIDE;
+ bool ComputeLocalBoundingBox() const override;
protected:
/** Constructor */
LineSpatialObject();
/** Destructor */
- ~LineSpatialObject() ITK_OVERRIDE;
+ ~LineSpatialObject() override;
/** Method to print the object. */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LineSpatialObject(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
index 794b1efdc69b8b70a6adc80b864fdf3f845da267..c1ab636cb3b4bad147a2f39ab4e4ea7ee646ebc0 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
@@ -58,7 +58,7 @@ public:
protected:
LineSpatialObjectList() {};
- ~LineSpatialObjectList() ITK_OVERRIDE {}
+ ~LineSpatialObjectList() override {}
private:
LineSpatialObjectList(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index 9d15dcf2197e4c88fb3fb7f204468ac269d8dfb1..9da17bfef6ee4c72d96feacf671c5feca1006c13 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -74,8 +74,8 @@ public:
protected:
LineSpatialObjectListToPointSetFilter();
- ~LineSpatialObjectListToPointSetFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LineSpatialObjectListToPointSetFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LineSpatialObjectListToPointSetFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
index 05a54394645475430a355602b9ea9862205dc905..fadfaff42ab6263640e67554600c6df3bd175cdf 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
@@ -67,9 +67,9 @@ protected:
/** Constructor */
SpatialObjectSource();
/** Destructor */
- ~SpatialObjectSource() ITK_OVERRIDE {}
+ ~SpatialObjectSource() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SpatialObjectSource(const Self &); //purposely not implemented
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index aa10112f6e976d9a640e8b6ffc499c8e1700edc4..26326dc30cf2edcadfc65755397caa3c26600f6a 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -140,10 +140,10 @@ public:
protected:
SpatialObjectToImageDrawingFilter();
- ~SpatialObjectToImageDrawingFilter() ITK_OVERRIDE;
+ ~SpatialObjectToImageDrawingFilter() override;
- void GenerateOutputInformation() ITK_OVERRIDE; // do nothing
- void GenerateData() ITK_OVERRIDE;
+ void GenerateOutputInformation() override; // do nothing
+ void GenerateData() override;
SizeType m_Size;
double m_Spacing[OutputImageDimension];
@@ -153,7 +153,7 @@ protected:
ValueType m_OutsideValue;
bool m_UseObjectValue;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SpatialObjectToImageDrawingFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
index e1045bcdc1bb5c21f5a96046a0ba87cfa7c520af..10283c7db89a51f110380291b965771e437b5eb8 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
@@ -68,11 +68,11 @@ public:
itkGetMacro(NumberOfDivisions, unsigned int);
/** Actually computes the stream divisions given a DataObject and its region to write */
- void PrepareStreaming(itk::DataObject * /*input*/, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * /*input*/, const RegionType ®ion) override;
protected:
NumberOfDivisionsStrippedStreamingManager();
- ~NumberOfDivisionsStrippedStreamingManager() ITK_OVERRIDE;
+ ~NumberOfDivisionsStrippedStreamingManager() override;
/** The splitter type used to generate the different strips */
typedef itk::ImageRegionSplitterSlowDimension SplitterType;
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
index 0b72ca8f92c80af7943832e1ed6e25c374999d6a..270dc471e7017e756068eecffaaa784f8f1d50d1 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
@@ -67,11 +67,11 @@ public:
itkGetMacro(NumberOfDivisions, unsigned int);
/** Actually computes the stream divisions given a DataObject and its region to write */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
protected:
NumberOfDivisionsTiledStreamingManager();
- ~NumberOfDivisionsTiledStreamingManager() ITK_OVERRIDE;
+ ~NumberOfDivisionsTiledStreamingManager() override;
/** The number of lines per strip desired by the user.
* This may be different than the one computed by the Splitter */
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
index a6b5c1bf2d85fe26a1a2535bdb5030ffbf907d44..6426c858b62e6de2aa328a051d11adb2b91a3cd3 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
@@ -69,11 +69,11 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * /*input*/, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * /*input*/, const RegionType ®ion) override;
protected:
NumberOfLinesStrippedStreamingManager();
- ~NumberOfLinesStrippedStreamingManager() ITK_OVERRIDE;
+ ~NumberOfLinesStrippedStreamingManager() override;
/** The splitter type used to generate the different strips */
typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(ImageDimension)> SplitterType;
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
index 47c08879e6f974f82d90eaf9fb0c8c7a6d543981..692848d8332cdd05fa6c02e548aa720ec3523aae 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
@@ -73,17 +73,17 @@ public:
itkGetConstObjectMacro(Filter, FilterType);
itkGetObjectMacro(Streamer, StreamerType);
- void Update(void) ITK_OVERRIDE;
+ void Update(void) override;
protected:
/** Constructor */
PersistentFilterStreamingDecorator();
/** Destructor */
- ~PersistentFilterStreamingDecorator() ITK_OVERRIDE {}
+ ~PersistentFilterStreamingDecorator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/// Object responsible for streaming
StreamerPointerType m_Streamer;
diff --git a/Modules/Core/Streaming/include/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
index 69267fd73082bf9963a98aa863806f1791fdd483..f40159b95ec7d10afd7ba4452c9619f531175bbf 100644
--- a/Modules/Core/Streaming/include/otbPersistentImageFilter.h
+++ b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
@@ -73,9 +73,9 @@ protected:
/** Constructor */
PersistentImageFilter() {}
/** Destructor */
- ~PersistentImageFilter() ITK_OVERRIDE {}
+ ~PersistentImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
index 41fe7808e9d84a0d0ae3017996e417ea0cd97c3a..19c65071424f832ee7e6e239c05adcd142c56a1f 100644
--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
@@ -128,10 +128,10 @@ protected:
PipelineMemoryPrintCalculator();
/** Destructor */
- ~PipelineMemoryPrintCalculator() ITK_OVERRIDE;
+ ~PipelineMemoryPrintCalculator() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Recursive method to evaluate memory print in bytes */
MemoryPrintType EvaluateProcessObjectPrintRecursive(ProcessObjectType * process);
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
index 2fd479680324e3e5d6cb16ea0ec4cc7d2389fecf..2ddeccf21547d0f37b79972354a7f5a078406892 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
@@ -83,11 +83,11 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
protected:
RAMDrivenAdaptativeStreamingManager();
- ~RAMDrivenAdaptativeStreamingManager() ITK_OVERRIDE;
+ ~RAMDrivenAdaptativeStreamingManager() override;
/** The number of MegaBytes of RAM available */
unsigned int m_AvailableRAMInMB;
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
index 1fc33b9ac1dbcf6961e50b1d1a631c724b1dd0cb..332c2610d29417bbc27bd05df00831d4f8f03762 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
@@ -78,11 +78,11 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
protected:
RAMDrivenStrippedStreamingManager();
- ~RAMDrivenStrippedStreamingManager() ITK_OVERRIDE;
+ ~RAMDrivenStrippedStreamingManager() override;
/** The splitter type used to generate the different strips */
typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(ImageDimension)> SplitterType;
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
index 6ea176b708b6d399b43da34cfa3540be80b5bece..d5b40a858c5790102815ad80135984cdc79ddb02 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
@@ -77,11 +77,11 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
protected:
RAMDrivenTiledStreamingManager();
- ~RAMDrivenTiledStreamingManager() ITK_OVERRIDE;
+ ~RAMDrivenTiledStreamingManager() override;
/** The number of MegaBytes of RAM available */
unsigned int m_AvailableRAMInMB;
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index feff1c60c5f9fc4d22bb40fe105df908a63345fd..998ba4c287f98991973e8c15d96448124ad21058 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -140,18 +140,18 @@ public:
/** Override Update() from ProcessObject
* This filter does not produce an output */
- void Update() ITK_OVERRIDE;
+ void Update() override;
protected:
StreamingImageVirtualWriter();
- ~StreamingImageVirtualWriter() ITK_OVERRIDE;
+ ~StreamingImageVirtualWriter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
private:
StreamingImageVirtualWriter(const StreamingImageVirtualWriter &); //purposely not implemented
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
index 2095e48e8f8199a9d8882a6fb2b690f7b9cbb012..e5a853309aec737f70898f384c56a7d69dc95c28 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbStreamingManager.h
@@ -90,7 +90,7 @@ public:
protected:
StreamingManager();
- ~StreamingManager() ITK_OVERRIDE;
+ ~StreamingManager() override;
virtual unsigned int EstimateOptimalNumberOfDivisions(itk::DataObject * input, const RegionType ®ion,
MemoryPrintType availableRAMInMB,
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
index 0bb3ee36dd0ef947f571d4c3db196e1f9d155e9b..a4286febb0361ccb687d85cdf4d81cd665d61656 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
@@ -72,11 +72,11 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
protected:
TileDimensionTiledStreamingManager();
- ~TileDimensionTiledStreamingManager() ITK_OVERRIDE;
+ ~TileDimensionTiledStreamingManager() override;
/** The number of lines per strip desired by the user.
* This may be different than the one computed by the Splitter */
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
index 3a5e8a643e35dff75004c1354b2efe2bb4337b26..f638c972335b9f833dd41ea45562d2ef36236616 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.h
+++ b/Modules/Core/Transform/include/otbCompositeTransform.h
@@ -118,7 +118,7 @@ public:
itkGetConstReferenceMacro(SecondTransform, SecondTransformPointerType);
/** Method to transform a point. */
- SecondTransformOutputPointType TransformPoint(const FirstTransformInputPointType&) const ITK_OVERRIDE;
+ SecondTransformOutputPointType TransformPoint(const FirstTransformInputPointType&) const override;
/** Method to transform a vector. */
// virtual OutputVectorType TransformVector(const InputVectorType &) const;
@@ -131,7 +131,7 @@ public:
protected:
CompositeTransform();
- ~CompositeTransform() ITK_OVERRIDE;
+ ~CompositeTransform() override;
FirstTransformPointerType m_FirstTransform;
SecondTransformPointerType m_SecondTransform;
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
index eb09f6f2094ae44d9f14faf1dcae33f427c00156..c15842667466ecf61249ecbde81cbebde1f20936 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.h
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.h
@@ -74,14 +74,14 @@ public:
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
/** Compute the world coordinates. */
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
protected:
ForwardSensorModel();
- ~ForwardSensorModel() ITK_OVERRIDE;
+ ~ForwardSensorModel() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
index d7030760b47399069b2b16309ce06847b04a1d40..4e6d5f15ff3621384cd10bb84a8dfb1c14be0b6b 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.h
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.h
@@ -98,7 +98,7 @@ public:
virtual void PrintMap() const;
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
virtual bool InstantiateProjection();
@@ -111,9 +111,9 @@ public:
protected:
GenericMapProjection();
- ~GenericMapProjection() ITK_OVERRIDE;
+ ~GenericMapProjection() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
MapProjectionAdapter::Pointer m_MapProjection;
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
index aac8f9468435e2b2b8e57508fcabcaa4278d316a..35f0bc7cde4fbed8eddaeebcee1d4f922d596b6f 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.h
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.h
@@ -168,31 +168,31 @@ public:
/** Methods prototypes */
virtual const TransformType * GetTransform() const;
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
virtual void InstantiateTransform();
// Get inverse methods
bool GetInverse(Self * inverseTransform) const;
- InverseTransformBasePointer GetInverseTransform() const ITK_OVERRIDE;
+ InverseTransformBasePointer GetInverseTransform() const override;
// Dummy set parameter method
- void SetParameters(const typename Superclass::ParametersType &) ITK_OVERRIDE {}
+ void SetParameters(const typename Superclass::ParametersType &) override {}
// Dummy ComputeJacobianWithRespectToParameters method
- void ComputeJacobianWithRespectToParameters(const InputPointType &, JacobianType& ) const ITK_OVERRIDE {}
+ void ComputeJacobianWithRespectToParameters(const InputPointType &, JacobianType& ) const override {}
protected:
GenericRSTransform();
- ~GenericRSTransform() ITK_OVERRIDE {}
+ ~GenericRSTransform() override {}
- void Modified() const ITK_OVERRIDE
+ void Modified() const override
{
this->Superclass::Modified();
m_TransformUpToDate = false;
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GenericRSTransform(const Self &); //purposely not implemented
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
index c7874d5413600917d46996b0c2ba5f867bcc2c5b..9d53f04f14136d02c08b51b9611381046b41126c 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.h
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.h
@@ -66,11 +66,11 @@ public:
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
protected:
GeocentricTransform();
- ~GeocentricTransform() ITK_OVERRIDE;
+ ~GeocentricTransform() override;
EllipsoidAdapter::Pointer m_Ellipsoid;
private:
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index 27742733b67b9ad06bd3705b4f3e2555ff6e0420..79850a27d9ab2c86c2c957bdb63869e5f55b44db 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -163,7 +163,7 @@ public:
protected:
ImageToGenericRSOutputParameters();
- ~ImageToGenericRSOutputParameters() ITK_OVERRIDE {}
+ ~ImageToGenericRSOutputParameters() override {}
private:
ImageToGenericRSOutputParameters(const Self&); //purposely not implemented
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
index 99b220d91a7d2b43b0f272d5b7193f03fd4ecc78..14d60db886f406eae1b8e1125d055c4e049682e8 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
@@ -83,50 +83,50 @@ public:
* Set the transform parameters through the standard interface.
* \param parameters The parameters of the transform.
*/
- void SetParameters(const ParametersType& parameters) ITK_OVERRIDE;
+ void SetParameters(const ParametersType& parameters) override;
/**
* Get the transform parameters through the standard interface.
* \return The parameters of the transform.
*/
- ParametersType& GetParameters(void) const ITK_OVERRIDE;
+ ParametersType& GetParameters(void) const override;
/**
* Set the Fixed Parameters
* \param param The fixed parameters of the transform.
*/
- void SetFixedParameters( const ParametersType & param) ITK_OVERRIDE
+ void SetFixedParameters( const ParametersType & param) override
{ this->m_FixedParameters = param; }
/**
* Get the Fixed Parameters
* \return The Fixed parameters of the transform.
*/
- const ParametersType& GetFixedParameters(void) const ITK_OVERRIDE{return this->m_FixedParameters; }
+ const ParametersType& GetFixedParameters(void) const override{return this->m_FixedParameters; }
/**
* Transform a point.
* \param point The point to transform.
* \return The transformed point.
*/
using Superclass::TransformVector;
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
/**
* Transform a vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVectorType TransformVector(const InputVectorType& vector) const ITK_OVERRIDE;
+ OutputVectorType TransformVector(const InputVectorType& vector) const override;
/**
* Transform a vnl vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const ITK_OVERRIDE;
+ OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const override;
protected:
/** Constructor */
InverseLogPolarTransform();
/** Destructor */
- ~InverseLogPolarTransform() ITK_OVERRIDE;
+ ~InverseLogPolarTransform() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
InverseLogPolarTransform(const Self &); // purposely not implemented
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
index 92461591c541793dcfe3df6232dc877b4b8821fb..acb24a2f5ebbdb76cb24f8e2384003e023fe1db7 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.h
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.h
@@ -74,16 +74,16 @@ public:
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
// Transform of geographic point in image sensor index
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
// Transform of geographic point in image sensor index -- Backward Compatibility
// OutputPointType TransformPoint(const InputPointType &point, double height) const;
protected:
InverseSensorModel();
- ~InverseSensorModel() ITK_OVERRIDE;
+ ~InverseSensorModel() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
index 19081e97be2e3b95dbabd8b369afd01bd26a9d9f..110595ffa993af2cadea4bb3ab449d88652cac23 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.h
@@ -84,53 +84,53 @@ public:
* Set the transform parameters through the standard interface.
* \param parameters The parameters of the transform.
*/
- void SetParameters(const ParametersType& parameters) ITK_OVERRIDE;
+ void SetParameters(const ParametersType& parameters) override;
/**
* Get the transform parameters through the standard interface.
* \return The parameters of the transform.
*/
- ParametersType& GetParameters(void) const ITK_OVERRIDE;
+ ParametersType& GetParameters(void) const override;
/**
* Set the Fixed Parameters
* \param param The fixed parameters of the transform.
*/
- void SetFixedParameters( const ParametersType & param) ITK_OVERRIDE
+ void SetFixedParameters( const ParametersType & param) override
{ this->m_FixedParameters = param; }
/**
* Get the Fixed Parameters
* \return The Fixed parameters of the transform.
*/
- const ParametersType& GetFixedParameters(void) const ITK_OVERRIDE{return this->m_FixedParameters; }
+ const ParametersType& GetFixedParameters(void) const override{return this->m_FixedParameters; }
/**
* Transform a point.
* \param point The point to transform.
* \return The transformed point.
*/
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
/**
* Transform a vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
using Superclass::TransformVector;
- OutputVectorType TransformVector(const InputVectorType& vector) const ITK_OVERRIDE;
+ OutputVectorType TransformVector(const InputVectorType& vector) const override;
/**
* Transform a vnl vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const ITK_OVERRIDE;
+ OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const override;
protected:
/** Constructor */
LogPolarTransform();
/** Destructor */
- ~LogPolarTransform() ITK_OVERRIDE;
+ ~LogPolarTransform() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LogPolarTransform(const Self &); // purposely not implemented
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index 07d4e2353f9aa75e5b10245299b6d7b445960d1b..f2ae212e5dc0a142a9308bfd4934891466d5bf34 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -92,10 +92,10 @@ public:
protected:
SensorModelBase();
- ~SensorModelBase() ITK_OVERRIDE;
+ ~SensorModelBase() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ImageKeywordlist */
ImageKeywordlist m_ImageKeywordlist;
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index 97a32a5701e1dabd1e78ba1aaf5f2aa7d8eb2fa2..41b7058b528737bcd5ee371a129ee32a496e8ed8 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -96,22 +96,22 @@ protected:
/** Constructor */
StreamingWarpImageFilter();
/** Destructor */
- ~StreamingWarpImageFilter() ITK_OVERRIDE {}
+ ~StreamingWarpImageFilter() override {}
/** PrintSelf */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* This filters requires only a part of the input and of the displacement field to
* produce its output. As such, we need to overload the GenerateInputRequestedRegion() method.
*/
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/**
* Re-implement the method ThreadedGenerateData to mask area outside the deformation grid
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId ) ITK_OVERRIDE;
+ itk::ThreadIdType threadId ) override;
private:
StreamingWarpImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Core/Transform/include/otbTransform.h b/Modules/Core/Transform/include/otbTransform.h
index 41e90ac5ec8a85e708b2c1e7ce6744a0c2b49bda..17dd9e92e0a17362eb1f65b4ec2eca25e799aa92 100644
--- a/Modules/Core/Transform/include/otbTransform.h
+++ b/Modules/Core/Transform/include/otbTransform.h
@@ -58,10 +58,10 @@ public:
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
/** Get the size of the input space */
- unsigned int GetInputSpaceDimension(void) const ITK_OVERRIDE { return NInputDimensions; }
+ unsigned int GetInputSpaceDimension(void) const override { return NInputDimensions; }
/** Get the size of the output space */
- unsigned int GetOutputSpaceDimension(void) const ITK_OVERRIDE { return NOutputDimensions; }
+ unsigned int GetOutputSpaceDimension(void) const override { return NOutputDimensions; }
/** Type of the scalar representing coordinate and vector elements. */
typedef TScalarType ScalarType;
@@ -98,12 +98,12 @@ public:
/** Method to transform a point. */
- OutputPointType TransformPoint(const InputPointType & ) const ITK_OVERRIDE
+ OutputPointType TransformPoint(const InputPointType & ) const override
{ return OutputPointType(); }
using Superclass::TransformVector;
/** Method to transform a vector. */
- OutputVectorType TransformVector(const InputVectorType &) const ITK_OVERRIDE
+ OutputVectorType TransformVector(const InputVectorType &) const override
{ return OutputVectorType(); }
/** Method to transform a vnl_vector. */
@@ -113,7 +113,7 @@ public:
using Superclass::TransformCovariantVector;
/** Method to transform a CovariantVector. */
OutputCovariantVectorType TransformCovariantVector(
- const InputCovariantVectorType &) const ITK_OVERRIDE
+ const InputCovariantVectorType &) const override
{ return OutputCovariantVectorType(); }
@@ -124,12 +124,12 @@ public:
* SetParametersByValue.
* \sa SetParametersByValue
*/
- void SetParameters( const ParametersType & ) ITK_OVERRIDE
- { itkExceptionMacro( << "Subclasses should ITK_OVERRIDE this method (SetParameters)" ) }
+ void SetParameters( const ParametersType & ) override
+ { itkExceptionMacro( << "Subclasses should override this method (SetParameters)" ) }
- void ComputeJacobianWithRespectToParameters(const InputPointType &, JacobianType& ) const ITK_OVERRIDE
+ void ComputeJacobianWithRespectToParameters(const InputPointType &, JacobianType& ) const override
{
- itkExceptionMacro(<< "Subclasses should ITK_OVERRIDE this method (ComputeJacobianWithRespectToParameters)" );
+ itkExceptionMacro(<< "Subclasses should override this method (ComputeJacobianWithRespectToParameters)" );
}
/** Set the transformation parameters and update internal transformation.
@@ -139,23 +139,23 @@ public:
* by keeping a reference to the parameters.
* \sa SetParameters
*/
- void SetParametersByValue(const ParametersType & p) ITK_OVERRIDE
+ void SetParametersByValue(const ParametersType & p) override
{ this->SetParameters (p); }
/** Get the Transformation Parameters. */
- const ParametersType & GetParameters(void) const ITK_OVERRIDE
+ const ParametersType & GetParameters(void) const override
{
return m_Parameters;
}
/** Set the fixed parameters and update internal transformation. */
- void SetFixedParameters( const ParametersType & ) ITK_OVERRIDE
- { itkExceptionMacro( << "Subclasses should ITK_OVERRIDE this method (SetFixedParameters)" ) }
+ void SetFixedParameters( const ParametersType & ) override
+ { itkExceptionMacro( << "Subclasses should override this method (SetFixedParameters)" ) }
/** Get the Fixed Parameters. */
- const ParametersType& GetFixedParameters(void) const ITK_OVERRIDE
+ const ParametersType& GetFixedParameters(void) const override
{
- itkExceptionMacro( << "Subclasses should ITK_OVERRIDE this method (GetFixedParameters)" );
+ itkExceptionMacro( << "Subclasses should override this method (GetFixedParameters)" );
// Next line is needed to avoid errors due to:
// "function must return a value".
return this->m_FixedParameters;
@@ -190,14 +190,14 @@ public:
* */
virtual const JacobianType & GetJacobian(const InputPointType &) const
{
- itkExceptionMacro( << "Subclass should ITK_OVERRIDE this method (GetJacobian)" );
+ itkExceptionMacro( << "Subclass should override this method (GetJacobian)" );
// Next line is needed to avoid errors due to:
// "function must return a value" .
return this->m_Jacobian;
}
/** Return the number of parameters that completely define the Transfom */
- NumberOfParametersType GetNumberOfParameters(void) const ITK_OVERRIDE
+ NumberOfParametersType GetNumberOfParameters(void) const override
{ return this->m_Parameters.Size(); }
protected:
@@ -208,9 +208,9 @@ protected:
: Superclass::Transform(numberOfParameters)
{}
- ~Transform() ITK_OVERRIDE {}
+ ~Transform() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
#if 0
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index b1669467fcf06d16bbb50493e0588a9512393984..f3752c8c88398204a525301c40e028906b54b498 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -290,9 +290,9 @@ protected:
/** Constructor */
DataNode();
/** Destructor */
- ~DataNode() ITK_OVERRIDE {}
+ ~DataNode() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
OGRGeometry* ConvertDataNodeToOGRGeometry(const DataNode* dataNode);
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
index b3264ded63516c0e08451cb9fc88d0efb2714a47..33016b73da44cd0cc28519ae3ee8858314e8b798 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
@@ -32,7 +32,7 @@ namespace otb
* the abstract method Evaluate() maps a DataNode from the input space to a element
* in the output space.
*
- * Subclasses must ITK_OVERRIDE Evaluate().
+ * Subclasses must override Evaluate().
*
* This class is template over the input DataNode type and
* the output (range) type.
@@ -66,11 +66,11 @@ public:
typedef TOutput OutputType;
/** Evaluate at the specified input position */
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE = 0;
+ OutputType Evaluate( const DataNodeType& node ) const override = 0;
protected:
DataNodeFunctionBase(){};
- ~DataNodeFunctionBase() ITK_OVERRIDE{};
+ ~DataNodeFunctionBase() override{};
private:
DataNodeFunctionBase(const Self& ); //purposely not implemented
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
index ece3dc41b8276d02dffde079aeb1365316162d8c..5f389b35b625acc114bc80f6953a19298174accc 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
@@ -107,7 +107,7 @@ public:
/** Evaluate the function at specified DataNode position.
* Subclasses must provide this method. */
- TOutput Evaluate( const DataNodeType& node ) const ITK_OVERRIDE = 0;
+ TOutput Evaluate( const DataNodeType& node ) const override = 0;
/** Check if an index is inside the image buffer.
* we take into account the fact that each voxel has its
@@ -186,8 +186,8 @@ public:
protected:
DataNodeImageFunction();
- ~DataNodeImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DataNodeImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Const pointer to the input image. */
InputImageConstPointer m_Image;
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
index 7adb0b06ad2318453c18f63daaa82448772a2394..798dd99dbe894fc14c873a67a0aa0e6e0be8d40d 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
@@ -88,12 +88,12 @@ public:
/** Evaluate the function at specified DataNode position.
* Subclasses must provide this method. */
- TOutput Evaluate( const DataNodeType& node ) const ITK_OVERRIDE = 0;
+ TOutput Evaluate( const DataNodeType& node ) const override = 0;
protected:
DataNodeVectorDataFunction();
- ~DataNodeVectorDataFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DataNodeVectorDataFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Const pointer to the input VectorData. */
VectorDataConstPointerType m_VectorData;
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
index a6ff72468a51dc72f7b02e04634d9eec7a14e892..1a54429a791c7e55c04c69ac44eb69866162a6f2 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
@@ -117,13 +117,13 @@ protected:
/** Constructor */
PolyLineParametricPathWithValue();
/** Destructor */
- ~PolyLineParametricPathWithValue() ITK_OVERRIDE {}
+ ~PolyLineParametricPathWithValue() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
virtual void ComputeLength() const;
virtual void ComputeBoundingRegion() const;
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
PolyLineParametricPathWithValue(const Self &); //purposely not implemented
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
index a85c8a138a1c8e4e68a32141b02b170f7c2c50ef..1d7cd20faed2054731c54c5ba38ab3c2ac53abfd 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.h
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.h
@@ -126,9 +126,9 @@ public:
* Return the polygon length (perimeter).
* \return The length.
*/
- double GetLength() const ITK_OVERRIDE;
+ double GetLength() const override;
- void AddVertex(const ContinuousIndexType& vertex) ITK_OVERRIDE;
+ void AddVertex(const ContinuousIndexType& vertex) override;
protected:
/** Constructor */
@@ -140,13 +140,13 @@ protected:
};
/** Destructor */
- ~Polygon() ITK_OVERRIDE {}
+ ~Polygon() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
virtual void ComputeArea() const;
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
Polygon(const Self &); //purposely not implemented
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index 0a1b8968e07179d3c599dc99374c16e38dea897e..75c1f0bee44b36fd04fa014fc14871f5be701244 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -129,15 +129,15 @@ public:
* SmartPointers to the same VectorData since separate DataObjects are
* still maintained. This method is similar to
* VectorDataSource::GraftOutput(). */
- void Graft(const itk::DataObject *data) ITK_OVERRIDE;
+ void Graft(const itk::DataObject *data) override;
protected:
/** Constructor */
VectorData();
/** Destructor */
- ~VectorData() ITK_OVERRIDE {}
+ ~VectorData() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorData(const Self&); //purposely not implemented
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
index de1e241fc20c42e0436288a1bcf247c0b1891bba..fac29ae71b9e4f0384ca5909324837e25dc9523a 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
@@ -153,9 +153,9 @@ public:
protected:
VectorDataIOBase();
- ~VectorDataIOBase() ITK_OVERRIDE;
+ ~VectorDataIOBase() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Big or Little Endian, and the type of the file. (May be ignored.) */
ByteOrder m_ByteOrder;
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index f1e8633b23c00bdb3a0bd698c6dd5bc5ed976a0b..59f22cca0e9d75014866b3212148c9d065084ffd 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -86,9 +86,9 @@ protected:
/** Constructor */
VectorDataProperties() : m_VectorDataObject(ITK_NULLPTR) {};
/** Destructor */
- ~VectorDataProperties() ITK_OVERRIDE {}
+ ~VectorDataProperties() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void ProcessNode(InternalTreeNodeType * source);
bool IsBoundingRegionNull();
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
index 7700768b4cec22e2ada3046ff9674965f9110b68..4031a0b46618eff76d1c9bbbaa64fc192c0fd061 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
@@ -83,9 +83,9 @@ public:
protected:
VectorDataSource();
- ~VectorDataSource() ITK_OVERRIDE;
+ ~VectorDataSource() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Ensure that the output vector data are cleared before processing */
virtual void AllocateOutputs();
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
index 51f432a1a49a9051fc5f2ee5031b5e9c86a7ba32..024c296191fae5b2c212f72fcdb4a2e27bff5f10 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
@@ -71,11 +71,11 @@ public:
protected:
CloudDetectionFilter();
- ~CloudDetectionFilter() ITK_OVERRIDE {}
+ ~CloudDetectionFilter() override {}
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
CloudDetectionFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
index 5f0d5eadc7840d10aa856208dd11b6a0e9aeb3ca..fc795bbf1fca85721c9880f98954f3f7c3b0c641 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
@@ -73,11 +73,11 @@ public:
protected:
CloudEstimatorFilter();
- ~CloudEstimatorFilter() ITK_OVERRIDE {}
+ ~CloudEstimatorFilter() override {}
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
CloudEstimatorFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
index a7d582d84814cd45b2fbb61e1a84ea56b5a3946d..3ab76e6b4511dc8c1e452ec89e01148326bba4c0 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
@@ -151,31 +151,31 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Reset(void) override;
+ void Synthetize(void) override;
- void AddInput(itk::DataObject * dataObject) ITK_OVERRIDE
+ void AddInput(itk::DataObject * dataObject) override
{
Superclass::AddInput(dataObject);
}
protected:
PersistentDescriptorsListSampleGenerator();
- ~PersistentDescriptorsListSampleGenerator() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentDescriptorsListSampleGenerator() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Multi-thread version GenerateData. */
void ThreadedGenerateData(const RegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
PersistentDescriptorsListSampleGenerator(const Self &); //purposely not implemented
@@ -303,7 +303,7 @@ public:
return this->GetFilter()->GetInput();
}
- void AddInput(itk::DataObject * dataObject) ITK_OVERRIDE
+ void AddInput(itk::DataObject * dataObject) override
{
this->GetFilter()->AddInput(dataObject);
}
@@ -363,7 +363,7 @@ public:
DescriptorsListSampleGenerator();
/** Destructor */
- ~DescriptorsListSampleGenerator() ITK_OVERRIDE;
+ ~DescriptorsListSampleGenerator() override;
private:
DescriptorsListSampleGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
index 8aff97fc815832c648c68e9c22ccb09fbd7b7ae0..46ff16f5af8aa71a5865777d840d53c736673047 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
@@ -82,8 +82,8 @@ public:
protected:
FlusserMomentsIFFactory(){}
- ~FlusserMomentsIFFactory() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FlusserMomentsIFFactory() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FlusserMomentsIFFactory(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
index 36f7890b0c8df423ad16b53b78405849a00ebd7c..4a55751a558ada83bcff0e032f6a05acc3b529ff 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
@@ -81,8 +81,8 @@ public:
protected:
FourierMellinDescriptorsIFFactory(){}
- ~FourierMellinDescriptorsIFFactory() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FourierMellinDescriptorsIFFactory() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FourierMellinDescriptorsIFFactory(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
index 570ba05b999055fb29b54954c55e400594c5f49c..1169695ab10f0b4225a1c259d470ba23ba31db18 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
@@ -83,8 +83,8 @@ public:
protected:
HaralickTexturesIFFactory(){}
- ~HaralickTexturesIFFactory() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HaralickTexturesIFFactory() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HaralickTexturesIFFactory(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
index a0d118d046d858c1f874dbdd3555532f3e1d8652..75d2d09a9cbdeb98cc0b5e95a1b6e31cd3326d33 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
@@ -116,11 +116,11 @@ public:
protected:
LabeledSampleLocalizationGenerator();
- ~LabeledSampleLocalizationGenerator() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabeledSampleLocalizationGenerator() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Triggers the Computation of the sample list */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
PointVectorType RandomPointsGenerator(DataNodeType * node);
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
index f52cc96fb72765ce28c616afb34d4be452ccae7a..2ff4b90c983b72799ab44bffb9f26ca3a60b229d 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
@@ -82,8 +82,8 @@ public:
protected:
LocalHistogramIFFactory(){}
- ~LocalHistogramIFFactory() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LocalHistogramIFFactory() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LocalHistogramIFFactory(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
index c051b33997673d423c5c306dc0b6aa2026313c9c..276062f0f06f120e2e0119cf66f0f39a9de2bfe7 100644
--- a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
+++ b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
@@ -123,7 +123,7 @@ public:
typedef itk::Statistics::ListSample<DescriptorType> ListSampleType;
- void AddInput(itk::DataObject * dataObject) ITK_OVERRIDE
+ void AddInput(itk::DataObject * dataObject) override
{
this->Superclass::AddInput(dataObject);
}
@@ -161,29 +161,29 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
protected:
PersistentObjectDetectionClassifier();
- ~PersistentObjectDetectionClassifier() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentObjectDetectionClassifier() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Multi-thread version GenerateData. */
void ThreadedGenerateData(const RegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
PersistentObjectDetectionClassifier(const Self &); //purposely not implemented
@@ -319,7 +319,7 @@ public:
return this->GetFilter()->GetOutputVectorData();
}
- void AddInput(itk::DataObject * dataObject) ITK_OVERRIDE
+ void AddInput(itk::DataObject * dataObject) override
{
this->GetFilter()->AddInput(dataObject);
}
@@ -377,7 +377,7 @@ public:
ObjectDetectionClassifier();
/** Destructor */
- ~ObjectDetectionClassifier() ITK_OVERRIDE;
+ ~ObjectDetectionClassifier() override;
private:
ObjectDetectionClassifier(const Self &); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
index 6d642ec5049cfc89ebed91cab6bfb3edb2cd79ee..9d971e97b202a7f376963cedd891c407c5ae4486 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
@@ -82,8 +82,8 @@ public:
protected:
RadiometricMomentsIFFactory(){}
- ~RadiometricMomentsIFFactory() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~RadiometricMomentsIFFactory() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RadiometricMomentsIFFactory(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
index eb747ff5a7c5a2bb79355291f65e5a243558855a..3d03e06d991bd7a17c50bcd09720a5bea70e6d08 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
@@ -170,8 +170,8 @@ public:
protected:
StandardMetaImageFunctionBuilder();
- ~StandardMetaImageFunctionBuilder() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~StandardMetaImageFunctionBuilder() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StandardMetaImageFunctionBuilder(const Self& ); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
index 2b75f86699fb3fcdb88b8a51a654c9ac1ab73e30..6781f42e6496bc54959ab370640d31cd3bf42947 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
@@ -67,11 +67,11 @@ protected:
/** Constructor */
BreakAngularPathListFilter();
/** Destructor */
- ~BreakAngularPathListFilter() ITK_OVERRIDE {}
+ ~BreakAngularPathListFilter() override {}
/** GenerateData method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BreakAngularPathListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index e016246411ba8c21863fc060da8f548eb237d747..e3680973f1a6584e90c08d434ecf9ae4545510f0 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -189,7 +189,7 @@ protected:
/** Constructor */
GenericRoadExtractionFilter();
/** Destructor */
- ~GenericRoadExtractionFilter() ITK_OVERRIDE {}
+ ~GenericRoadExtractionFilter() override {}
/** Prepare main computation method
* Note : this function isn't called
@@ -197,9 +197,9 @@ protected:
void BeforeGenerateData(void);
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
index 5002375fe46044e82e27d1a939b15346be7c5af4..a6dd5526b435755d1fdba0bce7924d9a77acc5c3 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
@@ -121,10 +121,10 @@ public:
protected:
ImageToPathListAlignFilter();
- ~ImageToPathListAlignFilter() ITK_OVERRIDE;
+ ~ImageToPathListAlignFilter() override;
- void GenerateOutputInformation() ITK_OVERRIDE {} // do nothing
- void GenerateData() ITK_OVERRIDE;
+ void GenerateOutputInformation() override {} // do nothing
+ void GenerateData() override;
virtual std::vector<double> tab(int n, double p, double m);
virtual void AngleCalculate(const InputImageType* InputImageIn);
@@ -134,7 +134,7 @@ protected:
ValueType m_PathValue;
ValueType m_BackgroundValue;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToPathListAlignFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
index 85f0a3109db1277a9a7fdc1acb18ccc8aca50623..9d34f04ff76765b0e2ee8445730503e5d4c2cd92 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
@@ -85,11 +85,11 @@ protected:
/** Constructor */
LikelihoodPathListFilter();
/** Destructor */
- ~LikelihoodPathListFilter() ITK_OVERRIDE {}
+ ~LikelihoodPathListFilter() override {}
/** GenerateData method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LikelihoodPathListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
index 772ec632f3a1635518df3f55ab33f027db4d11fd..e5ab1942d43fba315af0f47c8da4bab98ef70ff5 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
@@ -84,11 +84,11 @@ protected:
/** Constructor */
LinkPathListFilter();
/** Destructor */
- ~LinkPathListFilter() ITK_OVERRIDE {}
+ ~LinkPathListFilter() override {}
/** GenerateData method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Verify the angular condition to link a path.
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index 22f4468f823e08450863cf5860f05d07fd6fd31b..83e8345b9b709bdd6370c2eea20a2eb23f9fb546 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -70,15 +70,15 @@ public:
/** Set/Get the image input of this process object. */
using Superclass::SetInput;
- void SetInput(const InputImageType *input) ITK_OVERRIDE;
+ void SetInput(const InputImageType *input) override;
virtual void SetInputDirection(const InputImageDirectionType *direction);
const InputImageType * GetInput(void);
const InputImageDirectionType * GetInputDirection(void);
protected:
ModulusAndDirectionImageToImageFilter();
- ~ModulusAndDirectionImageToImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ModulusAndDirectionImageToImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ModulusAndDirectionImageToImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
index 2a7ec8dd620d61b7368d0d6f649bfc8d33a654a5..6e24abebee35550566826266ab5f4a44b3c0c1de 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
@@ -84,9 +84,9 @@ protected:
/** Constructor */
NeighborhoodScalarProductFilter();
/** Destructor */
- ~NeighborhoodScalarProductFilter() ITK_OVERRIDE {}
+ ~NeighborhoodScalarProductFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** NeighborhoodScalarProductImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
* which is called for each processing thread. The output image data is
@@ -98,7 +98,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
NeighborhoodScalarProductFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
index e428d28601445e46e21d9b7d0af59832c03bc838..fb60b080f34dc1338b8449e505037550bfe4f8ee 100644
--- a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
@@ -136,14 +136,14 @@ protected:
/** Constructor */
NonMaxRemovalByDirectionFilter() {};
/** Destructor */
- ~NonMaxRemovalByDirectionFilter() ITK_OVERRIDE {}
+ ~NonMaxRemovalByDirectionFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE
+ void GenerateData(void) override
{
typename ComputingFilterType::Pointer filter = ComputingFilterType::New();
filter->SetInput1(this->GetInput());
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
index d39d37eee1a517daa4fbf33fd246e258edaaeba1..ff27709602a2fa7ffabbe8919a8cd1ca3bdb9b01 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
@@ -90,11 +90,11 @@ protected:
/** Constructor */
ParallelLinePathListFilter();
/** Destructor */
- ~ParallelLinePathListFilter() ITK_OVERRIDE {}
+ ~ParallelLinePathListFilter() override {}
/** GenerateData method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Verify the angular condition to find parallel lines.
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
index d937c7108d5098698179a87f8c7fe5d5ef04bbd7..ca4a40efdd9acbab74ba1bb5bd5f21832fd00f8e 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
@@ -109,14 +109,14 @@ protected:
/** Constructor */
RemoveIsolatedByDirectionFilter() {};
/** Destructor */
- ~RemoveIsolatedByDirectionFilter() ITK_OVERRIDE {}
+ ~RemoveIsolatedByDirectionFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE
+ void GenerateData(void) override
{
typename ComputingFilterType::Pointer filter = ComputingFilterType::New();
filter->SetInput1(this->GetInput());
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
index 4733c42fa47d006a89427c67dde24f298672dc16..8812c85fa2de5c247aa01d712fc9c318ff018f88 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
@@ -104,14 +104,14 @@ protected:
/** Constructor */
RemoveWrongDirectionFilter() {};
/** Destructor */
- ~RemoveWrongDirectionFilter() ITK_OVERRIDE {}
+ ~RemoveWrongDirectionFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE
+ void GenerateData(void) override
{
typename ComputingFilterType::Pointer filter = ComputingFilterType::New();
filter->SetInput1(this->GetInput());
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
index d58dd5166ca331d4b38765de634b994440b306c0..79e05822d315e5ddcaac772a9ef633f4a2630579 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
@@ -141,15 +141,15 @@ protected:
/** Constructor */
RoadExtractionFilter();
/** Destructor */
- ~RoadExtractionFilter() ITK_OVERRIDE {}
+ ~RoadExtractionFilter() override {}
/** Prepare main computation method */
void BeforeGenerateData(void);
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
index ab759a79ba4be960079ad8a851b178fa1a25a8c4..48744453c0b4d6ffe97ecd2cc356e637b2c586c6 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
@@ -116,11 +116,11 @@ protected:
/** Constructor */
VectorDataToRoadDescriptionFilter();
/** Destructor */
- ~VectorDataToRoadDescriptionFilter() ITK_OVERRIDE {}
+ ~VectorDataToRoadDescriptionFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Triggers the Computation of the Descriptors */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
VectorDataToRoadDescriptionFilter(const Self &); //purposely not implemented
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
index a5b50ddf108979832bae7490f816e65b58687815..f8c133af97480b0f9ef8006940f09d78d3fa81a8 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
@@ -232,11 +232,11 @@ public:
itkSetMacro(SobelUpperThreshold, double);
/** Methods */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
UrbanAreaDetectionImageFilter();
- ~UrbanAreaDetectionImageFilter() ITK_OVERRIDE{}
+ ~UrbanAreaDetectionImageFilter() override{}
private:
UrbanAreaDetectionImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
index 38aadf4acfbf58ddfbd51d8492d1b5f4f6e931aa..f784a3159aa4aa976d22aea8338774eff9fe0917 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
@@ -104,11 +104,11 @@ public:
protected:
HarrisImageFilter();
- ~HarrisImageFilter() ITK_OVERRIDE {}
+ ~HarrisImageFilter() override {}
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HarrisImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
index 8069c053c0e90a3b3289c5092b20139c07cd03c7..badc48a0d16249ce2a8a7e775150f90608174db6 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
@@ -78,11 +78,11 @@ public:
protected:
HarrisImageToPointSetFilter();
- ~HarrisImageToPointSetFilter() ITK_OVERRIDE {}
+ ~HarrisImageToPointSetFilter() override {}
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HarrisImageToPointSetFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index 8726c3009fc10f319d74f4ff38ec9b26eda3570e..68c594ec0bc999a9c3235f065647918258df6f20 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -104,7 +104,7 @@ protected:
*
*/
- void GenerateOutputInformation() ITK_OVERRIDE{}
+ void GenerateOutputInformation() override{}
/**
* Constructor.
@@ -113,15 +113,15 @@ protected:
/**
* Destructor.
*/
- ~LineSpatialObjectListToRightAnglePointSetFilter() ITK_OVERRIDE{}
+ ~LineSpatialObjectListToRightAnglePointSetFilter() override{}
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**
* Angle computation
*/
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index c034f2315cfbbf09812af79124c8b87fd5558930..a2c985fc206db69e2210741d4d768c26c49dbf04 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -87,11 +87,11 @@ protected:
/** Constructor.*/
VectorDataToRightAngleVectorDataFilter();
/**Destructor.*/
- ~VectorDataToRightAngleVectorDataFilter() ITK_OVERRIDE{}
+ ~VectorDataToRightAngleVectorDataFilter() override{}
/** Standard PrintSelf method.*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**Main computation method.*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**Angle computation.*/
virtual double ComputeAngleFormedBySegments(LineType * lineDst, LineType * lineSrc);
/** When we find a right angle, one compute the coordinate of the segments intersection.*/
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
index ad33f74572da285017b20543b65864bfeae28b13..2944414abd82f6ea372edd2ed9f390092d4b9a62 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
@@ -99,16 +99,16 @@ protected:
/**
* Destructor.
*/
- ~KeyPointDensityImageFilter() ITK_OVERRIDE;
+ ~KeyPointDensityImageFilter() override;
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
//virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
index ade7a2bacef267c599d74e6de249684ac253425a..6abb4fc1c0b935453be4e88b3e2ad24d525e379b 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
@@ -65,13 +65,13 @@ public:
itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- OutputType Evaluate(const InputType& input) const ITK_OVERRIDE;
+ OutputType Evaluate(const InputType& input) const override;
protected:
PointSetDensityEpanechnikovFunction() : m_Radius(1) {};
- ~PointSetDensityEpanechnikovFunction() ITK_OVERRIDE {}
+ ~PointSetDensityEpanechnikovFunction() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetDensityEpanechnikovFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
index 622e28ff19928e04447c8838c078fcb5d9fc2a94..fc1d0ccff4f151df50a15dd4ecab634782412eb6 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
@@ -64,13 +64,13 @@ public:
itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- OutputType Evaluate(const InputType& input) const ITK_OVERRIDE;
+ OutputType Evaluate(const InputType& input) const override;
protected:
PointSetDensityFunction() : m_Radius(1) {};
- ~PointSetDensityFunction() ITK_OVERRIDE {}
+ ~PointSetDensityFunction() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetDensityFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
index 56955afdf723c2e87e23c2eabdcf89d8fedc4cec..44fadcfc973f9adcc14118ab4b0befecc38ec9f1 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
@@ -65,13 +65,13 @@ public:
itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- OutputType Evaluate(const InputType& input) const ITK_OVERRIDE;
+ OutputType Evaluate(const InputType& input) const override;
protected:
PointSetDensityGaussianFunction() : m_Radius(1) {};
- ~PointSetDensityGaussianFunction() ITK_OVERRIDE {}
+ ~PointSetDensityGaussianFunction() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetDensityGaussianFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
index a68b729dadc3060ed552508fb1a3ce02cabb62d7..47f61fe050f8d2369698111af45a5158f8ec640a 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
@@ -82,27 +82,27 @@ protected:
/**
* Destructor.
*/
- ~PointSetToDensityImageFilter() ITK_OVERRIDE {}
+ ~PointSetToDensityImageFilter() override {}
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Call the ImageSource::GenerateData which handle multithreading
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**
* Main computation method.
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Main computation method.
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
index de10e1cf1145dd9a326a5a6e59e1090a6419f849..56fa10d27f938121b05956f38dcedc9c997ae213 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
@@ -129,15 +129,15 @@ public:
protected:
ForwardFourierMellinTransformImageFilter();
- ~ForwardFourierMellinTransformImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ForwardFourierMellinTransformImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Main Computation Method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
ForwardFourierMellinTransformImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
index b2e6864a13ba482599c746b5e3c567689cf6ce2b..9eac6eeebcb383c3dbe4a21794a0e2dbb1ae181a 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
@@ -101,17 +101,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -131,8 +131,8 @@ public:
protected:
FourierMellinDescriptorsImageFunction();
- ~FourierMellinDescriptorsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FourierMellinDescriptorsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FourierMellinDescriptorsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
index 04e0d2bdcd0ba9542e04d7469f10080a184dbc66..67a5ca55c6beaababccc30095d45223bf1f12b2d 100644
--- a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
@@ -107,7 +107,7 @@ public:
}
protected:
HessianToScalarImageFilter() {}
- ~HessianToScalarImageFilter() ITK_OVERRIDE {}
+ ~HessianToScalarImageFilter() override {}
private:
HessianToScalarImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index 6a464dd648e70ef28409dd87514ba34406caccd3..930982a8aba1fafefb234e6f1c34344181c93a8a 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -103,17 +103,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -134,8 +134,8 @@ public:
protected:
HistogramOfOrientedGradientCovariantImageFunction();
- ~HistogramOfOrientedGradientCovariantImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HistogramOfOrientedGradientCovariantImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HistogramOfOrientedGradientCovariantImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
index 7466591cdf5d2328a14397073460dbfd3c602b2b..009f7091946896ad4fcd1895c38820f4a07f20f5 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
@@ -133,15 +133,15 @@ protected:
/**
* Destructor.
*/
- ~ImageToHessianDeterminantImageFilter() ITK_OVERRIDE;
+ ~ImageToHessianDeterminantImageFilter() override;
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
index deba62193489b6d8bbbc8b50170695834e6c9759..e554389b152746d710397805bdb1928127c8fffd 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
@@ -227,16 +227,16 @@ public:
protected:
/** Actually process the input */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Constructor */
ImageToSIFTKeyPointSetFilter();
/** Destructor */
- ~ImageToSIFTKeyPointSetFilter() ITK_OVERRIDE {}
+ ~ImageToSIFTKeyPointSetFilter() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Initialize input image */
void InitializeInputImage();
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
index eec0eef16eebc18f9fcb181f44c950368266c436..bb8b1f2e6d132aecd114a39356696d284d05ea82 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
@@ -134,15 +134,15 @@ protected:
/**
* Destructor.
*/
- ~ImageToSURFKeyPointSetFilter() ITK_OVERRIDE;
+ ~ImageToSURFKeyPointSetFilter() override;
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Check local extremum for 8 neighbors (current)
*
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
index 671c19bc4398bcc6301c7ae8f861984387df5914..bf16d31549d549ff9e1da260092d4ba4009e6ede 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
@@ -102,12 +102,12 @@ protected:
/// Constructor
KeyPointSetsMatchingFilter();
/// Destructor
- ~KeyPointSetsMatchingFilter() ITK_OVERRIDE {}
+ ~KeyPointSetsMatchingFilter() override {}
/// PrintSelf method
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/// Generate Data
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**
* Find the nearest neighbor of data1 in pointset.
diff --git a/Modules/Feature/Descriptors/include/otbLandmark.h b/Modules/Feature/Descriptors/include/otbLandmark.h
index 70573df764fee04639f5e8162c5d7ab0e1f6b04b..997e5da5e5929230d240304a531807006cb29ea5 100644
--- a/Modules/Feature/Descriptors/include/otbLandmark.h
+++ b/Modules/Feature/Descriptors/include/otbLandmark.h
@@ -72,9 +72,9 @@ protected:
/// Constructor
Landmark() {}
/// Destructor
- ~Landmark() ITK_OVERRIDE {}
+ ~Landmark() override {}
/// PrintSelf method
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << indent << "Landmark: P1= " << m_Point1 << " P2= " << m_Point2 << std::endl;
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
index 4cbbce49b6a53d9726102ff3f4ef2bbe5e1f7cb5..ff1e7ef2b51bad6812563f7f75b5664514e8b5d9 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
@@ -91,16 +91,16 @@ public:
protected:
/** Actually process the input */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Constructor */
SiftFastImageFilter();
/** Destructor */
- ~SiftFastImageFilter() ITK_OVERRIDE {}
+ ~SiftFastImageFilter() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The number of scales */
diff --git a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
index 5e8f72c6f5dd419a29e7715d08806f87992dcc6f..b0c011244cb25172076d21727ff369ac0353f16c 100644
--- a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
@@ -94,7 +94,7 @@ public:
protected:
AssociativeSymmetricalSumImageFilter() {}
- ~AssociativeSymmetricalSumImageFilter() ITK_OVERRIDE {}
+ ~AssociativeSymmetricalSumImageFilter() override {}
private:
AssociativeSymmetricalSumImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
index 463564db4a4caf5de42746c7ccf9de92719569af..991f9c1b5e1ec3acc8d946fabf830c11a1c26b23 100644
--- a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
@@ -81,7 +81,7 @@ public:
protected:
AsymmetricFusionOfLineDetectorImageFilter();
- ~AsymmetricFusionOfLineDetectorImageFilter() ITK_OVERRIDE {}
+ ~AsymmetricFusionOfLineDetectorImageFilter() override {}
typedef otb::LineRatioDetectorImageFilter<InputImageType, OutputImageType, OutputImageDirectionType,
InterpolatorType> LineRatioType;
@@ -90,9 +90,9 @@ protected:
typedef otb::AssociativeSymmetricalSumImageFilter<InputImageType1, InputImageType2,
OutputImageType> AssSymSumType;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
AsymmetricFusionOfLineDetectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
index 0be9d6a1bce8530c02a335bbe2e4f0142aa5e14d..2b789dfe757405fce5fd0aed4812f3cfdef32c36 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
@@ -104,15 +104,15 @@ protected:
/**
* Destructor.
*/
- ~EdgeDensityImageFilter() ITK_OVERRIDE;
+ ~EdgeDensityImageFilter() override;
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index 611459bde93334d0de11e65caf0bad58e98b3673..33fffc7376ac7187f1cf1e3a40c41bed20c817da 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -110,9 +110,9 @@ public:
protected:
EdgeDetectorImageFilter();
- ~EdgeDetectorImageFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ ~EdgeDetectorImageFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
index e04a582c19184016e54371924935cdaed024859b..76323b278a0712cae62b528677cefce46b8b99ea 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
@@ -129,16 +129,16 @@ public:
protected:
ExtractSegmentsImageFilter();
- ~ExtractSegmentsImageFilter() ITK_OVERRIDE {}
+ ~ExtractSegmentsImageFilter() override {}
typedef PixelSuppressionByDirectionImageFilter<InputImageType, PSOutputImageType> PixelSuppressionType;
typedef LocalHoughFilter<InputImageType> LocalHoughType;
typedef FillGapsFilter FillGapsType;
typedef DrawLineSpatialObjectListFilter<InputImageType, OutputImageType> DrawLineListType;
typedef itk::RescaleIntensityImageFilter<TInputImage, TInputImage> RescaleType;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ExtractSegmentsImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbFillGapsFilter.h b/Modules/Feature/Edge/include/otbFillGapsFilter.h
index 4df477cd1806bb95677aaa4310fee9971291fd83..3364b55fabc190de4278f18289302de71fe66d50 100644
--- a/Modules/Feature/Edge/include/otbFillGapsFilter.h
+++ b/Modules/Feature/Edge/include/otbFillGapsFilter.h
@@ -71,11 +71,11 @@ public:
protected:
FillGapsFilter();
- ~FillGapsFilter() ITK_OVERRIDE {}
+ ~FillGapsFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
FillGapsFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
index 6bd4edb5bcb4ed7fb0c369dbb1cc3c3b8872e698..e00af221d11321495fdc1c7f538570dc4417c5aa 100644
--- a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
@@ -91,7 +91,7 @@ protected:
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius( radius );
}
- ~HorizontalSobelVectorImageFilter() ITK_OVERRIDE { }
+ ~HorizontalSobelVectorImageFilter() override { }
private:
HorizontalSobelVectorImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
index 532c26d917a3e0a4a905b02128b223d6c33858bb..758e33dd45bf8316627411954f867c869979f688 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
@@ -108,7 +108,7 @@ public:
itkNewMacro(Self);
/** Method for evaluating the implicit function over the image. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Accessors for the threshold above which the filter should consider
the point as a valid point */
@@ -184,17 +184,17 @@ public:
protected:
HoughTransform2DLinesImageFilter();
- ~HoughTransform2DLinesImageFilter() ITK_OVERRIDE {}
+ ~HoughTransform2DLinesImageFilter() override {}
HoughTransform2DLinesImageFilter(const Self &) {}
void operator =(const Self&) {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** HoughTransform2DLinesImageFilter needs the entire input. Therefore
* it must provide an implementation GenerateInputRequestedRegion().
* \sa ProcessObject::GenerateInputRequestedRegion(). */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** HoughTransform2DLinesImageFilter's output is the accumulator
* array. The size of the output is a function of the size of the
@@ -202,10 +202,10 @@ protected:
* has a different size than the input, it must provide an implementation
* of GenerateOutputInformation.
* \sa ProcessObject::GenerateOutputRequestedRegion() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** HoughTransform2DLinesImageFilter must produce the entire output */
- void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject *output) override;
int GetAngleIndex(double);
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
index ab4d3d3278a748ac1fa5ba320afbd94702a4af80..915054394b3180562af265a5a90c9110db2242f6 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
@@ -85,11 +85,11 @@ public:
protected:
LineCorrelationDetectorImageFilter();
- ~LineCorrelationDetectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LineCorrelationDetectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Compute the measure */
- double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3) ITK_OVERRIDE;
+ double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3) override;
private:
LineCorrelationDetectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
index 03ef00ec2ea2f691905acbee4abdc885ad681e66..bcc411f56848bf0a616d5784e80f6ddefffa0701 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
@@ -132,14 +132,14 @@ public:
itkGetConstReferenceMacro(NumberOfDirections, unsigned int);
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
LineDetectorImageFilterBase();
- ~LineDetectorImageFilterBase() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LineDetectorImageFilterBase() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** LineDetectorImageFilterBase can be implemented for a treatment of filter multithreaded.
* Thus, the ThreadedGenerateData() method is called for each thread process.
@@ -151,7 +151,7 @@ protected:
* \sa ImageToImageFilter::GenerateData()
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
virtual double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3);
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
index 1940cbbb2ff9bc21edf62cfe1352d23908b3cf2b..3ed85b87e232e6e381909e33a63f5d1c124ae256 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
@@ -114,10 +114,10 @@ public:
protected:
LineRatioDetectorImageFilter();
- ~LineRatioDetectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LineRatioDetectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3) ITK_OVERRIDE;
+ double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3) override;
private:
LineRatioDetectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index 25c0872bd65fadfd1bc63b1c84f09303b26fe3e6..ef78f8c8f106bada22f21f45d3db465ba3a75290 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -192,12 +192,12 @@ public:
protected:
LineSegmentDetector();
- ~LineSegmentDetector() ITK_OVERRIDE {}
+ ~LineSegmentDetector() override {}
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Generate Data method*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Sort the image and store the coordinates in a histogram
* this method is used to determine the seeds where to begin the search segments
@@ -257,7 +257,7 @@ protected:
virtual void CopyRectangle(RectangleType& rDst, RectangleType& rSrc) const;
/** Printself method*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LineSegmentDetector(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index f8d52baace672c208f497b10fded2ebf3367e369..38ff44693bc19afe73abb02d26ed35e319d372a8 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -130,13 +130,13 @@ public:
protected:
LocalHoughFilter();
- ~LocalHoughFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LocalHoughFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Definition of the Hough Filter. */
typedef itk::HoughTransform2DLinesImageFilter<InputPixelType, AccumulatorPixelType> HoughFilterType;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
LocalHoughFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
index f7d883212adddf4de3b506c5aec3279d1746e072..4bcf136cdc9adde818344c39dfea4ec2ace00b71 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
@@ -82,16 +82,16 @@ public:
typedef otb::ImageToEdgePathFilter<ImageType, PathType> ImageToEdgePathFilterType;
typedef typename ImageToEdgePathFilterType::Pointer ImageToEdgePathFilterPointerType;
- void Reset(void) ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
+ void Reset(void) override;
+ void Synthetize(void) override;
itkGetObjectMacro(PathList, PathListType);
protected:
PersistentVectorizationImageFilter();
- ~PersistentVectorizationImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ ~PersistentVectorizationImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
PersistentVectorizationImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index 647ba25f5f8b2f662baa738fdaa42cd98ec0120d..1213469178203df3a6356854ecd8a1c21c52b279 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -103,15 +103,15 @@ public:
const InputImageType * GetInputImageDirection(void);
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
PixelSuppressionByDirectionImageFilter();
- ~PixelSuppressionByDirectionImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PixelSuppressionByDirectionImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
PixelSuppressionByDirectionImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
index 37f45c5f1461ea777710e0462ff16ebb2f5a7477..cfe3d0d7098fd7c307307c15bada03f8caa5017d 100644
--- a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
@@ -100,7 +100,7 @@ protected:
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius( radius );
}
- ~SobelVectorImageFilter() ITK_OVERRIDE { }
+ ~SobelVectorImageFilter() override { }
private:
SobelVectorImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
index 9f1ad77392df57869c768de0407247a5a6d1cbe6..a161d2beeafabbf1d94972f3f5cfe8f242f1a69d 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
@@ -77,15 +77,15 @@ public:
protected:
PersistentStreamingLineSegmentDetector();
- ~PersistentStreamingLineSegmentDetector() ITK_OVERRIDE;
+ ~PersistentStreamingLineSegmentDetector() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
private:
PersistentStreamingLineSegmentDetector(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
- OutputVectorDataPointerType ProcessTile() ITK_OVERRIDE;
+ OutputVectorDataPointerType ProcessTile() override;
};
template <class TImageType>
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
index ad0c0d37040ae15b823f5baf2d440e4e3cb65482..90b1cc18e9901740bb9bd9b9b30db50d8e8e49a0 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -101,14 +101,14 @@ public:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
TouziEdgeDetectorImageFilter();
- ~TouziEdgeDetectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~TouziEdgeDetectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** TouziEdgeDetectorImageFilter can be implemented for a multithreaded filter treatment.
* Thus, this implementation give the ThreadedGenerateData() method.
@@ -119,7 +119,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
TouziEdgeDetectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
index fd480b5795c9b20e1c8fc6f1bf3b3cd5e6ac406c..b244398da4bed7c02bc68148b4f35fa843f3f88a 100644
--- a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
@@ -91,7 +91,7 @@ protected:
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius( radius );
}
- ~VerticalSobelVectorImageFilter() ITK_OVERRIDE { }
+ ~VerticalSobelVectorImageFilter() override { }
private:
VerticalSobelVectorImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
index c6de473c73543543baf5e603a317cf835033bd26..83d638752ed2cf3f51af5f49b16fe2f9cd7c8b6e 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
@@ -92,7 +92,7 @@ public:
typedef std::complex<PrecisionType> ComplexPrecisionType;
/** Evalulate the function */
- OutputType Evaluate(const PathType& path) const ITK_OVERRIDE;
+ OutputType Evaluate(const PathType& path) const override;
virtual OutputType Evaluate() const;
itkSetMacro(P, unsigned int);
@@ -102,8 +102,8 @@ public:
protected:
ComplexMomentPathFunction();
- ~ComplexMomentPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ComplexMomentPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ComplexMomentPathFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
index ea7ccac8fc4f1dad40240039bb0888255ce66f48..5f8629703250a19d42d83d5aad641ef05b3f98b7 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
@@ -92,17 +92,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -122,8 +122,8 @@ public:
protected:
ComplexMomentsImageFunction();
- ~ComplexMomentsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ComplexMomentsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ComplexMomentsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
index 38914022defc4c6d873e2453d5e5ebc07952af51..4590e021534d5621ea643093e4faf44ef4f89de4 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
@@ -108,17 +108,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -133,8 +133,8 @@ public:
protected:
FlusserMomentsImageFunction();
- ~FlusserMomentsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FlusserMomentsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FlusserMomentsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
index 8564016eac747e93d031687396864358d7f4ca83..4f6e4788b88d0302a415c10c1e93630ed5023df5 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
@@ -93,7 +93,7 @@ public:
typedef typename Superclass::PrecisionType PrecisionType;
/** Evaluate the function at non-integer positions */
- RealType Evaluate(const PathType& path) const ITK_OVERRIDE;
+ RealType Evaluate(const PathType& path) const override;
virtual RealType Evaluate() const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
@@ -102,8 +102,8 @@ public:
protected:
FlusserPathFunction();
- ~FlusserPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FlusserPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
FlusserPathFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
index 4ebbc49a6dad30b00906359ea301888489837186..c02171118b23a39a0d378c267443c6196d9f03ac 100644
--- a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
@@ -63,8 +63,8 @@ public:
protected:
GeometricMomentPathFunction() {};
- ~GeometricMomentPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~GeometricMomentPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
index e74f8643423471ddb0f08413e1a2a09e75d9ff55..3c319ecfb3253dc1ef63ac8a38c602ec3f29f18a 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
@@ -104,17 +104,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -129,8 +129,8 @@ public:
protected:
HuMomentsImageFunction();
- ~HuMomentsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HuMomentsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HuMomentsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
index 6014af005cf7bf55772179dc468ead442eaa3bb9..855460a704892b969c26a940f1c98d451a5b03b6 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.h
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.h
@@ -90,7 +90,7 @@ public:
typedef typename Superclass::PrecisionType PrecisionType;
/** Evaluate the function at non-integer positions */
- RealType Evaluate(const PathType& path) const ITK_OVERRIDE;
+ RealType Evaluate(const PathType& path) const override;
virtual RealType Evaluate() const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
@@ -99,8 +99,8 @@ public:
protected:
HuPathFunction();
- ~HuPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HuPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HuPathFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
index 0324437e3db294c5c245e5f3a1ce1915ffe40a09..6508a9ce8e1dc871b88c1b08958e435d53738f29 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -92,10 +92,10 @@ public:
protected:
RadiometricMomentsImageFilter();
- ~RadiometricMomentsImageFilter() ITK_OVERRIDE {}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ ~RadiometricMomentsImageFilter() override {}
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void GenerateInputRequestedRegion(void) override;
+ void GenerateOutputInformation(void) override;
private:
RadiometricMomentsImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
index 1fd7355e7c94e341d8100b646fe92e70d215943f..49563faaaf4079e7021d1c1435682ef37d6e8a36 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
@@ -89,17 +89,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -114,8 +114,8 @@ public:
protected:
RadiometricMomentsImageFunction();
- ~RadiometricMomentsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~RadiometricMomentsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RadiometricMomentsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
index 70765ce6f7d095d58ad5a166b4702a78a38f2690..fdb123749ac658382aa2a1654190bc9bdf409d3b 100644
--- a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
@@ -67,8 +67,8 @@ public:
protected:
RealMomentPathFunction() {}
- ~RealMomentPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~RealMomentPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
index 7dcfce0489626a9564c5c3a15e71a2b90174f568..d535d989cb476cc3701c0f569c882bc3c1736a8a 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
@@ -79,17 +79,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -109,8 +109,8 @@ public:
protected:
RealMomentsImageFunction();
- ~RealMomentsImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~RealMomentsImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RealMomentsImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
index 2b0e1a4b9d94544c4e474bbd42a67e5b178efb27..4c8f48760de0dfbe456fd0e1c228b08ae8c835a2 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
@@ -114,15 +114,15 @@ public:
itkSetMacro(Direction, unsigned int);
itkGetConstMacro(Direction, unsigned int);
- void GenerateOutputInformation() ITK_OVERRIDE;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
+ void GenerateInputRequestedRegion() override;
protected:
AddCarvingPathFilter();
- ~AddCarvingPathFilter() ITK_OVERRIDE {}
+ ~AddCarvingPathFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
AddCarvingPathFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
index a3cdcc3623b920d8edd4913f83f790241fde0321..d48e79b04c284d025b3b64f8bb20c24341fbd47a 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
@@ -93,10 +93,10 @@ public:
protected:
ImageToCarvingPathFilter();
- ~ImageToCarvingPathFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE {} //does nothing
- void GenerateData() ITK_OVERRIDE;
+ ~ImageToCarvingPathFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateOutputInformation() override {} //does nothing
+ void GenerateData() override;
private:
ImageToCarvingPathFilter(const Self &); // purposely not implemented
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
index 81cdd304b13064c07c531854c66419226a5e317c..3ad0f99046c11ec827e83bb15561c599ec8a27a0 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
@@ -115,14 +115,14 @@ public:
itkSetMacro(Direction, unsigned int);
itkGetConstMacro(Direction, unsigned int);
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
protected:
RemoveCarvingPathFilter();
- ~RemoveCarvingPathFilter() ITK_OVERRIDE {}
+ ~RemoveCarvingPathFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
RemoveCarvingPathFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
index f4c1692d28b2a6a15beea5bb3be74147624eb61e..6e3cd1707af083cb90395e0dac80bd88002c8609 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
@@ -138,7 +138,7 @@ public:
protected:
GreyLevelCooccurrenceIndexedList();
- ~GreyLevelCooccurrenceIndexedList() ITK_OVERRIDE { }
+ ~GreyLevelCooccurrenceIndexedList() override { }
/** create a cooccurrence pair with given index and frequency = 1
* value. Next occurrence of same index is checked via m_LookupArray and the
@@ -155,7 +155,7 @@ protected:
/** Get index of the pixelPair combination and save the result in index **/
bool GetIndex(const PixelPairType & pixelPair, IndexType & index) const;
- void PrintSelf(std::ostream & os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream & os, itk::Indent indent) const override;
private:
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
index 167fd367705ad3e96a80b9ca47cb2b0598e480c5..bc717f3838397bacf54d6bf469a09343d4d032b8 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
@@ -149,17 +149,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -203,8 +203,8 @@ public:
protected:
HaralickTexturesImageFunction();
- ~HaralickTexturesImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HaralickTexturesImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
HaralickTexturesImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
index 2ac676e4aef479ac58926e51342b723fda38b19b..a4155279005efac5b58d3c5d538c8d7345a203b0 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
@@ -213,18 +213,18 @@ public:
const OutputImageType * GetSDOutput() const;
OutputImageType * GetSDOutput();
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
std::vector<FunctorType> m_FunctorList;
protected:
SFSTexturesImageFilter();
- ~SFSTexturesImageFilter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SFSTexturesImageFilter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Pad the input requested region by radius */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
private:
SFSTexturesImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 8ed418c5f0855e05d6627b10623efdcbe3ff1f47..22d3fe478e3803b53205285154f0e29cb120781a 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -213,15 +213,15 @@ protected:
/** Constructor */
ScalarImageToAdvancedTexturesFilter();
/** Destructor */
- ~ScalarImageToAdvancedTexturesFilter() ITK_OVERRIDE;
+ ~ScalarImageToAdvancedTexturesFilter() override;
/** Generate the output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate the input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before Parallel textures extraction */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
private:
ScalarImageToAdvancedTexturesFilter(const Self&); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index f252b673cad9c7a27dc789c49bf39736be0642ec..72b6517ffff1596786aa02a84177495861b67ad3 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -200,13 +200,13 @@ protected:
/** Constructor */
ScalarImageToHigherOrderTexturesFilter();
/** Destructor */
- ~ScalarImageToHigherOrderTexturesFilter() ITK_OVERRIDE;
+ ~ScalarImageToHigherOrderTexturesFilter() override;
/** Generate the output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate the input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
private:
ScalarImageToHigherOrderTexturesFilter(const Self&); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index 74e040025efb28412a37fc47b64af433e08ba122..3c5d65006976b929cac996d7db96b3c2bc2e4c0e 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -114,11 +114,11 @@ protected:
/** Constructor */
ScalarImageToPanTexTextureFilter();
/** Destructor */
- ~ScalarImageToPanTexTextureFilter() ITK_OVERRIDE;
+ ~ScalarImageToPanTexTextureFilter() override;
/** Generate the input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
private:
ScalarImageToPanTexTextureFilter(const Self&); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index 3b9b8dfaf2e1153d4c6fe4c3ca5a6386d03e6779..b3732a164a41f35ac6b5c1cfcef8194b78e73b66 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -209,15 +209,15 @@ protected:
/** Constructor */
ScalarImageToTexturesFilter();
/** Destructor */
- ~ScalarImageToTexturesFilter() ITK_OVERRIDE;
+ ~ScalarImageToTexturesFilter() override;
/** Generate the output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate the input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before Parallel textures extraction */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
private:
ScalarImageToTexturesFilter(const Self&); //purposely not implemented
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
index 316a39c0ff1032b2d40cc979958613ac83e10ac9..02040fe05fa5a5d978844cb7c0cdcc5f5338e431 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.h
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.h
@@ -77,17 +77,17 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- RealType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ RealType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- RealType Evaluate(const PointType& point) const ITK_OVERRIDE
+ RealType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -120,8 +120,8 @@ public:
protected:
TextureImageFunction();
- ~TextureImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~TextureImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
TextureImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index e9822f5cb7385773c3ad04b83940790863634fe4..3b82bad169d805f1f9fc272b856c6dae783d0ec4 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -148,9 +148,9 @@ public:
protected:
BinaryFunctorNeighborhoodJoinHistogramImageFilter();
- ~BinaryFunctorNeighborhoodJoinHistogramImageFilter() ITK_OVERRIDE {}
+ ~BinaryFunctorNeighborhoodJoinHistogramImageFilter() override {}
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** BinaryFunctorNeighborhoodJoinHistogramImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -163,12 +163,12 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Pad the inputs requested regions by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
RadiusSizeType m_Radius;
diff --git a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
index 31f47e259f2e631217580895d4ad1b23a3baf639..e6650ce67609ba2c93db7e0307a938117fa4ef64 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
@@ -84,7 +84,7 @@ public:
protected:
CBAMIChangeDetector() {}
- ~CBAMIChangeDetector() ITK_OVERRIDE {}
+ ~CBAMIChangeDetector() override {}
private:
CBAMIChangeDetector(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
index e6831bceba8ae27eff322201644ec62d6bf25094..4b710c4bba5179fccaf9536afb57ccffb8a8ae7a 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
@@ -83,7 +83,7 @@ public:
protected:
CorrelationChangeDetector() {}
- ~CorrelationChangeDetector() ITK_OVERRIDE {}
+ ~CorrelationChangeDetector() override {}
private:
CorrelationChangeDetector(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
index 56b3f5ae70c77482b1dbe5698fa13019affd77ae..98f736f84accd02622dcef389c99eb679935a572 100644
--- a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
@@ -84,7 +84,7 @@ public:
protected:
JoinHistogramMIImageFilter() {}
- ~JoinHistogramMIImageFilter() ITK_OVERRIDE {}
+ ~JoinHistogramMIImageFilter() override {}
private:
JoinHistogramMIImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
index b28e9d8b10064b0e85e677c97d72ba933fcc5b2b..ad9c088b641d9f1811fdcddeffb42d391c318fbe 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
@@ -170,7 +170,7 @@ public:
protected:
KullbackLeiblerDistanceImageFilter() {}
- ~KullbackLeiblerDistanceImageFilter() ITK_OVERRIDE {}
+ ~KullbackLeiblerDistanceImageFilter() override {}
private:
KullbackLeiblerDistanceImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
index 2a04a140b7bc5e56113f55c79b3ece22ca5b53a0..bced45b78bbafda5d05d67e676a4c8191fbff8a3 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
@@ -187,7 +187,7 @@ public:
protected:
KullbackLeiblerProfileImageFilter() {}
- ~KullbackLeiblerProfileImageFilter() ITK_OVERRIDE {}
+ ~KullbackLeiblerProfileImageFilter() override {}
private:
KullbackLeiblerProfileImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index e74d68c904afa4d19bf0126e9ac9e542eb22cf12..b26619d8e226afe0ff57f5a0b2867b59be1e4607 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -146,13 +146,13 @@ public:
void SetTrainingArea(const TInputROIImage * trainingImage);
protected:
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
KullbackLeiblerSupervizedDistanceImageFilter()
{
this->SetNumberOfRequiredInputs(3);
}
- ~KullbackLeiblerSupervizedDistanceImageFilter() ITK_OVERRIDE {}
+ ~KullbackLeiblerSupervizedDistanceImageFilter() override {}
private:
KullbackLeiblerSupervizedDistanceImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
index 391d622411054d719065f4a028976a75a99deaa0..bb54a51f6662fd94d7e4d64f8fefaa8468bd1946 100644
--- a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
@@ -84,7 +84,7 @@ public:
protected:
LHMIChangeDetector() {}
- ~LHMIChangeDetector() ITK_OVERRIDE {}
+ ~LHMIChangeDetector() override {}
private:
LHMIChangeDetector(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
index 7d0a70ed2cb7035f419d77c657494d93bf397536..a93d1b6bc9607a713bb139712ace0e405a549714 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
@@ -82,7 +82,7 @@ public:
protected:
MeanDifferenceImageFilter() {}
- ~MeanDifferenceImageFilter() ITK_OVERRIDE {}
+ ~MeanDifferenceImageFilter() override {}
private:
MeanDifferenceImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
index 6de8f8cf3d90ec2babe62d5cb73a91e1f43a5f29..48aa6ae096473ecacc8ebd5b68805c213c3a71e3 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
@@ -80,7 +80,7 @@ public:
protected:
MeanRatioImageFilter() {}
- ~MeanRatioImageFilter() ITK_OVERRIDE {}
+ ~MeanRatioImageFilter() override {}
private:
MeanRatioImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index 9e608d3c1bef429e9fb5554e3d98d98a11e49e3e..51bc83c9b8c1a871c528e03964b7be962c647dc1 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -155,11 +155,11 @@ public:
protected:
MultivariateAlterationDetectorImageFilter();
- ~MultivariateAlterationDetectorImageFilter() ITK_OVERRIDE {}
+ ~MultivariateAlterationDetectorImageFilter() override {}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
MultivariateAlterationDetectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
index 26a6265414e0bdb507eaf6fbab4b55cd9bd71f71..5ea56326988ecf7ef7bdb3d761ed365b7dd03df0 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
@@ -58,11 +58,11 @@ public:
typedef typename Superclass::ScalarType ScalarType;
typedef typename Superclass::RealType RealType;
- RGBPixelType operator ()(const TScalar&) const ITK_OVERRIDE;
+ RGBPixelType operator ()(const TScalar&) const override;
protected:
ReliefColormapFunctor(){};
- ~ReliefColormapFunctor() ITK_OVERRIDE {}
+ ~ReliefColormapFunctor() override {}
private:
ReliefColormapFunctor(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
index ba1e0cb6e9f2d3c7423ba45b40a7413873f80ebb..c5b8a54923220ceed8568f0b955a440c901acc79 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
@@ -139,7 +139,7 @@ class ITK_EXPORT ScalarToRainbowRGBPixelFunctor
{
public:
ScalarToRainbowRGBPixelFunctor();
- ~ScalarToRainbowRGBPixelFunctor() ITK_OVERRIDE {}
+ ~ScalarToRainbowRGBPixelFunctor() override {}
typedef ScalarToRainbowRGBPixelFunctor Self;
typedef itk::Function::ColormapFunction<TScalar, TRGBPixel> Superclass;
@@ -154,7 +154,7 @@ public:
typedef TScalar ScalarType;
typedef HSVToRGBFunctor<RGBPixelType> HSVToRGBFunctorType;
- RGBPixelType operator ()(const TScalar&) const ITK_OVERRIDE;
+ RGBPixelType operator ()(const TScalar&) const override;
protected:
RGBPixelType HSVToRGB(double h, double s, double v) const;
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
index 9517e1ecd011ce1954234c70e068f11cb615c5f4..1eabaf7c1a7320783bdda09afe998c2beda2742f 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
@@ -157,8 +157,8 @@ public:
protected:
ConvolutionImageFilter();
- ~ConvolutionImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ConvolutionImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ConvolutionImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData()
@@ -171,7 +171,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/** ConvolutionImageFilter needs a larger input requested region than
* the output requested region. As such, ConvolutionImageFilter needs
@@ -180,7 +180,7 @@ protected:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
private:
ConvolutionImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
index b4b42f067f96adf22adfe93e22f8837a6ec5732a..9f26a1c94d01be6f699c2c8700408559db44796e 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
@@ -112,17 +112,17 @@ protected:
/** constructor */
GaborFilterGenerator();
/** destructor */
- ~GaborFilterGenerator() ITK_OVERRIDE {}
+ ~GaborFilterGenerator() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate the filter coefficients */
void GenerateFilter();
/** Reimplement the Modified() method
*to set the NeedToGenerateFilter to true */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
GaborFilterGenerator(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
index 6ecf591280e24f7499ffe909bc8cabb3b8c8eed6..a72ed2dfa9ce3061f276ff12e283e30f0c03c892 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
@@ -142,7 +142,7 @@ public:
* region than the output region.
*/
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -154,13 +154,13 @@ protected:
/** Constructor */
OverlapSaveConvolutionImageFilter();
/** destructor */
- ~OverlapSaveConvolutionImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~OverlapSaveConvolutionImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/* TODO For the moment this class provide only a GenerateData(),
* due to limited thread-safety of FFTW plan creation.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
// void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
private:
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
index cfa03e7a8dcd27646d5c32a43dd9f8cd1a075d33..110850719e3582fb0deee6134410290cb7789be0 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
@@ -144,11 +144,11 @@ public:
protected:
DEMCaracteristicsExtractor();
- ~DEMCaracteristicsExtractor() ITK_OVERRIDE;
+ ~DEMCaracteristicsExtractor() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
/** Angle parameters*/
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
index 26464e39fc79babb9f8dfdf92412ca42886550d7..cc1e5d4de7164d37ba6645fa033ff8edbcd5f5a6 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
@@ -176,13 +176,13 @@ public:
protected:
DEMToImageGenerator();
- ~DEMToImageGenerator() ITK_OVERRIDE{}
+ ~DEMToImageGenerator() override{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void BeforeThreadedGenerateData() override;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
+ void GenerateOutputInformation() override;
DEMHandlerType::Pointer m_DEMHandler;
PointType m_OutputOrigin;
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 2497d6b0eeba705c5b08e95146cd6110ff27232c..5dd2c46622753be63784a0922939aaf453399503 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -89,10 +89,10 @@ public:
protected:
AngularProjectionBinaryImageFilter();
- ~AngularProjectionBinaryImageFilter() ITK_OVERRIDE { }
+ ~AngularProjectionBinaryImageFilter() override { }
- void GenerateOutputInformation() ITK_OVERRIDE;
- void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadID ) ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
+ void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadID ) override;
private:
AngularProjectionBinaryImageFilter(const Self&); // not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index f7976fe05f3a414222c2b404f159057113fa351e..4a8a4f906cf1b462e15f2079ce6b74f974a76165 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -84,7 +84,7 @@ public:
itkGetMacro(AngleArray, AngleArrayType);
itkSetMacro(AngleArray, AngleArrayType);
- void SetInput ( unsigned int i, const InputImageType * ) ITK_OVERRIDE;
+ void SetInput ( unsigned int i, const InputImageType * ) override;
using Superclass::SetInput;
const InputImageType * GetInput( unsigned int i ) const;
@@ -92,9 +92,9 @@ public:
protected:
AngularProjectionImageFilter();
- ~AngularProjectionImageFilter() ITK_OVERRIDE { }
+ ~AngularProjectionImageFilter() override { }
- void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadID ) ITK_OVERRIDE;
+ void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadID ) override;
virtual OutputImagePixelType InternalGenerateData ( const ImageRegionConstIteratorVectorType & ) const;
private:
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
index 3b1e8e2b1275e1ae1b02f9ec810872c2f6350647..9a8bdd9e4f2cfb3a9a4b5ec8147717e67d4ae34b 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
@@ -126,9 +126,9 @@ public:
protected:
AngularProjectionSetImageFilter();
- ~AngularProjectionSetImageFilter() ITK_OVERRIDE { }
+ ~AngularProjectionSetImageFilter() override { }
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
AngularProjectionSetImageFilter(const Self&); // not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index 870d196f1bb5113f502a55a53654f6dfcd67c0db..1864a7e5f94cc4ebf4909afce8ee97ac38012c36 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -78,21 +78,21 @@ public:
protected:
EstimateInnerProductPCAImageFilter();
- ~EstimateInnerProductPCAImageFilter() ITK_OVERRIDE {}
+ ~EstimateInnerProductPCAImageFilter() override {}
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/**
* BeforeThreadedGenerateData
**/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
EstimateInnerProductPCAImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
index aab7b1a5cd562ba7e1340edd04b4bcfb6e6bbb04..5e9d614342be8cf79eb605963c1709d2e0a0255f 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
@@ -149,7 +149,7 @@ public:
protected:
FastICAImageFilter ();
- ~FastICAImageFilter() ITK_OVERRIDE { }
+ ~FastICAImageFilter() override { }
/** GenerateOutputInformation
* Propagate vector length info and modify if needed
@@ -159,12 +159,12 @@ protected:
* (which may not be square) has to be given,
* otherwize, GenerateOutputInformation throws an itk::ExceptionObject
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** GenerateData
* Through a filter of filter structure
*/
- void GenerateData () ITK_OVERRIDE;
+ void GenerateData () override;
/** Internal methods */
void ForwardGenerateOutputInformation();
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
index ed81ac736e988f3ce6bcac67ac77328dcee53770..30be138c35fafc88a7ad0b1ca80d54856d376946 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -96,12 +96,12 @@ public:
protected:
FastICAInternalOptimizerVectorImageFilter();
- ~FastICAInternalOptimizerVectorImageFilter() ITK_OVERRIDE { }
+ ~FastICAInternalOptimizerVectorImageFilter() override { }
- void GenerateOutputInformation() ITK_OVERRIDE;
- void BeforeThreadedGenerateData () ITK_OVERRIDE;
- void ThreadedGenerateData ( const OutputRegionType &, itk::ThreadIdType ) ITK_OVERRIDE;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
+ void BeforeThreadedGenerateData () override;
+ void ThreadedGenerateData ( const OutputRegionType &, itk::ThreadIdType ) override;
+ void AfterThreadedGenerateData() override;
unsigned int m_CurrentBandForLoop;
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
index b92d7f619f2a43c1e66b2642ab50cd92beeb8520..d63ad8da0fd472189b697385cc07cd7b3da70be5 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
@@ -121,13 +121,13 @@ public:
protected:
/** GenerateData */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
InnerProductPCAImageFilter();
/** Destructor */
- ~InnerProductPCAImageFilter() ITK_OVERRIDE {}
+ ~InnerProductPCAImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** NormalizeInnerProductPCAImageFilter can produce an image which is a different
* resolution than its input image. As such, NormalizeInnerProductPCAImageFilter
@@ -137,7 +137,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
InnerProductPCAImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
index 5f9816285fb4c6aa2db57770bf8e97ee2ef5aa42..cb48b1188677e723c9ea40f4f0880aa002a8a3da 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
@@ -109,7 +109,7 @@ public:
protected:
LocalActivityVectorImageFilter() { }
- ~LocalActivityVectorImageFilter() ITK_OVERRIDE { }
+ ~LocalActivityVectorImageFilter() override { }
private:
LocalActivityVectorImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index 50557f1fe21dc0e0dce3e50de39b21f3a9049739..5fb0c7812ae5a8b0673adf525e1ddb37371cfa50 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -149,7 +149,7 @@ public:
protected:
MNFImageFilter();
- ~MNFImageFilter() ITK_OVERRIDE { }
+ ~MNFImageFilter() override { }
/** GenerateOutputInformation
* Propagate vector length info and modify if needed
@@ -159,14 +159,14 @@ protected:
* (which may not be square) has to be given,
* otherwize, GenerateOutputInformation throws an itk::ExceptionObject
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** GenerateData
* Through a filter of filter structure
*/
- void GenerateData () ITK_OVERRIDE;
+ void GenerateData () override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Internal methods */
void ForwardGenerateOutputInformation();
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index 6acb4c466f126e337b64e8b787e3a3115967cf71..d32b18d0a9125a43f2b19735871950b75aa6ab11 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -134,11 +134,11 @@ public:
protected:
MaximumAutocorrelationFactorImageFilter();
- ~MaximumAutocorrelationFactorImageFilter() ITK_OVERRIDE {}
+ ~MaximumAutocorrelationFactorImageFilter() override {}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
MaximumAutocorrelationFactorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index c7847771c3a259d12b7895492210531d67652ee9..791d9cc993a9b09c941ae74f11b9d33a1130e6dd 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -89,10 +89,10 @@ public:
protected:
NAPCAImageFilter() { }
- ~NAPCAImageFilter () ITK_OVERRIDE { }
+ ~NAPCAImageFilter () override { }
/** Specific functionality of NAPCA */
- void GenerateTransformationMatrix() ITK_OVERRIDE;
+ void GenerateTransformationMatrix() override;
}; // end of class
} // end of namespace otb
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index d58f83aaeccc31c4ae2d614499228a251db8cbfd..ed2e9055c980ad5b1b2a7f233faf15da68f2a5cf 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -82,7 +82,7 @@ public:
protected:
NormalizeInnerProductPCAImageFilter();
- ~NormalizeInnerProductPCAImageFilter() ITK_OVERRIDE {}
+ ~NormalizeInnerProductPCAImageFilter() override {}
/** NormalizeInnerProductPCAImageFilter can produce an image which is a different
* resolution than its input image. As such, NormalizeInnerProductPCAImageFilter
@@ -92,7 +92,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** NormalizeInnerProductPCAImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -104,12 +104,12 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** BeforeThreadedGenerateData method */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
index 63f69b86c1842f3f41ef88bf31898552f7ccbee8..4b64ed6c909d5d37def509122907339d981df6b2 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
@@ -161,7 +161,7 @@ public:
protected:
PCAImageFilter();
- ~PCAImageFilter() ITK_OVERRIDE { }
+ ~PCAImageFilter() override { }
/** GenerateOutputInformation
* Propagate vector length info and modify if needed
@@ -171,14 +171,14 @@ protected:
* (which may not be square) has to be given,
* otherwize, GenerateOutputInformation throws an itk::ExceptionObject
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** GenerateData
* Through a filter of filter structure
*/
- void GenerateData () ITK_OVERRIDE;
+ void GenerateData () override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Internal methods */
virtual void ForwardGenerateOutputInformation();
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
index cae9cbb747e7e8a6455cb6e11f4627582adc62a2..c419eb0937c25c411039c53aac426d1dff49a05c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
@@ -108,16 +108,16 @@ public:
protected:
SparseWvltToAngleMapperListFilter();
- ~SparseWvltToAngleMapperListFilter() ITK_OVERRIDE { }
+ ~SparseWvltToAngleMapperListFilter() override { }
/** Standard itk::ProcessObject subclass method. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** This method causes the filter to generate its output. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/* Internal functions */
virtual bool IsToGenerate ( const ImageConstIteratorVectorType & ) const;
diff --git a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
index da27e0389d400c810a7c74cf707c8f60e0b67437..a543b2ae58832756c51810dff8851407d97d722c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
@@ -70,17 +70,17 @@ public:
}
/** Destructor */
- ~AmplitudeFunctor() ITK_OVERRIDE {}
+ ~AmplitudeFunctor() override {}
const char *GetDescription() const
{return "Amplitude"; }
- unsigned int GetOutputSize() const ITK_OVERRIDE
+ unsigned int GetOutputSize() const override
{
return 1;
}
- OutputPixelType operator ()(const VectorPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const VectorPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
@@ -91,13 +91,13 @@ public:
return outPixel;
}
- OutputPixelType operator ()(ScalarType) const ITK_OVERRIDE
+ OutputPixelType operator ()(ScalarType) const override
{
//FIXME we don't handle the std::complex<> yet
itkExceptionMacro(<< "Can't compute amplitude from a scalar value");
}
- OutputPixelType operator ()(const RGBPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const RGBPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
@@ -110,7 +110,7 @@ public:
return outPixel;
}
- OutputPixelType operator ()(const RGBAPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const RGBAPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
index e0e246aee5f7e787c0d4b994874bd42f75c01d06..ec60c693df08dac36a278b39203f0e9d6520698c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorImageFilter.h
@@ -55,7 +55,7 @@ public:
protected:
BinaryFunctorImageFilter() {};
- ~BinaryFunctorImageFilter() ITK_OVERRIDE {}
+ ~BinaryFunctorImageFilter() override {}
/** BinaryFunctorImageFilter can produce an image which has a different number of bands
* than its input image. As such, BinaryFunctorImageFilter
@@ -65,7 +65,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index 2b0cc52d1317f58c9fcc379a31a9a0925427f17a..a8f69d607e158ca54125371338fc83a6c9550fe3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -130,7 +130,7 @@ public:
protected:
BinaryFunctorNeighborhoodImageFilter();
- ~BinaryFunctorNeighborhoodImageFilter() ITK_OVERRIDE {}
+ ~BinaryFunctorNeighborhoodImageFilter() override {}
/** BinaryFunctorNeighborhoodImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -143,12 +143,12 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Pad the inputs requested regions by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
RadiusSizeType m_Radius;
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index d282ec933bdf2b82dfaa9247bdefcf545f680fad..dfc99b5f0bcf7d322381b6039a645a57bdf869da 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -119,7 +119,7 @@ public:
protected:
BinaryFunctorNeighborhoodVectorImageFilter();
- ~BinaryFunctorNeighborhoodVectorImageFilter() ITK_OVERRIDE {}
+ ~BinaryFunctorNeighborhoodVectorImageFilter() override {}
/** BinaryFunctorNeighborhoodVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -132,13 +132,13 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
* this method to set the proper number of component on the filter output.
*/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
RadiusSizeType m_Radius;
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
index a751322a72ef17c665279959bd0ca66e2138ff19..8ab7e0c989df265c70bd52996be47bb7c5214f09 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
@@ -78,17 +78,17 @@ public:
RealType;
/** Evalulate the function at specified index */
- RealType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ RealType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- RealType Evaluate(const PointType& point) const ITK_OVERRIDE
+ RealType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -107,8 +107,8 @@ public:
protected:
BinaryImageDensityFunction();
- ~BinaryImageDensityFunction() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BinaryImageDensityFunction() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BinaryImageDensityFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
index 2a420761d197c00046751b899e11ae4ea95922b0..fea7f9a8e84ac20f90f3ed459962116c08dc62c2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -70,11 +70,11 @@ protected:
/** Constructor */
BinaryImageMinimalBoundingRegionCalculator();
/** Destructor */
- ~BinaryImageMinimalBoundingRegionCalculator() ITK_OVERRIDE {}
+ ~BinaryImageMinimalBoundingRegionCalculator() override {}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BinaryImageMinimalBoundingRegionCalculator(const Self &); // purposely not implemented
void operator =(const Self&); // purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index 7f0e16a0e977e0a5bd742523789e33a73579cc2c..029b9344b3f805ddc89ed35a31f5d6a78b1eba61 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -77,17 +77,17 @@ public:
}
/** Main computation method */
- void ThreadedGenerateData(const InputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void ThreadedGenerateData(const InputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void BeforeThreadedGenerateData() override;
+ void GenerateInputRequestedRegion() override;
protected:
/** Constructor */
BinaryImageToDensityImageFilter();
/** Destructor */
- ~BinaryImageToDensityImageFilter() ITK_OVERRIDE;
+ ~BinaryImageToDensityImageFilter() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BinaryImageToDensityImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index 67203519bed9f2cc93851aea97e027f744d4198c..1bd82ea6ddbf899a3c94e17e3da7d281ee9f18c0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -94,12 +94,12 @@ public:
protected:
BoxAndWhiskerImageFilter ();
- ~BoxAndWhiskerImageFilter () ITK_OVERRIDE {}
+ ~BoxAndWhiskerImageFilter () override {}
/** Main computation method implemented as a multithreaded filter */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void AllocateOutputs() ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void GenerateOutputInformation() override;
+ void AllocateOutputs() override;
/** Perform the outlier detection */
PixelType PerformBoxAndWhiskerDetection(const PixelType& pixel);
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
index 7ae72a4706b5b5c90a1dc6cbf3b78e4895e23f5a..3bbce052eedb2473e0a1c1c6aa1471a6854de180 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
@@ -69,10 +69,10 @@ public:
protected:
ChangeInformationImageFilter() {}
- ~ChangeInformationImageFilter() ITK_OVERRIDE {}
+ ~ChangeInformationImageFilter() override {}
/** Apply changes to the output image metadata. */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
ChangeInformationImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
index 9c32e30611ce591d24263d10c3ae106d94017ebb..b367f140c80ea8a8d200d7ffe075334891efe011 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
@@ -165,11 +165,11 @@ public:
protected:
ChangeLabelImageFilter();
- ~ChangeLabelImageFilter() ITK_OVERRIDE {}
+ ~ChangeLabelImageFilter() override {}
/** Generate the output information missing */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ChangeLabelImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
index 5ab3cf24353e3c84377d4188cf9318988701cea3..d19f2184a37551610df37d07b0cabbe1ef789ebf 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
@@ -137,10 +137,10 @@ protected:
ChangeNoDataValueFilter()
{}
- ~ChangeNoDataValueFilter() ITK_OVERRIDE
+ ~ChangeNoDataValueFilter() override
{}
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
index 50b43302e4bc18ff3d0cb89c998ee05c5fc710a2..84ff84cb59e0d577c14df85f1dcf11ef417edfb1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -107,8 +107,8 @@ public:
protected:
ClampVectorImageFilter();
- ~ClampVectorImageFilter() ITK_OVERRIDE {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ClampVectorImageFilter() override {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ClampVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -121,9 +121,9 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId ) ITK_OVERRIDE;
+ itk::ThreadIdType threadId ) override;
- void GenerateOutputInformation(void) ITK_OVERRIDE
+ void GenerateOutputInformation(void) override
{
Superclass::GenerateOutputInformation();
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
index dcb79a8f257b3ac798caa5b37980fde508125704..7f9cf3f068f801e7e10cc54e21519d2fb0a99e54 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
@@ -141,11 +141,11 @@ public:
protected:
ConcatenateScalarValueImageFilter();
- ~ConcatenateScalarValueImageFilter() ITK_OVERRIDE {}
+ ~ConcatenateScalarValueImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
ConcatenateScalarValueImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index 06bfad6d0d18a470f87b29be698d97a05f136d06..30fad1ad60efdf1e935c12527030cd7175e1eed4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -95,13 +95,13 @@ protected:
/** Constructor. */
ConcatenateVectorImageFilter();
/** Destructor. */
- ~ConcatenateVectorImageFilter() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ ~ConcatenateVectorImageFilter() override;
+ void GenerateOutputInformation() override;
+ void BeforeThreadedGenerateData() override;
/** Main computation method. */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ConcatenateVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
index 4d802c46ea7bb2ed7816a2f622b97fc902bec935..37e08144ba0ad7ff5d1bb4ce74554f380712c3e5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValue.h
@@ -70,13 +70,13 @@ public:
typedef typename TVector::ValueType ValueType;
/** Gets the distance between the origin and x */
- double Evaluate(const TVector& x) const ITK_OVERRIDE
+ double Evaluate(const TVector& x) const override
{
return ::vcl_sqrt(Superclass::Evaluate(x));
}
/** Gets the distance between x1 and x2 */
- double Evaluate(const TVector& x1, const TVector& x2) const ITK_OVERRIDE
+ double Evaluate(const TVector& x1, const TVector& x2) const override
{
return ::vcl_sqrt(Superclass::Evaluate(x1, x2));
}
@@ -97,7 +97,7 @@ public:
protected:
EuclideanDistanceMetricWithMissingValue() {}
- ~EuclideanDistanceMetricWithMissingValue() ITK_OVERRIDE {}
+ ~EuclideanDistanceMetricWithMissingValue() override {}
}; // end of class
} // end namespace statistics
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
index 49b8885bbe5a36c1a429a852188e174fd3b3cd79..3fe2d4f77a78dbb1a9c3500f82ec9838a6fe98cb 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
@@ -69,10 +69,10 @@ public:
typedef typename TVector::ValueType ValueType;
/** Gets the distance between the origin and x */
- double Evaluate(const TVector& x) const ITK_OVERRIDE;
+ double Evaluate(const TVector& x) const override;
/** Gets the distance between x1 and x2 */
- double Evaluate(const TVector& x1, const TVector& x2) const ITK_OVERRIDE;
+ double Evaluate(const TVector& x1, const TVector& x2) const override;
/** Gets the cooridnate distance between a and b. NOTE: a and b
* should be type of component */
@@ -93,7 +93,7 @@ public:
protected:
EuclideanDistanceMetricWithMissingValuePow2() {}
- ~EuclideanDistanceMetricWithMissingValuePow2() ITK_OVERRIDE {}
+ ~EuclideanDistanceMetricWithMissingValuePow2() override {}
}; // end of class
} // end namespace statistics
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
index 05298aa14db069c519052f4fed0cde184c49cf96..3a703c921a1a0878431e3e99c68dac43938e564a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
@@ -73,10 +73,10 @@ public:
typedef typename TVector::ValueType ValueType;
/** Gets the distance between the origin and x */
- double Evaluate(const TVector& x) const ITK_OVERRIDE;
+ double Evaluate(const TVector& x) const override;
/** Gets the distance between x1 and x2 */
- double Evaluate(const TVector& x1, const TVector& x2) const ITK_OVERRIDE;
+ double Evaluate(const TVector& x1, const TVector& x2) const override;
/** Gets the cooridnate distance between a and b. NOTE: a and b
* should be type of component */
@@ -101,7 +101,7 @@ public:
protected:
FlexibleDistanceWithMissingValue() {}
- ~FlexibleDistanceWithMissingValue() ITK_OVERRIDE {}
+ ~FlexibleDistanceWithMissingValue() override {}
}; // end of class
/** Static variable instantiation */
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 2febd16f5f7191f841d6beae8ce5160c7a5cb2d7..61168d59d1dd437eadf0fa6cfcee2d48fd33776e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -122,11 +122,11 @@ public:
protected:
FunctionWithNeighborhoodToImageFilter();
- ~FunctionWithNeighborhoodToImageFilter() ITK_OVERRIDE{}
+ ~FunctionWithNeighborhoodToImageFilter() override{}
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** SpatialFunctionImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -139,7 +139,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
FunctionWithNeighborhoodToImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
index b67760965c8287644c570c70f518fa2d06b6280b..23655ef667d30f0ff8f9e87b0d9d28c7d362a273 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
@@ -137,23 +137,23 @@ public:
void SetOutputParametersFromImage(const ImageBaseType * image);
/** Method Compute the Modified Time based on changed to the components. */
- itk::ModifiedTimeType GetMTime(void) const ITK_OVERRIDE;
+ itk::ModifiedTimeType GetMTime(void) const override;
protected:
GridResampleImageFilter();
/** Destructor */
- ~GridResampleImageFilter() ITK_OVERRIDE {};
+ ~GridResampleImageFilter() override {};
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
inline void CastPixelWithBoundsChecking( const InterpolatorOutputType& value,
const InterpolatorComponentType& minComponent,
@@ -186,7 +186,7 @@ protected:
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GridResampleImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
index 8463f1821adb4dca6b0c3ac0577d6e340a3bee4d..9779f1de6fe27345e7e642118bbeda98356da493 100644
--- a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
@@ -82,7 +82,7 @@ public:
protected:
HillShadingFilter() {}
- ~HillShadingFilter() ITK_OVERRIDE {}
+ ~HillShadingFilter() override {}
private:
HillShadingFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
index 5f96a9652e3839f054adab558b623176a887a2b0..8ec6c7850aa54a6574a01519cac24735ac246a0c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToNoDataMaskFilter.h
@@ -133,10 +133,10 @@ protected:
ImageToNoDataMaskFilter()
{}
- ~ImageToNoDataMaskFilter() ITK_OVERRIDE
+ ~ImageToNoDataMaskFilter() override
{}
- void BeforeThreadedGenerateData() ITK_OVERRIDE
+ void BeforeThreadedGenerateData() override
{
std::vector<bool> noDataValueAvailable;
std::vector<double> noDataValues;
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
index 49d44f57c2bd55043f304998ef9089b68e36f510..3425e90a5e4892d3bb256778b50f017796f3a62d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
@@ -96,15 +96,15 @@ protected:
/// Constructor
ImageToVectorImageCastFilter() {}
/// Detructor
- ~ImageToVectorImageCastFilter() ITK_OVERRIDE {}
+ ~ImageToVectorImageCastFilter() override {}
/// Additional output information for allocation
- void GenerateOutputInformation(void) ITK_OVERRIDE
+ void GenerateOutputInformation(void) override
{
Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(1);
}
/// Copy output requested region to input requested region
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE
+ void GenerateInputRequestedRegion(void) override
{
if (this->GetInput())
{
diff --git a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
index b7e90fae49742da9ebcb7775e0afdb1c9550b498..f2bf9db5f4e923fda38cefd826111940e01fa55d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
@@ -96,7 +96,7 @@ protected:
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius( radius );
}
- ~LocalGradientVectorImageFilter() ITK_OVERRIDE { }
+ ~LocalGradientVectorImageFilter() override { }
private:
LocalGradientVectorImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
index bd5882214c928769e15014f43b3df28afced11ce..36c7fb14bb241b088d92cb3129044642c0c0ed97 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
@@ -104,7 +104,7 @@ public:
}
protected:
Log10ThresholdedImageFilter() {}
- ~Log10ThresholdedImageFilter() ITK_OVERRIDE {}
+ ~Log10ThresholdedImageFilter() override {}
private:
Log10ThresholdedImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
index 4199951dfa0e0107f6c16fe3f93385de08ec4a10..611dc22ef39e57efec1ddd977a2baaa3955ba0e4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
@@ -111,13 +111,13 @@ public:
protected:
MatrixImageFilter();
- ~MatrixImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MatrixImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Before threaded generate data method.
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** MatrixImageFilter can be implemented for a multithreaded filter treatment.
* Thus, this implementation give the ThreadedGenerateData() method.
@@ -128,7 +128,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
MatrixImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
index 3f0f6c678bace77779bd725b990c0bc8499818d8..8cc130a72832bc9f204462480898ad335752b6ee 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
@@ -101,7 +101,7 @@ public:
}
protected:
MultiplyByScalarImageFilter() {}
- ~MultiplyByScalarImageFilter() ITK_OVERRIDE {}
+ ~MultiplyByScalarImageFilter() override {}
private:
MultiplyByScalarImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
index 205da84a196af0e579c542c9466ac4fe5744e098..9d482cd70dfcf3af286c880688e07be9c1eab8a3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
@@ -72,13 +72,13 @@ public:
protected:
NRIBandImagesToOneNComplexBandsImage();
- ~NRIBandImagesToOneNComplexBandsImage() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~NRIBandImagesToOneNComplexBandsImage() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
+ void BeforeThreadedGenerateData(void) override;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
NRIBandImagesToOneNComplexBandsImage(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
index 01fe68c1150b7ce971cc105833b431b980d3981a..faf49f1b0982a4be5870d222229480cfa892deb1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
@@ -73,12 +73,12 @@ public:
protected:
OneRIBandImageToOneComplexBandImage();
- ~OneRIBandImageToOneComplexBandImage() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~OneRIBandImageToOneComplexBandImage() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
OneRIBandImageToOneComplexBandImage(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
index 82f601942568887897ef27b2a141eb80ddf9ce69..9654ccebf4e8e736fccc7fca18736384a2ebca3c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
@@ -94,18 +94,18 @@ public:
itkSetMacro(OutputIndex, unsigned int);
itkGetMacro(OutputIndex, unsigned int);
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
+ void GenerateOutputInformation(void) override;
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
PerBandVectorImageFilter();
/** Destructor */
- ~PerBandVectorImageFilter() ITK_OVERRIDE {}
+ ~PerBandVectorImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PerBandVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
index 99646f8823f426883bdbcfd8853087b0004a7b2a..b289c7f4c79db961740391334889745b47128e19 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
@@ -70,17 +70,17 @@ public:
}
/** Destructor */
- ~PhaseFunctor() ITK_OVERRIDE {}
+ ~PhaseFunctor() override {}
const char *GetDescription() const
{return "Phase"; }
- unsigned int GetOutputSize() const ITK_OVERRIDE
+ unsigned int GetOutputSize() const override
{
return 1;
}
- OutputPixelType operator ()(const VectorPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const VectorPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
@@ -91,13 +91,13 @@ public:
return outPixel;
}
- OutputPixelType operator ()(ScalarType /*inPixel*/) const ITK_OVERRIDE
+ OutputPixelType operator ()(ScalarType /*inPixel*/) const override
{
//FIXME we don't handle the std::complex<> yet
itkExceptionMacro(<< "Can't compute amplitude from a scalar value");
}
- OutputPixelType operator ()(const RGBPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const RGBPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
@@ -109,7 +109,7 @@ public:
return outPixel;
}
- OutputPixelType operator ()(const RGBAPixelType& inPixel) const ITK_OVERRIDE
+ OutputPixelType operator ()(const RGBAPixelType& inPixel) const override
{
OutputPixelType outPixel;
outPixel.SetSize(1);
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
index ee35f261fc2fe4111977aecfe38a9dd256242752..346a34f2ffb09ce39ed05f1a3ca4fd0cdda4a3d1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
@@ -161,7 +161,7 @@ public:
itk::ImageToImageFilter);
/** Display */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void SetChannel(unsigned int channel);
const ChannelsType GetChannels(void) const;
@@ -232,14 +232,14 @@ public:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
protected:
PrintableImageFilter();
void BeforeGenerateData();
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
index 23d924f8041e0e98ec55ddac12471e22813fc7f8..e473277d1c07d10df0e3d6a16c0b77a9f1191780 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
@@ -116,7 +116,7 @@ public:
protected:
RealAndImaginaryImageToComplexImageFilter() {}
- ~RealAndImaginaryImageToComplexImageFilter() ITK_OVERRIDE {}
+ ~RealAndImaginaryImageToComplexImageFilter() override {}
private:
RealAndImaginaryImageToComplexImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
index 8e86ee82f3bf7df11abc7ba99955e673e3b522e8..0c4168b247a96c4a3c67926a8d83d892c87abb98 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
@@ -93,7 +93,7 @@ public:
protected:
RealImageToComplexImageFilter() {}
- ~RealImageToComplexImageFilter() ITK_OVERRIDE {}
+ ~RealImageToComplexImageFilter() override {}
private:
RealImageToComplexImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
index b22dcd8e6944694171b2e4af5f1d3fc6edec2367..68f986535201d5a5bdd32d0bb98a46081647003a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
@@ -166,7 +166,7 @@ public:
protected:
ShiftScaleImageAdaptor() {}
- ~ShiftScaleImageAdaptor() ITK_OVERRIDE {}
+ ~ShiftScaleImageAdaptor() override {}
private:
ShiftScaleImageAdaptor(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
index 0d5868b6f922916ba29d50c43bee046322f2c1b0..9b90aee8cd3ee82a5d5d5297c9bd47cee50db47b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
@@ -197,16 +197,16 @@ public:
protected:
ShiftScaleVectorImageFilter() {}
- ~ShiftScaleVectorImageFilter() ITK_OVERRIDE {}
+ ~ShiftScaleVectorImageFilter() override {}
/** Process to execute before entering the multithreaded section */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
private:
ShiftScaleVectorImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index b071637c6febabba9d9fd85b87296a9da7db4e91..7cf4f3c44284de83854b9aed87c7a516daa941f4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -84,9 +84,9 @@ protected:
/** Constructor */
SpectralAngleDistanceImageFilter();
/** Destructor */
- ~SpectralAngleDistanceImageFilter() ITK_OVERRIDE {}
+ ~SpectralAngleDistanceImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** SpectralAngleDistanceImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
* which is called for each processing thread. The output image data is
@@ -98,9 +98,9 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
private:
SpectralAngleDistanceImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
index 7f06d1c3deacf8b99a25658a28d030239fb88b7e..48226356e25f6d56e879a6c2efadb0b51735d6db 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
@@ -43,10 +43,10 @@ public:
typedef SpectralAngleFunctor<TInputVectorPixel, TOutputPixel> Superclass;
SqrtSpectralAngleFunctor() {}
- ~SqrtSpectralAngleFunctor() ITK_OVERRIDE {}
+ ~SqrtSpectralAngleFunctor() override {}
protected:
- TOutputPixel Evaluate(const TInputVectorPixel& inPix) const ITK_OVERRIDE
+ TOutputPixel Evaluate(const TInputVectorPixel& inPix) const override
{
return static_cast<TOutputPixel>(vcl_sqrt(Superclass::Evaluate(inPix)));
}
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index da666dbb2ab59c24d514dd23478529db26b29141..423cbab31342a2bc1a59105b5f8aa75eee9d0289 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -102,16 +102,16 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
/** Enable/Disable center data */
itkSetMacro(CenterData, bool);
@@ -120,10 +120,10 @@ public:
protected:
PersistentInnerProductVectorImageFilter();
- ~PersistentInnerProductVectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentInnerProductVectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentInnerProductVectorImageFilter(const Self &); //purposely not implemented
@@ -217,7 +217,7 @@ protected:
/** Constructor */
StreamingInnerProductVectorImageFilter() {};
/** Destructor */
- ~StreamingInnerProductVectorImageFilter() ITK_OVERRIDE {}
+ ~StreamingInnerProductVectorImageFilter() override {}
private:
StreamingInnerProductVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
index 3cb5ddb1a5a1641846c7738c56e55f1799104e42..f79ead12bb00a5c8e1c0ed0f27451ae5757b16dc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -122,18 +122,18 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
// Override since the filter needs all the data for the algorithm
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
+ void Reset(void) override;
+ void Synthetize(void) override;
/** Input wrapper */
void SetFirstInput(const TInputImage *input1)
@@ -165,10 +165,10 @@ public:
protected:
PersistentMatrixTransposeMatrixImageFilter();
- ~PersistentMatrixTransposeMatrixImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentMatrixTransposeMatrixImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentMatrixTransposeMatrixImageFilter(const Self &); //purposely not implemented
@@ -274,7 +274,7 @@ protected:
/** Constructor */
StreamingMatrixTransposeMatrixImageFilter() {};
/** Destructor */
- ~StreamingMatrixTransposeMatrixImageFilter() ITK_OVERRIDE {}
+ ~StreamingMatrixTransposeMatrixImageFilter() override {}
private:
StreamingMatrixTransposeMatrixImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
index d42cea94c96426b7843395bba5a5726afa8eced8..164d9d19e2511cca27069099c2f9ca9ba285b9cc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -172,19 +172,19 @@ public:
}
/** Override itk::ProcessObject method to let the internal filter do the propagation */
- void PropagateRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+ void PropagateRequestedRegion(itk::DataObject *output) override;
protected:
StreamingResampleImageFilter();
/** Destructor */
- ~StreamingResampleImageFilter() ITK_OVERRIDE {};
+ ~StreamingResampleImageFilter() override {};
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StreamingResampleImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index c00878892f2d0c7aa0950e835dc3f39264ae12b1..c48e2d2e2eca4c2ac1fb836e57df88cdf528bb7e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -72,13 +72,13 @@ public:
* a certain dimensions, then some splits will not be possible.
*/
unsigned int GetNumberOfSplits(const RegionType& region,
- unsigned int requestedNumber) ITK_OVERRIDE;
+ unsigned int requestedNumber) override;
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType& region) ITK_OVERRIDE;
+ const RegionType& region) override;
itkGetMacro(TileSizeAlignment, unsigned int);
@@ -89,8 +89,8 @@ public:
protected:
StreamingShrinkImageRegionSplitter() : m_SplitsPerDimension(0U), m_TileDimension(0), m_TileSizeAlignment(0), m_ShrinkFactor(10) {}
- ~StreamingShrinkImageRegionSplitter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~StreamingShrinkImageRegionSplitter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StreamingShrinkImageRegionSplitter(const StreamingShrinkImageRegionSplitter &); //purposely not implemented
@@ -130,7 +130,7 @@ public:
/** Actually computes the stream divisions, according to the specified streaming mode,
* eventually using the input parameter to estimate memory consumption */
- void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) ITK_OVERRIDE;
+ void PrepareStreaming(itk::DataObject * input, const RegionType ®ion) override;
void SetShrinkFactor(unsigned int val)
{
@@ -144,7 +144,7 @@ public:
protected:
StreamingShrinkStreamingManager();
- ~StreamingShrinkStreamingManager() ITK_OVERRIDE;
+ ~StreamingShrinkStreamingManager() override;
private:
StreamingShrinkStreamingManager(const StreamingShrinkStreamingManager &); //purposely not implemented
@@ -203,9 +203,9 @@ public:
return m_ShrunkOutput;
}
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
itkSetMacro(ShrinkFactor, unsigned int);
itkGetMacro(ShrinkFactor, unsigned int);
@@ -213,23 +213,23 @@ public:
protected:
PersistentShrinkImageFilter();
- ~PersistentShrinkImageFilter() ITK_OVERRIDE;
+ ~PersistentShrinkImageFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
@@ -305,7 +305,7 @@ public:
otbSetObjectMemberMacro(Filter, ShrinkFactor, unsigned int);
otbGetObjectMemberMacro(Filter, ShrinkFactor, unsigned int);
- void Update(void) ITK_OVERRIDE
+ void Update(void) override
{
m_StreamingManager->SetShrinkFactor( this->GetFilter()->GetShrinkFactor() );
Superclass::Update();
@@ -321,7 +321,7 @@ protected:
}
/** Destructor */
- ~StreamingShrinkImageFilter() ITK_OVERRIDE {}
+ ~StreamingShrinkImageFilter() override {}
private:
StreamingShrinkImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
index 3e6d3f540505708893faa290c511633e55d4b462..483f2e3275ce047cfb8b1647226cce075f90f151 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTernaryFunctorImageFilter.h
@@ -55,7 +55,7 @@ public:
protected:
TernaryFunctorImageFilter() {};
- ~TernaryFunctorImageFilter() ITK_OVERRIDE {}
+ ~TernaryFunctorImageFilter() override {}
/** TernaryFunctorImageFilter can produce an image which has a different number of bands
* than its input image. As such, TernaryFunctorImageFilter
@@ -65,7 +65,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
index ef2a903cd471d659bc4df45291106dabf016e260..cf87797e75b5ab9135b8e6620a3ea31ca980e708 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -98,8 +98,8 @@ public:
protected:
ThresholdVectorImageFilter();
- ~ThresholdVectorImageFilter() ITK_OVERRIDE {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ThresholdVectorImageFilter() override {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** ThresholdVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -112,9 +112,9 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType ThrethreadId ) ITK_OVERRIDE;
+ itk::ThreadIdType ThrethreadId ) override;
- void GenerateOutputInformation(void) ITK_OVERRIDE
+ void GenerateOutputInformation(void) override
{
Superclass::GenerateOutputInformation();
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
index 34c1c5aa488afe3d0acaa82d051404bb1da718f0..7eb50db4f4b0ea8b9c0407076a501bc757500f6d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -80,26 +80,26 @@ protected:
TileImageFilter();
/** Destructor */
- ~TileImageFilter() ITK_OVERRIDE;
+ ~TileImageFilter() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Generate input requested region method */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Generate input requested region method */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
index c4adb6a9f7b78e4b040a916ef1a970ff6be05627..64020282a392e6267b5d854658997d76bc224892 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
@@ -73,13 +73,13 @@ public:
protected:
TwoNRIBandsImageToNComplexBandsImage();
- ~TwoNRIBandsImageToNComplexBandsImage() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~TwoNRIBandsImageToNComplexBandsImage() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
+ void BeforeThreadedGenerateData(void) override;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
TwoNRIBandsImageToNComplexBandsImage(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index de00941439bf0f44b1cba57331a9deaae1a96cc2..b925c64959685b567abc4ba5e70e3dbfa68fac02 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -123,7 +123,7 @@ protected:
/**
* Destructor
*/
- ~UnaryFunctorNeighborhoodImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorNeighborhoodImageFilter() override {}
/** UnaryFunctorNeighborhoodImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -135,12 +135,12 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* Pad the input requested region by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
private:
UnaryFunctorNeighborhoodImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index 05f86d0857b35d727eec4be0ae654c0a2ee0826c..d562ea081050bc9cc27ed32fe468a41c4aac803b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -133,9 +133,9 @@ protected:
/**
* Destructor
*/
- ~UnaryFunctorNeighborhoodWithOffsetImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorNeighborhoodWithOffsetImageFilter() override {}
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** UnaryFunctorNeighborhoodWithOffsetImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -147,12 +147,12 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* Pad the input requested region by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
std::vector<FunctorType> m_FunctorList;
private:
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index 6a241dd5a2ea9efb2b18384fe2f507d448a2ad23..34e42c34bcddc15a37a475bab04b087f9e30e7de 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -111,7 +111,7 @@ protected:
/**
* Destructor
*/
- ~UnaryFunctorWithIndexImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorWithIndexImageFilter() override {}
/** UnaryFunctorWithIndexImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -123,12 +123,12 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* Pad the input requested region by radius
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
private:
UnaryFunctorWithIndexImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index fe37b979057c32c0bbc79d34ffd2e88b76d93515..f2519e2a59e64f256cbebcd4e33971b7c20e39f3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -89,7 +89,7 @@ public:
protected:
UnaryImageFunctorWithVectorImageFilter();
- ~UnaryImageFunctorWithVectorImageFilter() ITK_OVERRIDE {}
+ ~UnaryImageFunctorWithVectorImageFilter() override {}
/** UnaryImageFunctorWithVectorImageFilter can produce an image which is a different
* resolution than its input image. As such, UnaryImageFunctorWithVectorImageFilter
@@ -99,7 +99,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** UnaryImageFunctorWithVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -111,9 +111,9 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** Ponderation declaration*/
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index 368f04969172e5599a94e4639885ef99541a4b22..ba02992064eb8408d98ee223f7c468473a24e3f1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -74,21 +74,21 @@ public:
protected:
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Threaded Generate data */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/** Constructor */
VectorImageTo3DScalarImageFilter();
/** Destructor */
- ~VectorImageTo3DScalarImageFilter() ITK_OVERRIDE {}
+ ~VectorImageTo3DScalarImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorImageTo3DScalarImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
index 7a8875e488014459725cf47d17ff35426378b6e5..09602f7650692e212a364d79ff7e5ac2ee6eed54 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
@@ -84,9 +84,9 @@ protected:
/** Constructor */
VectorImageToAmplitudeImageFilter() {};
/** Destructor */
- ~VectorImageToAmplitudeImageFilter() ITK_OVERRIDE {}
+ ~VectorImageToAmplitudeImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
index 8b5633863c1097a95560600945f7d704f113c066..e2227f0b70816694fba3f09c37deeb05b8653ce3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
@@ -260,20 +260,20 @@ public:
itkGetConstReferenceMacro(Gamma,double);
/** Process to execute before entering the multithreaded section */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Print internal ivars */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
protected:
VectorRescaleIntensityImageFilter();
- ~VectorRescaleIntensityImageFilter() ITK_OVERRIDE {}
+ ~VectorRescaleIntensityImageFilter() override {}
private:
VectorRescaleIntensityImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
index b7bed10f9b13ee513247014926ea96a103fce589..deaa62aed91a320bff164ee7e84c5bc20a0fd0de 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -99,12 +99,12 @@ public:
* an input processing area larger than the output one.
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
FrostImageFilter();
- ~FrostImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~FrostImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** FrostImageFilter can be implemented for a multithreaded filter treatment.
* Thus, this implementation give the ThreadedGenerateData() method.
@@ -115,7 +115,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
FrostImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
index aacd79527f1f1cc80d39465819ebd52d72c31bf7..7aae5b4199702a1cc6a6d695402592ae4356fc12 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
@@ -91,18 +91,18 @@ public:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
GammaMAPImageFilter();
- ~GammaMAPImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~GammaMAPImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** GammaMAPImageFilter can be multithreaded.
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
GammaMAPImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
index 4233766bd5276710269ed820d339ca34db7f0c79..b2701daf370c575c1bacccec0f76427798dbfc48 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
@@ -91,18 +91,18 @@ public:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
KuanImageFilter();
- ~KuanImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~KuanImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** KuanImageFilter can be multithreaded.
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
KuanImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index 6479cc5e2d8c6c62079916b76dc5913cda576b43..a502acb05a8dc99d45d902764c92eb1c529c6709 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -98,12 +98,12 @@ public:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
protected:
LeeImageFilter();
- ~LeeImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LeeImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** LeeImageFilter can be multithreaded.
* As such, it provides a definition of ThreadedGenerateData()
@@ -116,7 +116,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
LeeImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
index 6f79f68ca6f4a7b048f6c8e9c18f83de8f7b979a..2ae2485e7264005530824491df9aabf5c5d15e62 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
@@ -128,12 +128,12 @@ public:
protected :
BandMathImageFilter();
- ~BandMathImageFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BandMathImageFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedGenerateData(const ImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedGenerateData(const ImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) override;
+ void AfterThreadedGenerateData() override;
private :
BandMathImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
index 7fef900379631204d8481b4491a175aced0e6150..a6cd78452f689301763979e00bb9ca40cd6145db 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
@@ -120,12 +120,12 @@ public:
protected:
MaskMuParserFilter();
- ~MaskMuParserFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MaskMuParserFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, itk::ThreadIdType threadId) override;
+ void AfterThreadedGenerateData() override;
private:
MaskMuParserFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
index d88e533e4f258769cfb77eaae5731b5af6424b93..e9ddd48734c30b1cb16d7461a867b6783258ce1f 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
@@ -98,7 +98,7 @@ public:
protected:
MaskMuParserFunctor();
- ~MaskMuParserFunctor() ITK_OVERRIDE;
+ ~MaskMuParserFunctor() override;
private:
diff --git a/Modules/Filtering/MathParser/include/otbParser.h b/Modules/Filtering/MathParser/include/otbParser.h
index 4dd914b9f734db75c8f100b3c0f30b766b4c65c4..053c1b4566d4f9174c87efdd67a752dd403c42de 100644
--- a/Modules/Filtering/MathParser/include/otbParser.h
+++ b/Modules/Filtering/MathParser/include/otbParser.h
@@ -89,8 +89,8 @@ public:
protected:
Parser();
- ~Parser() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~Parser() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
index d0d036a7df6116084cd5ff55a69fcc10b582c192..5212da806d7753a1ff93b42c8a7325527c097b1f 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
@@ -87,7 +87,7 @@ public:
typedef std::vector<PrecisionType> OutputType;
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE;
+ OutputType Evaluate( const DataNodeType& node ) const override;
std::string GetExpression() const
{
@@ -106,8 +106,8 @@ public:
protected:
ParserConditionDataNodeFeatureFunction();
- ~ParserConditionDataNodeFeatureFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ParserConditionDataNodeFeatureFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ParserConditionDataNodeFeatureFunction(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/MathParser/src/otbParser.cxx b/Modules/Filtering/MathParser/src/otbParser.cxx
index 4280d3ac9c85b508453b5c23685bf0dc52f89255..ac57dd9a85f054b0fc6dd9ddc248043dbdd4877b 100644
--- a/Modules/Filtering/MathParser/src/otbParser.cxx
+++ b/Modules/Filtering/MathParser/src/otbParser.cxx
@@ -184,11 +184,11 @@ protected:
InitConst();
}
- ~ParserImpl() ITK_OVERRIDE
+ ~ParserImpl() override
{
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
index 5dd1085c054d77b067e11ba5b52f48641d137f7a..b491cef10f2b56bea1eee72f555174390d879b2d 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
@@ -132,15 +132,15 @@ public:
protected :
BandMathXImageFilter();
- ~BandMathXImageFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~BandMathXImageFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
+ void GenerateInputRequestedRegion() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedGenerateData(const ImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedGenerateData(const ImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) override;
+ void AfterThreadedGenerateData() override;
private :
diff --git a/Modules/Filtering/MathParserX/include/otbParserX.h b/Modules/Filtering/MathParserX/include/otbParserX.h
index ef75a31eaf29ef5912be88d26045a938824671a5..d0eab3a05e09a48dbc0006710c90abfc85680de5 100644
--- a/Modules/Filtering/MathParserX/include/otbParserX.h
+++ b/Modules/Filtering/MathParserX/include/otbParserX.h
@@ -107,8 +107,8 @@ public:
protected:
ParserX();
- ~ParserX() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ParserX() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/MathParserX/include/otbParserXPlugins.h b/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
index e9da00fd05e01352e2f04ca9b1807d38170df5f8..195a7e955ba25e0c0076c015c309cc3fe121e002 100644
--- a/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
+++ b/Modules/Filtering/MathParserX/include/otbParserXPlugins.h
@@ -36,14 +36,14 @@ public:
bands():ICallback(mup::cmFUNC, "bands", 2)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "bands - A bands selector";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new bands(*this);
}
@@ -56,14 +56,14 @@ public:
dotpr():ICallback(mup::cmFUNC, "dotpr", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "dotpr(m1,m2) - A vector/matrix dot product";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new dotpr(*this);
}
@@ -75,14 +75,14 @@ class ElementWiseDivision : public mup::IOprtBin
ElementWiseDivision():IOprtBin(_T("div"), (int)(mup::prMUL_DIV), mup::oaLEFT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("x div y - Element-wise division (vectors / matrices)");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new ElementWiseDivision(*this);
}
@@ -95,14 +95,14 @@ class DivisionByScalar : public mup::IOprtBin
DivisionByScalar():IOprtBin(_T("dv"), (int)(mup::prMUL_DIV), mup::oaLEFT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("x dv y - division of vectors / matrices by a scalar");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new DivisionByScalar(*this);
}
@@ -115,14 +115,14 @@ class ElementWiseMultiplication : public mup::IOprtBin
ElementWiseMultiplication():IOprtBin(_T("mult"), (int)(mup::prMUL_DIV), mup::oaLEFT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("x mult y - Element wise multiplication (vectors / matrices)");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new ElementWiseMultiplication(*this);
}
@@ -135,14 +135,14 @@ class MultiplicationByScalar : public mup::IOprtBin
MultiplicationByScalar():IOprtBin(_T("mlt"), (int)(mup::prMUL_DIV), mup::oaLEFT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("x mlt y - multiplication of vectors / matrices by a scalar");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new MultiplicationByScalar(*this);
}
@@ -155,14 +155,14 @@ public:
ElementWisePower():IOprtBin(_T("pow"), (int) mup::prPOW, mup::oaRIGHT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("pow - Power for noncomplex vectors & matrices");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new ElementWisePower(*this);
}
@@ -175,14 +175,14 @@ class PowerByScalar : public mup::IOprtBin
PowerByScalar():IOprtBin(_T("pw"), (int)(mup::prMUL_DIV), mup::oaLEFT)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return _T("x pw y - power of vectors / matrices by a scalar");
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new PowerByScalar(*this);
}
@@ -195,14 +195,14 @@ public:
ndvi():ICallback(mup::cmFUNC, "ndvi", 2)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "NDVI - Normalized Difference Vegetation Index";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new ndvi(*this);
}
@@ -215,14 +215,14 @@ public:
cat():ICallback(mup::cmFUNC, "cat", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "cat(m1,m2) - Values concatenation";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new cat(*this);
}
@@ -235,14 +235,14 @@ public:
mean():ICallback(mup::cmFUNC, "mean", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "mean(m1,m2,..) - mean of each neighborhood";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new mean(*this);
}
@@ -255,14 +255,14 @@ public:
var():ICallback(mup::cmFUNC, "var", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "var(m1,m2,..) - variance of each neighborhood";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new var(*this);
}
@@ -275,14 +275,14 @@ public:
corr():ICallback(mup::cmFUNC, "corr", 2)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "corr(m1,m2) - variance of two variables m1 and m2";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new corr(*this);
}
@@ -295,14 +295,14 @@ public:
median():ICallback(mup::cmFUNC, "median", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "median(m1,m2,..) - median value of each neighborhood";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new median(*this);
}
@@ -315,14 +315,14 @@ public:
maj():ICallback(mup::cmFUNC, "maj", -1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "maj(m1,m2,..) - majority value of each neighborhood";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new maj(*this);
}
@@ -335,14 +335,14 @@ public:
vnorm():ICallback(mup::cmFUNC, "vnorm", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int a_iArgc) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vnorm(v1) - Norm for a vector : sqrt(sum of squared elements); works also with matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vnorm(*this);
}
@@ -354,14 +354,14 @@ public:
vmin():ICallback(mup::cmFUNC, "vmin", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vmin(m1) - overall minimum";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vmin(*this);
}
@@ -374,14 +374,14 @@ public:
vmax():ICallback(mup::cmFUNC, "vmax", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vmax(m1) - overall maximun";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vmax(*this);
}
@@ -394,14 +394,14 @@ public:
vect2scal():ICallback(mup::cmFUNC, "vect2scal", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vect2scal - Convert one dimensional vector to scalar";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vect2scal(*this);
}
@@ -415,14 +415,14 @@ public:
vcos():ICallback(mup::cmFUNC, "vcos", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vcos - Cosinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vcos(*this);
}
@@ -435,14 +435,14 @@ public:
vacos():ICallback(mup::cmFUNC, "vacos", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vacos - Arccosinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vacos(*this);
}
@@ -454,14 +454,14 @@ public:
vsin():ICallback(mup::cmFUNC, "vsin", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vsin - Sinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vsin(*this);
}
@@ -473,14 +473,14 @@ public:
vasin():ICallback(mup::cmFUNC, "vasin", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vasin - Arcsinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vasin(*this);
}
@@ -493,14 +493,14 @@ public:
vtan():ICallback(mup::cmFUNC, "vtan", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vtan - Tangent for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vtan(*this);
}
@@ -513,14 +513,14 @@ public:
vatan():ICallback(mup::cmFUNC, "vatan", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vatan - Arctangent for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vatan(*this);
}
@@ -533,14 +533,14 @@ public:
vtanh():ICallback(mup::cmFUNC, "vtanh", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vtanh - Hyperbolic tangent for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vtanh(*this);
}
@@ -553,14 +553,14 @@ public:
vsinh():ICallback(mup::cmFUNC, "vsinh", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vsinh - Hyperbolic sinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vsinh(*this);
}
@@ -573,14 +573,14 @@ public:
vcosh():ICallback(mup::cmFUNC, "vcosh", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vcosh - Hyperbolic cosinus for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vcosh(*this);
}
@@ -593,14 +593,14 @@ public:
vlog():ICallback(mup::cmFUNC, "vlog", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vlog - Log for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vlog(*this);
}
@@ -613,14 +613,14 @@ public:
vlog10():ICallback(mup::cmFUNC, "vlog10", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vlog10 - Log10 for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vlog10(*this);
}
@@ -633,14 +633,14 @@ public:
vabs():ICallback(mup::cmFUNC, "vabs", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vabs - Absolute value for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vabs(*this);
}
@@ -653,14 +653,14 @@ public:
vexp():ICallback(mup::cmFUNC, "vexp", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vexp - Exponential for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vexp(*this);
}
@@ -673,14 +673,14 @@ public:
vsqrt():ICallback(mup::cmFUNC, "vsqrt", 1)
{}
- void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) ITK_OVERRIDE;
+ void Eval(mup::ptr_val_type &ret, const mup::ptr_val_type *a_pArg, int itkNotUsed(a_iArgc)) override;
- const mup::char_type* GetDesc() const ITK_OVERRIDE
+ const mup::char_type* GetDesc() const override
{
return "vsqrt - Sqrt for noncomplex vectors & matrices";
}
- mup::IToken* Clone() const ITK_OVERRIDE
+ mup::IToken* Clone() const override
{
return new vsqrt(*this);
}
diff --git a/Modules/Filtering/MathParserX/src/otbParserX.cxx b/Modules/Filtering/MathParserX/src/otbParserX.cxx
index b57ac98fec1c7ece27bdc42958b768f4537ce222..c7b0be5625b95beb2799632fc3058d3d6447b906 100644
--- a/Modules/Filtering/MathParserX/src/otbParserX.cxx
+++ b/Modules/Filtering/MathParserX/src/otbParserX.cxx
@@ -250,11 +250,11 @@ protected:
InitConst();
}
- ~ParserXImpl() ITK_OVERRIDE
+ ~ParserXImpl() override
{
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
index da70e60c4824f095c5ef05ae20be837bb8fc05db..5a72c260d4a3533165f6fdb9ec08c0dab811b8fc 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
@@ -93,7 +93,7 @@ public:
* Get The Analyse image at each level of the pyramid.
* \return The analysed image at each level of the pyramid.
*/
- OutputImageListType* GetOutput(void) ITK_OVERRIDE;
+ OutputImageListType* GetOutput(void) override;
/**
* Get The SupFilter details
* \return The brighter details extracted from the filtering operation.
@@ -119,12 +119,12 @@ protected:
/** Constructor */
MorphologicalPyramidAnalysisFilter();
/** Destructor */
- ~MorphologicalPyramidAnalysisFilter() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE {} // does nothing
+ ~MorphologicalPyramidAnalysisFilter() override;
+ void GenerateOutputInformation() override {} // does nothing
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** Number of levels of the algorithm */
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 6ca0f65408f95153c5fb2fca6e135b0356edc04e..7b49a7fd3ea7a49736d01ac897b081e4c9280d83 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -71,7 +71,7 @@ public:
* \param imageList The analysed image at each level of the pyramid.
*/
using Superclass::SetInput;
- void SetInput(const InputImageListType * imageList) ITK_OVERRIDE;
+ void SetInput(const InputImageListType * imageList) override;
/**
* Set The SupFilter details
* \param imageList The brighter details extracted from the filtering operation.
@@ -96,7 +96,7 @@ public:
* Get the input list.
* \return The list of the analysed image at each pyramid level.
*/
- InputImageListType* GetInput(void) ITK_OVERRIDE;
+ InputImageListType* GetInput(void) override;
/**
* Get The SupFilter details
* \return The brighter details extracted from the filtering operation.
@@ -122,7 +122,7 @@ public:
* \return The analysed image at each pyramid level
* resampled at full resolution.
*/
- OutputImageListType* GetOutput(void) ITK_OVERRIDE;
+ OutputImageListType* GetOutput(void) override;
/**
* Get The SupFilter details at full resolution.
* \return The brighter details extracted from the filtering operation
@@ -152,12 +152,12 @@ protected:
/** Constructor */
MRToMSConverter();
/** Destructor */
- ~MRToMSConverter() ITK_OVERRIDE {}
+ ~MRToMSConverter() override {}
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
MRToMSConverter(const Self &); // purposely not implemented
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
index 3de2246b07d248b7b0a65e76bd18d7603b97b26b..732149b2114c116d5aa993851a00fda5ea7b66db 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
@@ -77,17 +77,17 @@ protected:
/** Constructor */
Resampler();
/** Destructor */
- ~Resampler() ITK_OVERRIDE {}
+ ~Resampler() override {}
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Configure input requested region to be the largest possible region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Configure output requested region to be the largest possible region */
- void EnlargeOutputRequestedRegion(itk::DataObject * itkNotUsed(output)) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject * itkNotUsed(output)) override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
Resampler(const Self &); // purposely not implemented
void operator =(const Self&); // purposely not implemented
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
index a000cf5dfcea9d58b3cfe5fb04734048f0c3cdb2..5312f55b0a29fc1ca49818f67e9d83247b9a1ed5 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
@@ -141,12 +141,12 @@ protected:
/** Constructor */
MorphologicalPyramidSegmentationFilter();
/** Destructor */
- ~MorphologicalPyramidSegmentationFilter() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE {} // does nothing
+ ~MorphologicalPyramidSegmentationFilter() override;
+ void GenerateOutputInformation() override {} // does nothing
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
unsigned long m_MinimumObjectSize;
/** Quantile for seeds determination */
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
index 09969ede26b58d970785f8e242c9a27ea769bb96..47a9929ff75c63c9914e795bd0bdace7b1a87210 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
@@ -120,15 +120,15 @@ protected:
/** Constructor */
Segmenter();
/** Destructor */
- ~Segmenter() ITK_OVERRIDE {}
+ ~Segmenter() override {}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Configure the input datas.
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/**
* Configure the output data.
*/
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
index 3cd4c2653dbe0730236c300ea6021e0ce10962b5..3b83773a44d2a2b649528c9cff7c396f85723436 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
@@ -128,12 +128,12 @@ protected:
/** Constructor */
MorphologicalPyramidSynthesisFilter();
/** Destructor */
- ~MorphologicalPyramidSynthesisFilter() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE {} // does nothing
+ ~MorphologicalPyramidSynthesisFilter() override;
+ void GenerateOutputInformation() override {} // does nothing
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
};
} // End namespace otb
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
index 6341a81fd3c5480745b306ac29f43a8be7bb6311..b668d970e33eaafe0bbeddda5594bdaf8279507f 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.h
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
@@ -70,13 +70,13 @@ public:
typedef double RealType;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PathType& path) const ITK_OVERRIDE;
+ OutputType Evaluate(const PathType& path) const override;
virtual OutputType Evaluate() const;
protected:
CompacityPathFunction() {};
- ~CompacityPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~CompacityPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
CompacityPathFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
index c0f24975e7e479098d39274aa6aeb4b515378630..1fda8044e13889fb8b5478da351785dca8ac3074 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.h
@@ -90,10 +90,10 @@ public:
protected:
DrawPathFilter();
- ~DrawPathFilter() ITK_OVERRIDE {}
+ ~DrawPathFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
DrawPathFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
index efa0645b5a37107dd6adf59e96d313f4a1e8506a..9c9de8abee430d1cc72fadd66bd528da679e486f 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
@@ -111,11 +111,11 @@ protected:
/** Constructor */
DrawPathListFilter();
/** Desctructor */
- ~DrawPathListFilter() ITK_OVERRIDE {}
+ ~DrawPathListFilter() override {}
/** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
DrawPathListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
index c33c6afc7e9ba0bd955938100bb7ed41289ffb81..ac5d3b89b33cdba40f4894e7d57a7d45e6c570d5 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
@@ -94,11 +94,11 @@ protected:
/** Constructor */
ImageFittingPolygonListFilter();
/** Destructor */
- ~ImageFittingPolygonListFilter() ITK_OVERRIDE {}
+ ~ImageFittingPolygonListFilter() override {}
/** GenerateData method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
virtual double computeValue(ImageConstPointerType image,
VertexType middlePoint,
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
index 2bf48180fc579d524375a342833a1377ae9a236c..f976eb805f16a59c6d103869a1732de140f9074b 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
@@ -86,10 +86,10 @@ public:
protected:
ImageToEdgePathFilter();
- ~ImageToEdgePathFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE {} //does nothing
- void GenerateData() ITK_OVERRIDE;
+ ~ImageToEdgePathFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateOutputInformation() override {} //does nothing
+ void GenerateData() override;
private:
ImageToEdgePathFilter(const Self &); // purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index 9011677b0adb4714e02050b8eb4b7c6abb378bd4..8e09616793253a73ee262c8f5ea63d2e672f1f5d 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -61,8 +61,8 @@ public:
protected:
ImageToPathFilter();
- ~ImageToPathFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageToPathFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToPathFilter(const Self &);
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index d43671930b2fe869fb03e6c8922a37e60dd16d12..146d7d4d6dae5f0516533c62d57e82bba4af0ba8 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -76,9 +76,9 @@ public:
protected:
ImageToPathListFilter();
- ~ImageToPathListFilter() ITK_OVERRIDE {}
+ ~ImageToPathListFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToPathListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
index d3bdd5a27fe36c52953bec6ffd7578a9345331b7..ca1b010e231da5b5d5dbde804cc0953714608f36 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.h
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
@@ -66,13 +66,13 @@ public:
typedef double RealType;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PathType& path) const ITK_OVERRIDE;
+ OutputType Evaluate(const PathType& path) const override;
virtual OutputType Evaluate() const;
protected:
OrientationPathFunction() {};
- ~OrientationPathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~OrientationPathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
OrientationPathFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
index 065a7d5f369a1db5008ef01f32a1b7870c7866e3..e260d86b3221dd4ab234fd8265aea7f3642f404c 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.h
+++ b/Modules/Filtering/Path/include/otbPathFunction.h
@@ -80,8 +80,8 @@ public:
protected:
PathFunction();
- ~PathFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PathFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
InputPathConstPointer m_Path;
diff --git a/Modules/Filtering/Path/include/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
index 31eaebc2b7fdb7b375e4da73e669a6795a4516bb..0181cc72763be8cab65790dd489a384bff15d3d6 100644
--- a/Modules/Filtering/Path/include/otbPathListSource.h
+++ b/Modules/Filtering/Path/include/otbPathListSource.h
@@ -172,7 +172,7 @@ public:
protected:
PathListSource() {};
- ~PathListSource() ITK_OVERRIDE {}
+ ~PathListSource() override {}
// void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index 17569744ed8f3d7f31e1cc1cc2bf44ac38c83496..e5f99af968f345d7687ab52f7f41b8601472cc8a 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -117,12 +117,12 @@ public:
protected:
PathListToHistogramGenerator();
- ~PathListToHistogramGenerator() ITK_OVERRIDE {}
- void GenerateData() ITK_OVERRIDE;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType) ITK_OVERRIDE;
+ ~PathListToHistogramGenerator() override {}
+ void GenerateData() override;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType) override;
using Superclass::MakeOutput;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
index a7baf6f52efad5bec77960bc58356a4e87c25739..88fcb21c6316e1b406b63d565322959226dbfd4b 100644
--- a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
@@ -63,7 +63,7 @@ protected:
/** Constructor */
PathListToPathListFilter() {};
/** Destructor */
- ~PathListToPathListFilter() ITK_OVERRIDE {}
+ ~PathListToPathListFilter() override {}
private:
PathListToPathListFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
index 2b1eebd04ba7e3e9ca3c608bbadc504ae519b9ce..e56e3e2ac8a11662219b69e081380fdb4c2994be 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
@@ -95,7 +95,7 @@ public:
PolyLineImageIterator(ImageType * imagePtr, PathType * pathPtr)
: Superclass(imagePtr, pathPtr) {};
/** Default Destructor. */
- ~PolyLineImageIterator() ITK_OVERRIDE {}
+ ~PolyLineImageIterator() override {}
};
} // End namespace otb
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
index fd3e1c0c50e3b5efaddd3912d273bef8b383b92c..21176cb50ea37dc304a0d099994dd242ef029bf5 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
@@ -102,16 +102,16 @@ public:
protected:
RegionImageToRectangularPathListFilter();
- ~RegionImageToRectangularPathListFilter() ITK_OVERRIDE;
+ ~RegionImageToRectangularPathListFilter() override;
- void GenerateOutputInformation() ITK_OVERRIDE{} // do nothing
- void GenerateData() ITK_OVERRIDE;
+ void GenerateOutputInformation() override{} // do nothing
+ void GenerateData() override;
double m_MinimumFit;
double m_MinimumSize;
int m_CrossTermFormula;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
//jgc
typedef Image<unsigned char, itkGetStaticConstMacro(NDimensions)> MarkerImageType;
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 7d6f3f13fb92e731af7ad552789d92d66c80c0d4..3e0b32a71b3e28c22d41334400f4ce42b562f916 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -117,11 +117,11 @@ protected:
/** Constructor */
VectorizationPathListFilter();
/** Destructor */
- ~VectorizationPathListFilter() ITK_OVERRIDE {}
+ ~VectorizationPathListFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/**
* Compute a vector of the 8 neighbors to explore from the direction and the type of search (forward or backward).
* \param direction The direction
diff --git a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
index 6d0ce02fc5b8fc20d51c50cd46373e350ef9b224..fcec423adc6bc8256034e978c95a8a8cf7384224 100644
--- a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
@@ -230,7 +230,7 @@ public:
protected:
MuellerToPolarisationDegreeAndPowerImageFilter() {}
- ~MuellerToPolarisationDegreeAndPowerImageFilter() ITK_OVERRIDE {}
+ ~MuellerToPolarisationDegreeAndPowerImageFilter() override {}
private:
MuellerToPolarisationDegreeAndPowerImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
index f867aa7ede24b5b7393621acc118e52b9f416e1f..77a13cbb0472a75272edea8a37bd5ccc04773935 100644
--- a/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
@@ -158,7 +158,7 @@ public:
protected:
MuellerToReciprocalCovarianceImageFilter() {}
- ~MuellerToReciprocalCovarianceImageFilter() ITK_OVERRIDE {}
+ ~MuellerToReciprocalCovarianceImageFilter() override {}
private:
MuellerToReciprocalCovarianceImageFilter(const Self&); // purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index bb08aa2ffef686d56e6c0fdf3b6f86ab2ddadb20..7c3ab103d00deefcfdb9f904eb4707547740c379 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -155,7 +155,7 @@ protected:
/** Constructor */
MultiChannelsPolarimetricSynthesisFilter();
/** Destructor */
- ~MultiChannelsPolarimetricSynthesisFilter() ITK_OVERRIDE {}
+ ~MultiChannelsPolarimetricSynthesisFilter() override {}
/** MultiChannelsPolarimetricSynthesisFilter can produce an image
* which is a synthesis of channels HH, HV, VH and VV.
@@ -167,9 +167,9 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** MultiChannelsPolarimetricSynthesisFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -182,7 +182,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/** Computation of the electromagnetic fields Ei Er */
void ComputeElectromagneticFields();
@@ -190,7 +190,7 @@ protected:
/** Verify and force the inputs, if only 2 or 3 channels are present */
void VerifyAndForceInputs();
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
MultiChannelsPolarimetricSynthesisFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
index 2207165b5c0f81c4d20d27dfe944ad8f1d6eac46..78a3d1c1cc4212ef4be994a36fddd4bc0fdab6fa 100644
--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
+++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
@@ -79,9 +79,9 @@ protected:
/** Constructor */
PolarimetricData();
/** Destructor */
- ~PolarimetricData() ITK_OVERRIDE {}
+ ~PolarimetricData() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PolarimetricData(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompImageFilter.h
index d6fd45092aadd268880be5be324a4cf7e93d1efa..54dd975da48a2594728d643a67019323ab3c91a9 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompImageFilter.h
@@ -151,7 +151,7 @@ public:
protected:
ReciprocalBarnesDecompImageFilter() {}
- ~ReciprocalBarnesDecompImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalBarnesDecompImageFilter() override {}
private:
ReciprocalBarnesDecompImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
index 438d27a10b3793a931bf92630fdcfe16497253fa..71e7d6917df3a010042a4c56c0a17fd6127cd1cb 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
@@ -163,7 +163,7 @@ public:
protected:
ReciprocalCoherencyToReciprocalMuellerImageFilter() {}
- ~ReciprocalCoherencyToReciprocalMuellerImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalCoherencyToReciprocalMuellerImageFilter() override {}
private:
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
index 64412304a94ef6b679d86ca0c4781eba64874e56..8d346c71493679d1f72c830cc4b056a0806b4299 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
@@ -147,7 +147,7 @@ public:
protected:
ReciprocalCovarianceToCoherencyDegreeImageFilter() {}
- ~ReciprocalCovarianceToCoherencyDegreeImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalCovarianceToCoherencyDegreeImageFilter() override {}
private:
ReciprocalCovarianceToCoherencyDegreeImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
index 4c92f4d88fea6f600b11f0802d9bf857ee66558f..761f4a0f74cf952494e7be810c0413a632bab796 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
@@ -138,7 +138,7 @@ public:
protected:
ReciprocalCovarianceToReciprocalCoherencyImageFilter() {}
- ~ReciprocalCovarianceToReciprocalCoherencyImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalCovarianceToReciprocalCoherencyImageFilter() override {}
private:
ReciprocalCovarianceToReciprocalCoherencyImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
index ad2404e657581b2baa5f5574fd2fe65a9d06c884..2e95fff07cf72bcc303d1079e114a1057257db71 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
@@ -220,7 +220,7 @@ public:
protected:
ReciprocalHAlphaImageFilter() {}
- ~ReciprocalHAlphaImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalHAlphaImageFilter() override {}
private:
ReciprocalHAlphaImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompImageFilter.h
index fc9973dc287fdd8e6e00597ebdef8d52e6a7a0aa..2da4369697705d86a9629fda19ce3a86540a21c6 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompImageFilter.h
@@ -122,7 +122,7 @@ public:
protected:
ReciprocalHuynenDecompImageFilter() {}
- ~ReciprocalHuynenDecompImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalHuynenDecompImageFilter() override {}
private:
ReciprocalHuynenDecompImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
index d762a266bd9009e9da0dac3278599961454473c2..900eeb4947675fb23e29920e0f1764e368560dff 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
@@ -143,7 +143,7 @@ public:
protected:
ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter() {}
- ~ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter() override {}
private:
ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompImageFilter.h
index d24da9a307630f9e2aaf8c71e717495abb9a37e8..319c19be77046ede4ec0242abd74563b994d7a45 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompImageFilter.h
@@ -113,7 +113,7 @@ public:
protected:
ReciprocalPauliDecompImageFilter() {this->SetNumberOfThreads(1);}
- ~ReciprocalPauliDecompImageFilter() ITK_OVERRIDE {}
+ ~ReciprocalPauliDecompImageFilter() override {}
private:
ReciprocalPauliDecompImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
index 1bbd3f1213b9bf6930613206dde437d0934ac74e..bb9c04c06f37df3da0b96a0f88fb1aa738b18350 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
@@ -109,11 +109,11 @@ protected:
/** Constructor */
SinclairImageFilter() {}
/** Destructor */
- ~SinclairImageFilter() ITK_OVERRIDE {}
+ ~SinclairImageFilter() override {}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
index 4dea852f426b96d423c0e43b2465ab20cd7886c4..2b9d4dc32103d3786b560bbba2659af5b6092b9b 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
@@ -108,11 +108,11 @@ protected:
/** Constructor */
SinclairReciprocalImageFilter() {}
/** Destructor */
- ~SinclairReciprocalImageFilter() ITK_OVERRIDE {}
+ ~SinclairReciprocalImageFilter() override {}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
index cddb18af871e825b8090be72a2a0a48c531297ae..d02d5a6888e538881914f764de7be90981bc6de9 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
@@ -61,7 +61,7 @@ public:
protected:
Eckert4MapProjection();
- ~Eckert4MapProjection() ITK_OVERRIDE;
+ ~Eckert4MapProjection() override;
private:
Eckert4MapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index e2f6aac47023d400f2cca31f4a8d362a5816ce01..06436338f0cc550b3c5561fa8ed9b5cec2b52cc5 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -170,17 +170,17 @@ protected:
/** Constructor */
GCPsToRPCSensorModelImageFilter();
/** Destructor */
- ~GCPsToRPCSensorModelImageFilter() ITK_OVERRIDE;
+ ~GCPsToRPCSensorModelImageFilter() override;
/** The PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Actual estimation of the sensor model takes place in the
* GenerateOutputInformation() method */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Drive the model up-to-date flag */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
GCPsToRPCSensorModelImageFilter (const Self &); // purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index 233d736e857747b497917d664f997ad0e6e7983a..0f93d53e91d85dc3f8877bf88803331a3d77237b 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -268,20 +268,20 @@ public:
}
/** Override itk::ProcessObject method to let the internal filter do the propagation */
- void PropagateRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+ void PropagateRequestedRegion(itk::DataObject *output) override;
protected:
GenericRSResampleImageFilter();
/** Destructor */
- ~GenericRSResampleImageFilter() ITK_OVERRIDE {};
+ ~GenericRSResampleImageFilter() override {};
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
virtual void UpdateTransform();
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GenericRSResampleImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
index 7635cdcea7c215848a90ae60efb5a119bc58d1a4..ee70f41a7261b9f83c3ac0bfc2c3e5de3027b317 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
@@ -203,7 +203,7 @@ GenericRSResampleImageFilter<TInputImage, TOutputImage>
m_InputRpcEstimator->SetInput(tempPtr);
m_InputRpcEstimator->UpdateOutputInformation();
- // No need to ITK_OVERRIDE the input kwl, just setup the
+ // No need to override the input kwl, just setup the
// transform with the kwl estimated
if(m_InputRpcEstimator->GetInput()->GetImageKeywordlist().GetSize() > 0)
m_Transform->SetOutputKeywordList(m_InputRpcEstimator->GetOutput()->GetImageKeywordlist());
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
index 11b7dacd6f29b385879e6bbeb1b713687e8bb85c..225aa44e4a43217afe89fd1522ea7d22bda4dd79 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.h
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
@@ -68,10 +68,10 @@ public:
/** Gets the distance between the origin point and x. This function
* work with SetOrigin() function */
- double Evaluate(const VectorType & x) const ITK_OVERRIDE;
+ double Evaluate(const VectorType & x) const override;
/* Gets the distance between x and y points */
- double Evaluate(const VectorType & x, const VectorType & y) const ITK_OVERRIDE;
+ double Evaluate(const VectorType & x, const VectorType & y) const override;
/** Set the earth radius */
itkSetMacro(EarthRadius, double);
@@ -84,10 +84,10 @@ protected:
GeographicalDistance();
/** Destructor */
- ~GeographicalDistance() ITK_OVERRIDE{}
+ ~GeographicalDistance() override{}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GeographicalDistance(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
index 50e7ea5b2ff20c75e2bbfc5abf2e136767994921..4229ae3771694a5f39b236a509db92a2ef12a5e9 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
@@ -195,7 +195,7 @@ private:
* of the filter. It's up to the caller to take responsibility of the returned
* object.
*/
- OGRSpatialReference* DoDefineNewLayerSpatialReference(ogr::Layer const& source) const ITK_OVERRIDE;
+ OGRSpatialReference* DoDefineNewLayerSpatialReference(ogr::Layer const& source) const override;
/**
* Hook that actually filters an OGR \c Layer.
* \param[in] source Input layer
@@ -207,13 +207,13 @@ private:
* inner-filter working on \c ogr::DataSource cannot be globally configured
* once and for all.
*/
- void DoProcessLayer(ogr::Layer const& source, ogr::Layer & destination) const ITK_OVERRIDE;
+ void DoProcessLayer(ogr::Layer const& source, ogr::Layer & destination) const override;
/** Hook used to conclude the initialization phase.
* Global \c ogr::DataSource settings for the \c m_Transform functor are
* forwarded to the functor. \c ogr::Layer specific settings will be set at
* the last moment from \c DoProcessLayer().
*/
- void DoFinalizeInitialization() ITK_OVERRIDE;
+ void DoFinalizeInitialization() override;
/**
* Hook used to define the fields of the new layer.
@@ -223,18 +223,18 @@ private:
* Just forwards the fields definition to the \c FieldTransformationPolicy
* encapsuled in the \c TransformationFunctorDispatcherType.
*/
- void DoDefineNewLayerFields(ogr::Layer const& source, ogr::Layer & dest) const ITK_OVERRIDE;
+ void DoDefineNewLayerFields(ogr::Layer const& source, ogr::Layer & dest) const override;
protected:
/** Default constructor. */
GeometriesProjectionFilter();
/** Destructor. */
- ~GeometriesProjectionFilter() ITK_OVERRIDE;
+ ~GeometriesProjectionFilter() override;
/** Computes output information.
* \post \c m_OutputProjectionRef contains all its related meta-data
*/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
public:
/**\name Image Reference (origin, spacing) */
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
index 6f60e7b74a69362e160af07243c9dd51ab638d90..925069f259888098ade27701a754e4627493e348 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
@@ -81,10 +81,10 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- FloatType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ FloatType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- FloatType Evaluate(const PointType& point) const ITK_OVERRIDE
+ FloatType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
@@ -92,7 +92,7 @@ public:
}
FloatType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -103,8 +103,8 @@ public:
protected:
GroundSpacingImageFunction();
- ~GroundSpacingImageFunction() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~GroundSpacingImageFunction() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GroundSpacingImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index 2c4bd9779b8a1bbe4f80f6b1c9f2f06ddcb6e1a5..827b852e8f487b0c131c0c6074d5119c0eb98ce9 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -96,13 +96,13 @@ public:
protected:
ImageToEnvelopeVectorDataFilter();
- ~ImageToEnvelopeVectorDataFilter() ITK_OVERRIDE {}
+ ~ImageToEnvelopeVectorDataFilter() override {}
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
void InstantiateTransform();
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 6245f9b0a13468872d029849ebe6f29c50901e85..f22b21de3b262040e5a757793125e516ef859a44 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -81,20 +81,20 @@ protected:
/** Constructor */
ImportGeoInformationImageFilter();
/** Destructor */
- ~ImportGeoInformationImageFilter() ITK_OVERRIDE {}
+ ~ImportGeoInformationImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate input requested region */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
ImportGeoInformationImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
index d66432cfcfa903d8a9fcb84f3d353eb11cd2ad34..76dfc2c415cd18e0ff52916ca220d0539403cab8 100644
--- a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
@@ -60,7 +60,7 @@ protected:
this->SetParameter("StandardParallel2", "47.69601389");
}
- ~Lambert2EtenduProjection() ITK_OVERRIDE {}
+ ~Lambert2EtenduProjection() override {}
private:
Lambert2EtenduProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbLambert93Projection.h b/Modules/Filtering/Projection/include/otbLambert93Projection.h
index 6949cbb9eabdf535b03b87e7c83214c5da78c2ec..377d61acc6b4e636696ba922d7daaf314e6e6ead 100644
--- a/Modules/Filtering/Projection/include/otbLambert93Projection.h
+++ b/Modules/Filtering/Projection/include/otbLambert93Projection.h
@@ -60,7 +60,7 @@ protected:
this->SetParameter("StandardParallel2", "49");
}
- ~Lambert93Projection() ITK_OVERRIDE {}
+ ~Lambert93Projection() override {}
private:
Lambert93Projection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
index d0031487d611c8c50cdeb613afe7dc2cf45ebe6e..53bf34e8ec8395c25dadee34e76979ccc1674f97 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
@@ -64,7 +64,7 @@ public:
protected:
LambertConformalConicMapProjection();
- ~LambertConformalConicMapProjection() ITK_OVERRIDE {};
+ ~LambertConformalConicMapProjection() override {};
private:
LambertConformalConicMapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
index f85ec672636f0dbf0130e99cc78243f50a10ac32..a3d1f273c4eb593a2da5af4b4ee790d2af296a9d 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
@@ -138,10 +138,10 @@ protected:
/** Constructor */
LeastSquareAffineTransformEstimator();
/** Destructor */
- ~LeastSquareAffineTransformEstimator() ITK_OVERRIDE;
+ ~LeastSquareAffineTransformEstimator() override;
/** The PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LeastSquareAffineTransformEstimator (const Self &); // purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
index 807239a0fa219a65983a2fb4c3fbbdda053ee798..27c7f714171cfdf0f9f4b6b39af42c63779e3143 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
@@ -59,7 +59,7 @@ public:
protected:
MollweidMapProjection();
- ~MollweidMapProjection() ITK_OVERRIDE;
+ ~MollweidMapProjection() override;
private:
MollweidMapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
index 72b4aeb38c82216e794c52d72a581a2909ade42a..17c6ef257be2c664ebaaa4287ce48dfa8ccdb112 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
@@ -93,11 +93,11 @@ public:
protected:
OrthoRectificationFilter();
- ~OrthoRectificationFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~OrthoRectificationFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
+ void GenerateOutputInformation(void) override;
private:
OrthoRectificationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
index 877bc433ca96e251520461b7270d49858d313ca8..0fb3a72973b94aacf6bd72d0209a886f009983a4 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
@@ -110,19 +110,19 @@ public:
}
/** Reimplement the method Modified() */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
protected:
/** Constructor */
PhysicalToRPCSensorModelImageFilter();
/** Destructor */
- ~PhysicalToRPCSensorModelImageFilter() ITK_OVERRIDE;
+ ~PhysicalToRPCSensorModelImageFilter() override;
/** The PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate the Output image information*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
PhysicalToRPCSensorModelImageFilter(const Self &); // purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
index 29fea2c18dd3487f560438cf7a4bdffc1c976427..22b92e4a05dce7d732d72bc5c43de1542fc9a269 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
@@ -154,11 +154,11 @@ public:
protected:
ProjectiveProjectionImageFilter();
- ~ProjectiveProjectionImageFilter() ITK_OVERRIDE {}
+ ~ProjectiveProjectionImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
index ed7f9469f23d7bad30d4cbd8b8610bd491c3a2f4..1c74b75a40d1dc9bb6a331d2046827018a549c4e 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.h
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.h
@@ -82,16 +82,16 @@ public:
protected:
ROIdataConversion();
- ~ROIdataConversion() ITK_OVERRIDE {}
- void GenerateOutputInformation() ITK_OVERRIDE;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ ~ROIdataConversion() override {}
+ void GenerateOutputInformation() override;
+ void GenerateInputRequestedRegion() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
/** Performs its job! */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Count the number for sample in the training area */
SizeValueType GetNumberOfSample();
diff --git a/Modules/Filtering/Projection/include/otbRationalTransform.h b/Modules/Filtering/Projection/include/otbRationalTransform.h
index 9ce1720ac69778c7252fce688c6322b218f8dc89..5cc26f3bb61402cdba9d8cc6ca0cf18cb0bf81aa 100644
--- a/Modules/Filtering/Projection/include/otbRationalTransform.h
+++ b/Modules/Filtering/Projection/include/otbRationalTransform.h
@@ -101,7 +101,7 @@ public:
itkGetConstMacro(DenominatorDegree, unsigned int);
/** The transform point method */
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE
+ OutputPointType TransformPoint(const InputPointType& point) const override
{
// Check for consistency
if(this->GetNumberOfParameters() != this->m_Parameters.size())
@@ -148,13 +148,13 @@ public:
}
/** Get the number of parameters */
- NumberOfParametersType GetNumberOfParameters() const ITK_OVERRIDE
+ NumberOfParametersType GetNumberOfParameters() const override
{
return (static_cast <NumberOfParametersType> ( (m_NumeratorDegree +1 + m_DenominatorDegree+1)*SpaceDimension ));
}
// Set parameter method
- void SetParameters(const typename Superclass::ParametersType & params) ITK_OVERRIDE
+ void SetParameters(const typename Superclass::ParametersType & params) override
{
// Check for the appropriate size
if(params.Size() != this->GetNumberOfParameters())
@@ -187,9 +187,9 @@ protected:
}
- ~RationalTransform() ITK_OVERRIDE {}
+ ~RationalTransform() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << indent << "Numerator Degree : " << m_NumeratorDegree << std::endl;
diff --git a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
index a2a82cf17455b2db9ed0aa437f6bf529862fcb86..415f9f9e4f1259eb64e9b06d163dfb47019260f1 100644
--- a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
@@ -62,7 +62,7 @@ protected:
this->SetParameter("FalseEasting", "28001.642");
this->SetParameter("ScaleFactor", "1.00");
}
- ~SVY21MapProjection() ITK_OVERRIDE {}
+ ~SVY21MapProjection() override {}
private:
SVY21MapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
index 2a2d7ca276f490a8e19c16f3ab48c4a846b310fd..e8b7a190d3219464cbbf12e98722a3bae46c0d43 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
@@ -62,7 +62,7 @@ public:
protected:
SinusoidalMapProjection();
- ~SinusoidalMapProjection() ITK_OVERRIDE;
+ ~SinusoidalMapProjection() override;
private:
SinusoidalMapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
index f02bbb7438eb2f95df594b856d96e4ef22dacac1..c6d2125ba13d755a6330062087c2fba196a8f2b7 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.h
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.h
@@ -73,7 +73,7 @@ public:
void SetLevel(unsigned int level);
unsigned int GetLevel() const;
- OutputPointType TransformPoint(const InputPointType& point) const ITK_OVERRIDE;
+ OutputPointType TransformPoint(const InputPointType& point) const override;
virtual void PrintMap() const;
@@ -85,7 +85,7 @@ public:
protected:
TileMapTransform();
- ~TileMapTransform() ITK_OVERRIDE;
+ ~TileMapTransform() override;
private:
TileMapTransform(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
index b89d16333ea76b32b0bdcbc363c0afb56e890367..35a384373a36e7f4ee50147d59abedffa45b2cbd 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
@@ -64,7 +64,7 @@ public:
protected:
TransMercatorMapProjection();
- ~TransMercatorMapProjection() ITK_OVERRIDE;
+ ~TransMercatorMapProjection() override;
private:
TransMercatorMapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
index 5310eeb42aca93f1b5dba00c87bbd319c24d4762..60992d15b3d19bda06802627ca7a3dbbea121b18 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
@@ -63,7 +63,7 @@ public:
protected:
UtmMapProjection();
- ~UtmMapProjection() ITK_OVERRIDE {};
+ ~UtmMapProjection() override {};
private:
UtmMapProjection(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index b86c9c78acaf19896ba659b549bde48962987a9d..34743bb569815223e38bdd996477a8cba0b80c3c 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -105,9 +105,9 @@ public:
protected:
VectorDataIntoImageProjectionFilter();
- ~VectorDataIntoImageProjectionFilter() ITK_OVERRIDE {}
+ ~VectorDataIntoImageProjectionFilter() override {}
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
// Projection filter
typedef VectorDataProjectionFilter<InputVectorDataType, InputVectorDataType>
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
index 3178d4c71af131efc3ac3e171984fad42abb1a39..d455ec83d7e7710c8639fdbceac7c1382c2f32f3 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
@@ -175,17 +175,17 @@ public:
protected:
VectorDataProjectionFilter();
- ~VectorDataProjectionFilter() ITK_OVERRIDE {}
+ ~VectorDataProjectionFilter() override {}
- OutputPointType ProcessPoint(InputPointType point) const ITK_OVERRIDE;
- OutputLinePointerType ProcessLine(InputLinePointerType line) const ITK_OVERRIDE;
- OutputPolygonPointerType ProcessPolygon(InputPolygonPointerType polygon) const ITK_OVERRIDE;
- OutputPolygonListPointerType ProcessPolygonList(InputPolygonListPointerType polygonList) const ITK_OVERRIDE;
+ OutputPointType ProcessPoint(InputPointType point) const override;
+ OutputLinePointerType ProcessLine(InputLinePointerType line) const override;
+ OutputPolygonPointerType ProcessPolygon(InputPolygonPointerType polygon) const override;
+ OutputPolygonListPointerType ProcessPolygonList(InputPolygonListPointerType polygonList) const override;
virtual void InstantiateTransform(void);
- void GenerateOutputInformation(void) ITK_OVERRIDE;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
+ void GenerateData(void) override;
private:
VectorDataProjectionFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
index df815dd7d7dff0cb64d6d8f9bc6fe0b169dfc033..0ba5ce9031106d863aa433e2af8bd682d9694b78 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
@@ -102,14 +102,14 @@ public:
protected:
VectorDataTransformFilter();
- ~VectorDataTransformFilter() ITK_OVERRIDE {};
+ ~VectorDataTransformFilter() override {};
- PointType ProcessPoint(PointType point) const ITK_OVERRIDE;
- LinePointerType ProcessLine(LinePointerType line) const ITK_OVERRIDE;
- PolygonPointerType ProcessPolygon(PolygonPointerType polygon) const ITK_OVERRIDE;
- PolygonListPointerType ProcessPolygonList(PolygonListPointerType polygonList) const ITK_OVERRIDE;
+ PointType ProcessPoint(PointType point) const override;
+ LinePointerType ProcessLine(LinePointerType line) const override;
+ PolygonPointerType ProcessPolygon(PolygonPointerType polygon) const override;
+ PolygonListPointerType ProcessPolygonList(PolygonListPointerType polygonList) const override;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
VectorDataTransformFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
index b91668884bbe6adc17f02a79501924e430019edd..845f7dc00db625ff19e527558ae179b5d1d7aff3 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
@@ -576,11 +576,11 @@ protected:
* Define output pixel size
*
**/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** MeanShiftFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData()
@@ -592,21 +592,21 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** Allocates the outputs (need to be reimplemented since outputs have different type) */
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
/** Constructor */
MeanShiftSmoothingImageFilter();
/** Destructor */
- ~MeanShiftSmoothingImageFilter() ITK_OVERRIDE;
+ ~MeanShiftSmoothingImageFilter() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
virtual void CalculateMeanShiftVector(const typename RealVectorImageType::Pointer inputImagePtr,
const RealVector& jointPixel, const OutputRegionType& outputRegion,
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
index 7208ac16f537622b1fe9364ddc37b0500ed01fa4..4fa8981e15fa036004aa4256b7aa65199df9b0de 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
@@ -67,11 +67,11 @@ public:
protected:
/** This method causes the filter to generate its output. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
ConcatenateSampleListFilter();
- ~ConcatenateSampleListFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ConcatenateSampleListFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ConcatenateSampleListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
index d10a702d4e9f142ce275c6cbde658b0ce4373b35..d22fcaba4570bec5ac7a8cf23746a163812aa00f 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
@@ -137,8 +137,8 @@ public:
protected:
ContinuousMinimumMaximumImageCalculator();
- ~ContinuousMinimumMaximumImageCalculator() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ContinuousMinimumMaximumImageCalculator() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
PixelType m_Minimum;
PixelType m_Maximum;
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
index dd104feb2c3c699eee853b4b87edf4eb5e152dfd..9bc1a1e55567e01ce14352d136cd324d7e0ffae5 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
@@ -88,7 +88,7 @@ public:
protected:
/** This method causes the filter to generate its output. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Generate a white gaussian noise with mean m_Mean and variance
* m_Variance
@@ -96,8 +96,8 @@ protected:
void GenerateRandomSequence();
GaussianAdditiveNoiseSampleListFilter();
- ~GaussianAdditiveNoiseSampleListFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~GaussianAdditiveNoiseSampleListFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GaussianAdditiveNoiseSampleListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
index c1cd905fcd79b9bb0d36aed1a688d8d0928a90ba..c2c04c9ea556bb1b1ffacde2ef7cd753a1f17f82 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
@@ -83,7 +83,7 @@ public:
}
/** Calculates the thresholds and save them */
- void Compute() ITK_OVERRIDE
+ void Compute() override
{
this->GenerateData();
}
@@ -91,8 +91,8 @@ public:
protected:
HistogramStatisticsFunction();
- ~HistogramStatisticsFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~HistogramStatisticsFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Calculates the thresholds and save them */
void GenerateData();
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index 58ece65e87aa722362084998f36a68ba7b76eb7f..2a074d874822919bbb08406051c822242a1307fe 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -98,7 +98,7 @@ public:
// Build the outputs
typedef itk::DataObject::Pointer DataObjectPointer;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
//virtual void Update();
@@ -152,13 +152,13 @@ public:
protected:
ListSampleGenerator();
- ~ListSampleGenerator() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ListSampleGenerator() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Triggers the Computation of the sample list */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Compute the calss statistics*/
void GenerateClassStatistics();
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
index 68efdd1c38de6fd2e2558a72d7355163f052f525..88bf53f9c2687df430c4dcc8ac5f46f75d216de6 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.h
@@ -73,12 +73,12 @@ public:
protected:
/** Standard itk::ProcessObject subclass method. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
ListSampleSource();
- ~ListSampleSource() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ListSampleSource() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ListSampleSource(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
index f01199660166fdc405d5160b6cfdc6242fbb918a..d904e39073bd54e20f2fa4035f38a1d4e4141baf 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
@@ -120,7 +120,7 @@ public:
protected:
/** This method causes the filter to generate its output. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** In order to respect the fair data principle, the number of samples for
* each label must be the same. This method computes the label that
@@ -129,12 +129,12 @@ protected:
void ComputeMaxSampleFrequency();
/** Make Output */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
ListSampleToBalancedListSampleFilter();
- ~ListSampleToBalancedListSampleFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ListSampleToBalancedListSampleFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ListSampleToBalancedListSampleFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index 3e462206421a0b4706f8cdf1b7e52c12b7cf7e9a..f524aee70502587ddd237782e1a6d2ed706e78a4 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -147,14 +147,14 @@ public:
protected:
ListSampleToHistogramListGenerator();
- ~ListSampleToHistogramListGenerator() ITK_OVERRIDE {}
+ ~ListSampleToHistogramListGenerator() override {}
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
//ListSampleConstPointerType m_List;
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index 9e5f34cbc0735210e27f3138b1bcd1ca1aabde24..152788ef816fbab51a3c3cc013a90a49eed0e7b8 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -88,8 +88,8 @@ public:
protected:
ListSampleToListSampleFilter();
- ~ListSampleToListSampleFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ListSampleToListSampleFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ListSampleToListSampleFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index 58e434094273578a813c610d1814ab55c96cfbca..01bdb8506067f25ee6eae8f4f5762e7a680471e3 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -111,10 +111,10 @@ public:
protected:
ListSampleToVariableDimensionHistogramGenerator();
- ~ListSampleToVariableDimensionHistogramGenerator() ITK_OVERRIDE {}
- void GenerateData() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ ~ListSampleToVariableDimensionHistogramGenerator() override {}
+ void GenerateData() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
private:
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
index b92dfab9815309702a5b6163fff3183d5ad87036..38eec749bc5bd3c5b3832bb1730780a8f71fbcf1 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
@@ -89,17 +89,17 @@ public:
InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -128,8 +128,8 @@ public:
protected:
LocalHistogramImageFunction();
- ~LocalHistogramImageFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LocalHistogramImageFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LocalHistogramImageFunction(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
index 56edd913844e0519af9c64174b82e0b3719e6c6b..f75d244c6114b71f55518a1e68e3e4d76db3ddce 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
@@ -196,9 +196,9 @@ public:
protected:
NormalizeVectorImageFilter ();
- ~NormalizeVectorImageFilter() ITK_OVERRIDE { }
+ ~NormalizeVectorImageFilter() override { }
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
diff --git a/Modules/Filtering/Statistics/include/otbPatternSampler.h b/Modules/Filtering/Statistics/include/otbPatternSampler.h
index cc9dd9465dfe5be082025a960d0707f64f56c31a..90432a595bf11b2912f0a2dbb99afbb473c15e10 100644
--- a/Modules/Filtering/Statistics/include/otbPatternSampler.h
+++ b/Modules/Filtering/Statistics/include/otbPatternSampler.h
@@ -89,7 +89,7 @@ public:
/**
* Method that resets the internal state of the sampler
*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/**
* Method to call during iteration, returns true if the sample is selected,
@@ -118,7 +118,7 @@ protected:
PatternSampler();
/** Destructor */
- ~PatternSampler() ITK_OVERRIDE {}
+ ~PatternSampler() override {}
private:
// Not implemented
diff --git a/Modules/Filtering/Statistics/include/otbPeriodicSampler.h b/Modules/Filtering/Statistics/include/otbPeriodicSampler.h
index dde341a6cd01a5941d1461f3544298ac167434aa..c5b8185f77c0d628e19ea927106f96e9a4f3d881 100644
--- a/Modules/Filtering/Statistics/include/otbPeriodicSampler.h
+++ b/Modules/Filtering/Statistics/include/otbPeriodicSampler.h
@@ -86,7 +86,7 @@ public:
/**
* Method that resets the internal state of the sampler
*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/**
* Method to call during iteration, returns true if the sample is selected,
@@ -99,7 +99,7 @@ protected:
PeriodicSampler();
/** Destructor */
- ~PeriodicSampler() ITK_OVERRIDE {}
+ ~PeriodicSampler() override {}
private:
// Not implemented
diff --git a/Modules/Filtering/Statistics/include/otbRandomSampler.h b/Modules/Filtering/Statistics/include/otbRandomSampler.h
index 0ea7eb23d736b8f14661e6f5ded6f220f92bc194..035b9d54ecc7906e7583090dd3ce4c6f2150ee33 100644
--- a/Modules/Filtering/Statistics/include/otbRandomSampler.h
+++ b/Modules/Filtering/Statistics/include/otbRandomSampler.h
@@ -80,7 +80,7 @@ public:
/**
* Reset internal counter (to be called before starting iteration)
*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/**
* Method to call during iteration, returns true if the sample is selected,
@@ -93,7 +93,7 @@ protected:
RandomSampler();
/** Destructor */
- ~RandomSampler() ITK_OVERRIDE {}
+ ~RandomSampler() override {}
private:
// Not implemented
diff --git a/Modules/Filtering/Statistics/include/otbSamplerBase.h b/Modules/Filtering/Statistics/include/otbSamplerBase.h
index b32f2e46e2c116235e2b86554c2b81e28d64a9d7..be5602873ac1354eb62b1bb1dcdc2e55af5318be 100644
--- a/Modules/Filtering/Statistics/include/otbSamplerBase.h
+++ b/Modules/Filtering/Statistics/include/otbSamplerBase.h
@@ -78,7 +78,7 @@ protected:
SamplerBase();
/** Destructor */
- ~SamplerBase() ITK_OVERRIDE {}
+ ~SamplerBase() override {}
/** Current count of selected elements */
unsigned long m_ChosenElements;
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
index b25d2782cc76459ee2068377ff46f631432f284c..00ed571aa8216ddcc03e3c194f11f4a71845cd33 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
@@ -87,11 +87,11 @@ public:
protected:
/** This method causes the filter to generate its output. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
ShiftScaleSampleListFilter();
- ~ShiftScaleSampleListFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ShiftScaleSampleListFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ShiftScaleSampleListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
index c911b3b699a4a43652fa9eb8ecce4f52910f4984..aefd0fc2e10c774aa80a97526764ef0eccbb3161 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
@@ -138,31 +138,31 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
protected:
PersistentCompareImageFilter();
- ~PersistentCompareImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentCompareImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
void ThreadedGenerateData(const RegionType&
outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/** Allows skipping the verification of physical space between
* the two input images (see flag m_PhysicalSpaceCheck)
*/
- void VerifyInputInformation() ITK_OVERRIDE;
+ void VerifyInputInformation() override;
private:
PersistentCompareImageFilter(const Self &); //purposely not implemented
@@ -319,7 +319,7 @@ protected:
/** Constructor */
StreamingCompareImageFilter() {};
/** Destructor */
- ~StreamingCompareImageFilter() ITK_OVERRIDE {}
+ ~StreamingCompareImageFilter() override {}
private:
StreamingCompareImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index 0972e3790b7062f4fc879f6664fa0c0bb83471dc..e3700768792b696bd5869f7b4b1022c897589752 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -169,23 +169,23 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
protected:
PersistentHistogramVectorImageFilter();
- ~PersistentHistogramVectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentHistogramVectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentHistogramVectorImageFilter(const Self &); //purposely not implemented
@@ -271,7 +271,7 @@ protected:
/** Constructor */
StreamingHistogramVectorImageFilter() {};
/** Destructor */
- ~StreamingHistogramVectorImageFilter() ITK_OVERRIDE {}
+ ~StreamingHistogramVectorImageFilter() override {}
private:
StreamingHistogramVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index 567ba1029544052419a7ebf09f79a414ed7f75a2..a10a93cfc8de1c07949a04e19ee6d18ba2465a0f 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -124,26 +124,26 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
protected:
PersistentMinMaxImageFilter();
- ~PersistentMinMaxImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentMinMaxImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
void ThreadedGenerateData(const RegionType&
outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
PersistentMinMaxImageFilter(const Self &); //purposely not implemented
@@ -280,7 +280,7 @@ protected:
/** Constructor */
StreamingMinMaxImageFilter() {}
/** Destructor */
- ~StreamingMinMaxImageFilter() ITK_OVERRIDE {}
+ ~StreamingMinMaxImageFilter() override {}
private:
StreamingMinMaxImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index 90de7efb4ea56b0c3b66655b4ba774734d3ec452..9b8c7b3a9dc2e07311a52e3e8772210b2decfb52 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -144,23 +144,23 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
protected:
PersistentMinMaxVectorImageFilter();
- ~PersistentMinMaxVectorImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentMinMaxVectorImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentMinMaxVectorImageFilter(const Self &); //purposely not implemented
@@ -271,7 +271,7 @@ protected:
/** Constructor */
StreamingMinMaxVectorImageFilter() {};
/** Destructor */
- ~StreamingMinMaxVectorImageFilter() ITK_OVERRIDE {}
+ ~StreamingMinMaxVectorImageFilter() override {}
private:
StreamingMinMaxVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index 04ad8dfc8fec0562843c1b9c030af0cac6993203..2cc0a9e543eb3e0a36f548aba7b9dd114b836ddd 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -142,16 +142,16 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
itkSetMacro(IgnoreInfiniteValues, bool);
itkGetMacro(IgnoreInfiniteValues, bool);
@@ -164,13 +164,13 @@ public:
protected:
PersistentStatisticsImageFilter();
- ~PersistentStatisticsImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentStatisticsImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
void ThreadedGenerateData(const RegionType&
outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
PersistentStatisticsImageFilter(const Self &); //purposely not implemented
@@ -358,7 +358,7 @@ protected:
/** Constructor */
StreamingStatisticsImageFilter() {};
/** Destructor */
- ~StreamingStatisticsImageFilter() ITK_OVERRIDE {}
+ ~StreamingStatisticsImageFilter() override {}
private:
StreamingStatisticsImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index 1223832496231928c16e49a020a8cd563ba12931..d91745263866382c7a9879695e3b4bbb3f97beb1 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -110,31 +110,31 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/** Due to heterogeneous input template GenerateInputRequestedRegion must be reimplemented using explicit cast **/
/** This new implementation is inspired by the one of itk::ImageToImageFilter **/
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
protected:
PersistentStreamingStatisticsMapFromLabelImageFilter();
- ~PersistentStreamingStatisticsMapFromLabelImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PersistentStreamingStatisticsMapFromLabelImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** GenerateData. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
PersistentStreamingStatisticsMapFromLabelImageFilter(const Self &); //purposely not implemented
@@ -258,7 +258,7 @@ protected:
/** Constructor */
StreamingStatisticsMapFromLabelImageFilter() {}
/** Destructor */
- ~StreamingStatisticsMapFromLabelImageFilter() ITK_OVERRIDE {}
+ ~StreamingStatisticsMapFromLabelImageFilter() override {}
private:
StreamingStatisticsMapFromLabelImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index bedfb4c832e11f80e2011bc101243e36a97a65ab..83fcb6014ae0d5f36ef0e3e0766e5b3cf6517073 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -185,12 +185,12 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
itkSetMacro(EnableMinMax, bool);
itkGetMacro(EnableMinMax, bool);
@@ -216,19 +216,19 @@ public:
protected:
PersistentStreamingStatisticsVectorImageFilter();
- ~PersistentStreamingStatisticsVectorImageFilter() ITK_OVERRIDE {}
+ ~PersistentStreamingStatisticsVectorImageFilter() override {}
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentStreamingStatisticsVectorImageFilter(const Self &); //purposely not implemented
@@ -493,7 +493,7 @@ protected:
StreamingStatisticsVectorImageFilter() {}
/** Destructor */
- ~StreamingStatisticsVectorImageFilter() ITK_OVERRIDE {}
+ ~StreamingStatisticsVectorImageFilter() override {}
private:
StreamingStatisticsVectorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
index e89a8539676f6d66adb6442060719d9dc62becce..1b0839c7b79673ee1002ca866272c4a3f16fe625 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
@@ -93,7 +93,7 @@ public:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw(itk::InvalidRequestedRegionError) override;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -104,8 +104,8 @@ public:
protected:
VarianceImageFilter();
- ~VarianceImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~VarianceImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** VarianceImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData()
@@ -118,7 +118,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
VarianceImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
index 82d481aa36713ab46d43acdb801e49236017c0a8..17d9155e3f57e7094f13111d98e583afdfcbafed 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -79,9 +79,9 @@ protected:
/** Constructor */
VectorImageToIntensityImageFilter();
/** Destructor */
- ~VectorImageToIntensityImageFilter() ITK_OVERRIDE {}
+ ~VectorImageToIntensityImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** VectorImageToIntensityImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
* which is called for each processing thread. The output image data is
@@ -93,7 +93,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
private:
VectorImageToIntensityImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index e14ab4bd5131760a31c7ae8097c810c36afc86c4..3bd7150ec537041c5b8c8508bc83eae2d94a58d4 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -101,22 +101,22 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Pass the input through unmodified. Do this by Grafting in the
* AllocateOutputs method.
*/
- void AllocateOutputs() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void GenerateOutputInformation() override;
+ void Synthetize(void) override;
+ void Reset(void) override;
protected:
PersistentVectorImageToMatrixFilter();
- ~PersistentVectorImageToMatrixFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ ~PersistentVectorImageToMatrixFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PersistentVectorImageToMatrixFilter(const Self &); //purposely not implemented
@@ -197,7 +197,7 @@ protected:
/** Constructor */
VectorImageToMatrixImageFilter() {};
/** Destructor */
- ~VectorImageToMatrixImageFilter() ITK_OVERRIDE {}
+ ~VectorImageToMatrixImageFilter() override {}
private:
VectorImageToMatrixImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index 2d384b57349fc42a4674d1fc19e81d7ee821a071..bd18a932c85e15e6864b2d74bc487ec61c6dbf0f 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -82,11 +82,11 @@ public:
protected:
ConcatenateVectorDataFilter();
- ~ConcatenateVectorDataFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ConcatenateVectorDataFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Triggers the Computation of the sample list */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Recursive method to visit efficiently the vectordata*/
void ProcessNode(TreeNodeType * source, DataNodeType * outputDocument);
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
index a3f103ebf725e6d711eb3d2870cb1c7b69529298..6b5359005756e0be97fc702efa4c39a654c3e43d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
@@ -76,7 +76,7 @@ public:
typedef std::vector<PrecisionType> OutputType;
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE;
+ OutputType Evaluate( const DataNodeType& node ) const override;
/** Set/Get methods */
itkGetConstMacro(DistanceThreshold, PrecisionType);
@@ -87,8 +87,8 @@ public:
protected:
DBOverlapDataNodeFeatureFunction();
- ~DBOverlapDataNodeFeatureFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DBOverlapDataNodeFeatureFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DBOverlapDataNodeFeatureFunction(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index a602566f10ac4d9d7e8fe7d128cf8d26ca22be36..3f7fdb9977c6bca3832aea71179dbd4bf22db565 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -108,7 +108,7 @@ public:
typedef std::vector<PrecisionType> OutputType;
/* Compute the descriptor value along this DataNode */
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE;
+ OutputType Evaluate( const DataNodeType& node ) const override;
/* Get the radius used to define the area around a line segment.
* A radius of 0 means that the area is reduced to a line joining
@@ -138,8 +138,8 @@ public:
protected:
RadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction();
- ~RadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~RadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
index 4d4c8792bdca6a48480ea8477ba70d3902d6d29b..919c6ff50cd760871db14250e985af60c1fda545 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
@@ -101,7 +101,7 @@ public:
typedef std::pair<IndexType, IndexType> IndexPairType;
typedef std::vector<PrecisionType> OutputType;
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE;
+ OutputType Evaluate( const DataNodeType& node ) const override;
/** Set/Get methods */
itkGetConstMacro(RefPixel, PixelType);
@@ -112,8 +112,8 @@ public:
protected:
SpectralAngleDataNodeFeatureFunction();
- ~SpectralAngleDataNodeFeatureFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SpectralAngleDataNodeFeatureFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SpectralAngleDataNodeFeatureFunction(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
index 7eb8a105653f235c9320512a7e4f6dfa850f4267..b3b43bfeee807b1cc4ae7daea070a8d81c68ed29 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
@@ -78,12 +78,12 @@ public:
protected:
VectorDataAdapter() {};
- ~VectorDataAdapter() ITK_OVERRIDE {}
+ ~VectorDataAdapter() override {}
- OutputPointType ProcessPoint(InputPointType point) const ITK_OVERRIDE;
- OutputLinePointerType ProcessLine(InputLinePointerType line) const ITK_OVERRIDE;
- OutputPolygonPointerType ProcessPolygon(InputPolygonPointerType polygon) const ITK_OVERRIDE;
- OutputPolygonListPointerType ProcessPolygonList(InputPolygonListPointerType polygonList) const ITK_OVERRIDE;
+ OutputPointType ProcessPoint(InputPointType point) const override;
+ OutputLinePointerType ProcessLine(InputLinePointerType line) const override;
+ OutputPolygonPointerType ProcessPolygon(InputPolygonPointerType polygon) const override;
+ OutputPolygonListPointerType ProcessPolygonList(InputPolygonListPointerType polygonList) const override;
private:
VectorDataAdapter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 002536578edd0a3d4642bb8d710b8a4061f2875b..87ed0a2f9c08f7a3ef381bec5f12bbf488a852ff 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -106,8 +106,8 @@ public:
protected:
VectorDataExtractROI();
- ~VectorDataExtractROI() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~VectorDataExtractROI() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Method to compare the projection embedded in the cartoRegion And the the InputVectorData*/
virtual void CompareInputAndRegionProjection();
@@ -122,7 +122,7 @@ protected:
virtual VertexType PointToContinuousIndex(ProjPointType point);
/** Prototype of the generate data method*/
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Method to check if the polygon Bounding Box ha ve a non-null intersection with the ROI*/
virtual bool IsPolygonIntersectionNotNull(PolygonPointerType polygon);
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index ab38d43e826a00a1624b67d7fea684551b43b33d..2db1bee395b77f26129d07e294806edbfc0cc4cd 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -97,11 +97,11 @@ public:
protected:
VectorDataToRandomLineGenerator();
- ~VectorDataToRandomLineGenerator() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~VectorDataToRandomLineGenerator() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Triggers the Computation of the sample list */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
PointVectorType RandomPointsGenerator(DataNodeType * node);
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
index 4285db786953aafee483a45581f7d283bb01b142..2dca72eaf41e1a99eac0255adbbd0628a0f0197e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
@@ -76,9 +76,9 @@ protected:
/** Constructor */
VectorDataToSpecificDescriptionFilterBase();
/** Destructor */
- ~VectorDataToSpecificDescriptionFilterBase() ITK_OVERRIDE {}
+ ~VectorDataToSpecificDescriptionFilterBase() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorDataToSpecificDescriptionFilterBase(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 05859c811e914f7f56e8fd4d6cfaed57b3794a75..a3ba98b7196940e32b065d876ac983c4858bdee6 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -94,7 +94,7 @@ protected:
/** Constructor */
VectorDataToVectorDataFilter();
/** Destructor */
- ~VectorDataToVectorDataFilter() ITK_OVERRIDE {}
+ ~VectorDataToVectorDataFilter() override {}
virtual OutputPointType ProcessPoint(InputPointType itkNotUsed(point)) const
{
@@ -113,14 +113,14 @@ protected:
itkExceptionMacro( << "Subclass should reimplement this method");
}
- void GenerateOutputInformation(void) ITK_OVERRIDE;
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
+ void GenerateData(void) override;
/** Go through the vector data tree and process the nodes */
virtual void ProcessNode(InputInternalTreeNodeType * source, OutputInternalTreeNodeType * destination) const;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorDataToVectorDataFilter(const Self &); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index 56371e3bea3514c01a3e14a67ee1994f338503f4..b39a267f718901ef884d508e5f957b0b1c620743 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -105,7 +105,7 @@ protected:
{
m_SubsampleFactor.Fill(1);
}
- ~SubsampleImageFilter() ITK_OVERRIDE {}
+ ~SubsampleImageFilter() override {}
/** Internal test function to check if there is any direction to subsample */
bool IsSubsampleFactorOne() const;
@@ -114,23 +114,23 @@ protected:
* Region estimation functions has to be reimplemented
*/
void CallCopyOutputRegionToInputRegion
- (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) override;
void CallCopyInputRegionToOutputRegion
- (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) override;
/** Output image region size is not of the same dimension as the input.
* That is why GenerateOutputInformation has to be redefined.
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Set output image to 0 before processing */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Allows multithreading */
void ThreadedGenerateData
- (const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ (const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SubsampleImageFilter (const Self &); // purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
index 04d897c7eff46c650ba2f1a9afd88f6588890917..cb0d78d25a7b7551d702b1adc9f2e861377203df 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -214,13 +214,13 @@ public:
protected:
WaveletFilterBank();
- ~WaveletFilterBank() ITK_OVERRIDE {}
+ ~WaveletFilterBank() override {}
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy information from the input image if existing.
**/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** The forward transformation needs a larger input requested
* region than the output requested region (larger by subsampling
@@ -232,12 +232,12 @@ protected:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw (itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw (itk::InvalidRequestedRegionError) override;
/** BeforeThreadedGenerateData.
* It allocates also internal images
*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
@@ -248,7 +248,7 @@ protected:
/** AfterThreadedGenerateData.
* It enforce memory destruction of internal images
*/
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** CallCopyOutputRegionToInputRegion
* Since input and output image may be of different size when a
@@ -256,9 +256,9 @@ protected:
* functions has to be reimplemented
*/
void CallCopyOutputRegionToInputRegion
- (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) override;
void CallCopyInputRegionToOutputRegion
- (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) override;
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
@@ -272,7 +272,7 @@ protected:
const InputImageRegionType& srcRegion);
/** Generate data redefinition */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Iterative call to the forward filter bank at each dimension. */
virtual void ThreadedGenerateDataAtDimensionN(unsigned int idx, unsigned int direction,
@@ -399,9 +399,9 @@ public:
protected:
WaveletFilterBank();
- ~WaveletFilterBank() ITK_OVERRIDE {}
+ ~WaveletFilterBank() override {}
- void VerifyInputInformation() ITK_OVERRIDE
+ void VerifyInputInformation() override
{
}
@@ -410,7 +410,7 @@ protected:
* Set the size of the output image depending on the decimation factor
* Copy information from the input image if existing.
**/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** The inverse transformation needs larger inputs requested
* region than the output requested region (larger by subsampling
@@ -422,12 +422,12 @@ protected:
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
void GenerateInputRequestedRegion()
- throw (itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ throw (itk::InvalidRequestedRegionError) override;
/** BeforeThreadedGenerateData
* If SubsampleImageFactor neq 1, it is necessary to up sample input images in the Wavelet::INVERSE mode
*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
@@ -438,7 +438,7 @@ protected:
/** AfterThreadedGenerateData.
* It enforce memory destruction of internal images
*/
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** CallCopyOutputRegionToInputRegion
* Since input and output image may be of different size when a
@@ -446,9 +446,9 @@ protected:
* functions has to be reimplemented
*/
void CallCopyOutputRegionToInputRegion
- (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) override;
void CallCopyInputRegionToOutputRegion
- (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) ITK_OVERRIDE;
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) override;
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
@@ -462,7 +462,7 @@ protected:
const InputImageRegionType& srcRegion);
/** Generate data redefinition */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/**
* Iterative call to the forward filter bank at each dimension.
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
index e52d6e7d66dc6cb2e57dd81f0e43f4d2fd49a558..ba5a8a0b83d1c3a00b4b0ce905d2f68a8d649ed3 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
@@ -100,7 +100,7 @@ public:
protected:
WaveletGenerator() {}
- ~WaveletGenerator() ITK_OVERRIDE {}
+ ~WaveletGenerator() override {}
private:
WaveletGenerator(const Self &); // not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
index 632bf1d79b01d4cb3d33f1d165822723ddf73f88..1310f178bf66f56fdb7c3fe03997fe6443bc9b15 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
@@ -60,7 +60,7 @@ public:
protected:
- void PrintSelf(std::ostream& os, itk::Indent i) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent i) const override
{
os << i << "WaveletHighPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
@@ -76,7 +76,7 @@ protected:
/**
* Set operator coefficients.
*/
- CoefficientVector GenerateCoefficients() ITK_OVERRIDE
+ CoefficientVector GenerateCoefficients() override
{
CoefficientVector coeff;
if (DirectionOfTransformation == Wavelet::FORWARD)
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
index d1022824dd0e256cc1563d390a1cd4aa225266e4..68d914c7af6307ec49c4a9168fdca51cf4cddfc6 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() override;
- virtual void GenerateData();
+ virtual void GenerateData() override;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const 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..e064511df57c3591dd761a7ef17f5d7da1c72e5e 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 override;
protected:
WaveletInverseImageFilter();
virtual ~WaveletInverseImageFilter();
- virtual void GenerateInputRequestedRegion();
+ virtual void GenerateInputRequestedRegion() override;
- virtual void GenerateData();
+ virtual void GenerateData() override;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
WaveletInverseImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
index 11691589492da66a76a2a001d312b371b172779b..7eaeaed296f9dae520dff44d0c98f9ce2bd948c9 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
@@ -59,7 +59,7 @@ public:
protected:
- void PrintSelf(std::ostream& os, itk::Indent i) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent i) const override
{
os << i << "WaveletLowPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
@@ -75,7 +75,7 @@ protected:
/**
* Set operator coefficients.
*/
- CoefficientVector GenerateCoefficients() ITK_OVERRIDE
+ CoefficientVector GenerateCoefficients() override
{
CoefficientVector coeff;
if (DirectionOfTransformation == Wavelet::FORWARD)
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
index f3f4c6c464d0e1ff26c041708d761885968faff2..c8e1d21edee65068d71180e96bd806c68209e2c7 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
@@ -100,7 +100,7 @@ public:
m_WaveletGenerator = WaveletGeneratorType::New();
}
- ~WaveletOperatorBase() ITK_OVERRIDE {}
+ ~WaveletOperatorBase() override {}
/** Assignment operator */
Self & operator =(const Self& other)
@@ -138,7 +138,7 @@ protected:
/**
* Prints some debugging information
*/
- void PrintSelf(std::ostream& os, itk::Indent i) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent i) const override;
typedef WaveletGenerator<TMotherWaveletOperator> WaveletGeneratorType;
typedef typename WaveletGeneratorType::Pointer WaveletGeneratorPointerType;
@@ -187,7 +187,7 @@ protected:
void ReduceFilterLength(CoefficientVector& coeff);
/** Arranges coefficients spatially in the memory buffer. */
- void Fill(const CoefficientVector& coeff) ITK_OVERRIDE
+ void Fill(const CoefficientVector& coeff) override
{
this->FillCenteredDirectional(coeff);
}
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
index e11648fe244fa2ae98cd01cd55a3ff976f6321de..36a49994866503b12b16944d85e25e489f64441f 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
@@ -69,7 +69,7 @@ public:
protected:
FullyDecomposedWaveletPacketCost () {}
- ~FullyDecomposedWaveletPacketCost() ITK_OVERRIDE {}
+ ~FullyDecomposedWaveletPacketCost() override {}
private:
FullyDecomposedWaveletPacketCost (const Self &); // not implemented
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
index c0ea33c8c1e5db63f61e167cf7926ac363d9cb62..4efc0a1286e1c4543b40a1e1c2aff54256b06b55 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
@@ -185,13 +185,13 @@ public:
protected:
WaveletPacketTransform();
- ~WaveletPacketTransform() ITK_OVERRIDE {}
+ ~WaveletPacketTransform() override {}
/** Generate data redefinition.
* This class does not performs multi-threading directly. But it uses step by step the
* GenerateData() of TFilter. If This one can thread, the transformation is threaded
* (e.g. WaveletFilterBank) */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Performs (if any) the local decomposition (called recursively) */
virtual void GenerateData(unsigned int depth, OutputImageType * outputPtr,
@@ -323,19 +323,19 @@ public:
protected:
WaveletPacketTransform();
- ~WaveletPacketTransform() ITK_OVERRIDE {}
+ ~WaveletPacketTransform() override {}
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy information from the input image if existing.
**/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate data redefinition.
* This class does not performs multi-threading directly. But it uses step by step the
* GenerateData() of TFilter. If This one can thread, the transformation is threaded
* (e.g. WaveletFilterBank) */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Performs (if any) the local decomposition (called recursively) */
virtual unsigned int SetInputFilters(unsigned int& ruleID, InputImageIterator& inputIter,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
index d4aa6d4fdfb9a0e3073b659374f1b7d8c2987ceb..4a0a43f8d50a88bfcc6247c6ef747e2194482907 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
@@ -175,10 +175,10 @@ public:
protected:
WaveletTransform();
- ~WaveletTransform() ITK_OVERRIDE {}
+ ~WaveletTransform() override {}
/** Generate data redefinition */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
WaveletTransform (const Self &);
@@ -306,16 +306,16 @@ public:
protected:
WaveletTransform();
- ~WaveletTransform() ITK_OVERRIDE {}
+ ~WaveletTransform() override {}
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy information from the input image if existing.
**/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate data redefinition */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
WaveletTransform (const Self &);
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index 2c3225cf242c539ce0fb70fa0ebab2fa40875841..064a79856b2ab4e0d35b2cd10a025d49eb59eee5 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) 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) override;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) 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 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..2c547f8b51b9d8c905a1c6f5312fd5247ce24d27 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 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 override;
/** Generate the input requested region from the first element in the list. */
- virtual void GenerateInputRequestedRegion(void);
+ virtual void GenerateInputRequestedRegion(void) override;
/** Generate the output information by building the output list. */
- virtual void GenerateOutputInformation(void);
+ virtual void GenerateOutputInformation(void) override;
/** Main computation method */
- virtual void GenerateData(void);
+ virtual void GenerateData(void) override;
private:
WaveletsSynopsisImageToWaveletsBandsListFilter(const Self&); //purposely not implemented
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
index 4781b8e4e328a9b9b8f261f114040c9c3369ae6c..8ff9ae486c402023c9bfb73ffe0468f12a59c87d 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
@@ -107,9 +107,9 @@ protected:
/** Constructor */
FuzzyVariable();
/** Destructor */
- ~FuzzyVariable() ITK_OVERRIDE {}
+ ~FuzzyVariable() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** Map containing the membership functions */
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index bc4bc866b73e66a8b95de4fb42ae477117b3abe6..042106701cc9ca9af44b52fc976e45f35f848eed 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -159,7 +159,7 @@ public:
protected:
NeighborhoodMajorityVotingImageFilter();
- ~NeighborhoodMajorityVotingImageFilter() ITK_OVERRIDE {};
+ ~NeighborhoodMajorityVotingImageFilter() override {};
/** Evaluate image neighborhood with kernel to find the new value
* for the center pixel value
@@ -169,9 +169,9 @@ protected:
* Evaluate is used for non-boundary pixels. */
PixelType Evaluate(const NeighborhoodIteratorType &nit,
const KernelIteratorType kernelBegin,
- const KernelIteratorType kernelEnd) ITK_OVERRIDE;
+ const KernelIteratorType kernelEnd) override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
//Type to store the useful information from the label histogram
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
index 80290995ac7b29e3190ce459291c0a0598096d92..c57b46d5680383dcd1cbd365cf585b30d5dbbf36 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
@@ -298,14 +298,14 @@ public:
protected:
BayesianFusionFilter();
- ~BayesianFusionFilter() ITK_OVERRIDE;
+ ~BayesianFusionFilter() override;
/** Check if internal statistics need to be computed, and do so */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Compute internal statistics required for fusion */
void ComputeInternalStatistics(void);
/** Call the superclass implementation and set the StatisticsHaveBeenGenerated
* flag to false */
- void Modified(void) const ITK_OVERRIDE;
+ void Modified(void) const override;
private:
/** Ponderation declaration*/
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index 4a87bd3f0f28968acf8a0139804a8e9910d3f276..df34eeadeb8c45236c82b2111c29008b4125666b 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -110,13 +110,13 @@ protected:
LmvmPanSharpeningFusionImageFilter();
/** Destructor */
- ~LmvmPanSharpeningFusionImageFilter() ITK_OVERRIDE {};
+ ~LmvmPanSharpeningFusionImageFilter() override {};
/** Call to generate data, wiring composite internal minipipeline */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LmvmPanSharpeningFusionImageFilter(Self &); // intentionally not implemented
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 75cb290f5e33e8f3d2571c825dcc3efb793028cb..2808c721eb9f6eec7484a447891e16f80667904d 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -95,13 +95,13 @@ protected:
SimpleRcsPanSharpeningFusionImageFilter();
/** Destructor */
- ~SimpleRcsPanSharpeningFusionImageFilter() ITK_OVERRIDE {};
+ ~SimpleRcsPanSharpeningFusionImageFilter() override {};
/** Call to generate data, wiring composite internal minipipeline */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SimpleRcsPanSharpeningFusionImageFilter(Self &); // intentionally not implemented
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
index 0876c7427d2394080caf4980b516ab65876d395d..0207220ff0fd3c99cc64ba289dd0e4d6a0051d37 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
@@ -94,16 +94,16 @@ public:
itkGetMacro(ExternalRadius, int);
/** Main computation method */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
// virtual void GenerateData();
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
protected:
LocalRxDetectorFilter();
- ~LocalRxDetectorFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LocalRxDetectorFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LocalRxDetectorFilter(const Self&); //purposely not implemented
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
index e369bc5eb668cb59c0299c6b75c4d340878bf486..257efd5c6c6dc0c683652be4105d6ea94c464b14 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
@@ -93,16 +93,16 @@ public:
itkGetMacro(ExternalRadius, int);
/** Main computation method */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
+ void GenerateData() override;
// virtual void BeforeThreadedGenerateData();
// virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
protected:
LocalRxDetectorNonThreadFilter();
- ~LocalRxDetectorNonThreadFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LocalRxDetectorNonThreadFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LocalRxDetectorNonThreadFilter(const Self&); //purposely not implemented
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
index 548d493a4a5e8b82a2a76dfa259f820aa417b424..68bc950a422f55789b3cffa2c1bef21170593d35 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
@@ -105,8 +105,8 @@ public:
protected:
EigenvalueLikelihoodMaximisation();
- ~EigenvalueLikelihoodMaximisation() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~EigenvalueLikelihoodMaximisation() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
EigenvalueLikelihoodMaximisation(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index c921d60ab808a989b318502cebf82a3f123e9ecd..e91d2346dc602892af7fdd6aeb0613ee06c098a0 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -104,12 +104,12 @@ public:
itkGetMacro( NumberOfEndmembers, unsigned int );
itkSetMacro( NumberOfEndmembers, unsigned int );
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->GenerateData();
}
- void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)) ITK_OVERRIDE
+ void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)) override
{
this->GetOutput()
->SetRequestedRegion( this->GetOutput()->GetLargestPossibleRegion() );
@@ -118,13 +118,13 @@ public:
protected:
VCAImageFilter();
- ~VCAImageFilter() ITK_OVERRIDE;
+ ~VCAImageFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
VCAImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
index 979f7f8bbbd2175fe333706223b4a7847a08d5f2..89e8b9066f151e1f92551172e2b4e77c811f44df 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
@@ -118,8 +118,8 @@ public:
protected:
VirtualDimensionality();
- ~VirtualDimensionality() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~VirtualDimensionality() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VirtualDimensionality(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
index ae0dcb19fdebaed33e5c10c87ee0c3ef02608e79..965c5180e838c46aa01cc127240aeb24950872bb 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
@@ -171,9 +171,9 @@ public:
protected:
ISRAUnmixingImageFilter();
- ~ISRAUnmixingImageFilter() ITK_OVERRIDE;
+ ~ISRAUnmixingImageFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ISRAUnmixingImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
index ebef4fe9cafecec0bc986e36da73b07d2b09c728..14d05bbca44718b28fa93efbf367ed0d887e2ec8 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
@@ -193,18 +193,18 @@ public:
protected:
MDMDNMFImageFilter();
- ~MDMDNMFImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MDMDNMFImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** GenerateOutputInformation
* Propagate vector length info and modify if needed
*/
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
index fc433e998de102330cca1a6f0afd114f1c04e757..e7fe656079cbfd57e18a20669b2ff127911a3b19 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
@@ -174,9 +174,9 @@ public:
protected:
NCLSUnmixingImageFilter();
- ~NCLSUnmixingImageFilter() ITK_OVERRIDE;
+ ~NCLSUnmixingImageFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
NCLSUnmixingImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
index 71adb011c1fe4a4f4d34f861c6b784a75808706b..4e38022e23ff13f68c51f07ddb4e1428678e17d4 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
@@ -162,9 +162,9 @@ public:
protected:
SparseUnmixingImageFilter();
- ~SparseUnmixingImageFilter() ITK_OVERRIDE { }
+ ~SparseUnmixingImageFilter() override { }
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
virtual void GenerateNumberOfComponentsRequired ();
private:
SparseUnmixingImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
index 128cf2af005d9709af4e61989f2b9713a37c85ed..ad8ef27c1bec44f73ff81e4df1bf17ee6a136d7e 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
@@ -174,9 +174,9 @@ public:
protected:
UnConstrainedLeastSquareImageFilter();
- ~UnConstrainedLeastSquareImageFilter() ITK_OVERRIDE {}
+ ~UnConstrainedLeastSquareImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
UnConstrainedLeastSquareImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/IO/Carto/include/otbCoordinateToName.h b/Modules/IO/Carto/include/otbCoordinateToName.h
index 7fe3307a04c6cdde6986443237820eb8ddb04974..b2bc93de5232d32487141744fbacf8e98ae6b33a 100644
--- a/Modules/IO/Carto/include/otbCoordinateToName.h
+++ b/Modules/IO/Carto/include/otbCoordinateToName.h
@@ -118,8 +118,8 @@ public:
protected:
CoordinateToName();
- ~CoordinateToName() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~CoordinateToName() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void ParseXMLGeonames(std::string& placeName, std::string& countryName) const;
virtual void DoEvaluate();
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index 85c797c601b2c5e5a658f0a3fccfcc6093213837..d69770c3785edd01b640db38dc71913b9d7c41fa 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -81,13 +81,13 @@ public:
const ImageType* GetInput() const;
protected:
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
// Method to compute the extent of the image
void EstimateImageExtent();
ImageToOSMVectorDataGenerator();
- ~ImageToOSMVectorDataGenerator() ITK_OVERRIDE {}
+ ~ImageToOSMVectorDataGenerator() override {}
private:
ImageToOSMVectorDataGenerator(const Self&); //purposely not implemented
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index edfaf5b272500a2c8e62447977dd1b45da34845f..4ec15cd4e49b7f45f791d8d5a459ac8e10a27799 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -154,7 +154,7 @@ public:
itkGetStringMacro(ShapeIndexPath);
/** Update Method : Call a porotected Write method */
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->Write();
}
@@ -164,8 +164,8 @@ public:
protected:
MapFileProductWriter();
- ~MapFileProductWriter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MapFileProductWriter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**Method for Tiling the input image*/
virtual void Tiling();
diff --git a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
index a9f1e106553dd810704b04189b16cdbad2c45dab..5c3383e8070c0f1df921ad5a1c2dbe31d16dfba8 100644
--- a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
@@ -166,7 +166,7 @@ public:
protected:
/** Generate Data method : launch the process */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**
* Parse the xml file get from OSM to compose the requested vector
@@ -186,7 +186,7 @@ protected:
OSMDataToVectorDataGenerator();
- ~OSMDataToVectorDataGenerator() ITK_OVERRIDE;
+ ~OSMDataToVectorDataGenerator() override;
private:
OSMDataToVectorDataGenerator(const Self&); //purposely not implemented
diff --git a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
index 002a130ce73285b5859ad3e4f9377ea60fbec301..3ea71f9ccf4d1c9d4f74bb2e7be5ebb7faa7ec2f 100644
--- a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
+++ b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
@@ -61,8 +61,8 @@ public:
protected:
PlaceNameToLonLat();
- ~PlaceNameToLonLat() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~PlaceNameToLonLat() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void RetrieveXML(const std::ostringstream& urlStream);
void ParseXMLYahoo();
void ParseXMLGoogle();
diff --git a/Modules/IO/Carto/include/otbWorldFile.h b/Modules/IO/Carto/include/otbWorldFile.h
index 0c07086a3278ba41e45117837d082ee2a94ad42e..5e26171a9470127a75afc909904e4feb658ca511 100644
--- a/Modules/IO/Carto/include/otbWorldFile.h
+++ b/Modules/IO/Carto/include/otbWorldFile.h
@@ -96,7 +96,7 @@ protected:
m_LonSpacing(0.0), m_LatSpacing(0.0),
m_LonRotation(0.0), m_LatRotation(0.0),
m_ImageFilename("") {}
- ~WorldFile() ITK_OVERRIDE {}
+ ~WorldFile() override {}
private:
WorldFile(const Self &); //purposely not implemented
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
index b6d29171cd0ef81fd67ad3822c06366c417f2544..72123839c76f922c32d63296abd6c3559f92f705 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
@@ -81,7 +81,7 @@ public:
protected:
ExtendedFilenameHelper() {}
- ~ExtendedFilenameHelper() ITK_OVERRIDE {}
+ ~ExtendedFilenameHelper() override {}
private:
ExtendedFilenameHelper(const Self &); //purposely not implemented
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
index 79c8bb00e0a7058d1a5531174254661deb47da50..374e9dbe568d20e03de71ee53beb6c8d06cb7d68 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
@@ -79,7 +79,7 @@ public:
};
/* Set Methods */
- void SetExtendedFileName(const char * extFname) ITK_OVERRIDE;
+ void SetExtendedFileName(const char * extFname) override;
/* Get Methods */
bool SimpleFileNameIsSet () const;
bool ExtGEOMFileNameIsSet () const;
@@ -101,7 +101,7 @@ public:
protected:
ExtendedFilenameToReaderOptions();
- ~ExtendedFilenameToReaderOptions() ITK_OVERRIDE {}
+ ~ExtendedFilenameToReaderOptions() override {}
private:
ExtendedFilenameToReaderOptions(const Self &); //purposely not implemented
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
index 81909d152832b2a6ef7f6c98333db05835a805b3..c1754bd2cd363993fee970f4ba6c012f4e57602c 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
@@ -77,7 +77,7 @@ public:
};
/* Set Methods */
- void SetExtendedFileName(const char * extFname) ITK_OVERRIDE;
+ void SetExtendedFileName(const char * extFname) override;
/* Get Methods */
bool SimpleFileNameIsSet () const;
bool WriteGEOMFileIsSet () const;
@@ -102,7 +102,7 @@ public:
protected:
ExtendedFilenameToWriterOptions();
- ~ExtendedFilenameToWriterOptions() ITK_OVERRIDE {}
+ ~ExtendedFilenameToWriterOptions() override {}
private:
ExtendedFilenameToWriterOptions(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIO.h b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
index 9b6efa368b25b3155d57771e77be0d1bf882a0e4..b954895cc5f8ca85d20740796f7762f92d9ca0df 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIO.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
@@ -63,19 +63,19 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Reads 3D data from multiple files assuming one slice per file. */
virtual void ReadVolume(void* buffer);
@@ -84,28 +84,28 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
// JULIEN: NOT USED, NOT IMPLEMENTED
// void SampleImage(void* buffer, int XBegin, int YBegin, int SizeXRead, int SizeYRead, int XSample, int YSample);
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -114,7 +114,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -123,13 +123,13 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
protected:
/** Constructor.*/
BSQImageIO();
/** Destructor.*/
- ~BSQImageIO() ITK_OVERRIDE;
+ ~BSQImageIO() override;
bool OpenOneraDataFileForReading(const char* filename);
bool OpenOneraHeaderFileForReading(const char* filename);
@@ -138,7 +138,7 @@ protected:
bool OpenOneraDataFileForWriting(const char* filename);
bool OpenOneraHeaderFileForWriting(const char* filename);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BSQImageIO(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
index 56337e23a7f57a4a4f9bb59f2cdc31a784e2ee8b..702729fd340565b4c210b011a5a43c8ed08c5a71 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
BSQImageIOFactory();
- ~BSQImageIOFactory() ITK_OVERRIDE;
+ ~BSQImageIOFactory() override;
private:
BSQImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOGDAL/include/otbGDALDatasetWrapper.h b/Modules/IO/IOGDAL/include/otbGDALDatasetWrapper.h
index a20b1405a11b55ad7245003450c86a051a1fbdb4..667b8f7283d7cbc9ae5124921b4d02ee476b6968 100644
--- a/Modules/IO/IOGDAL/include/otbGDALDatasetWrapper.h
+++ b/Modules/IO/IOGDAL/include/otbGDALDatasetWrapper.h
@@ -79,7 +79,7 @@ public:
protected :
GDALDatasetWrapper();
- ~GDALDatasetWrapper() ITK_OVERRIDE;
+ ~GDALDatasetWrapper() override;
private:
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIO.h b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
index 49b4678ac43729314803f1bb5aecc37bac75cded..e494c588dc57502d3bd7e2d17370d9dde3a13aac 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIO.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
@@ -119,7 +119,7 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type */
void SetOutputImagePixelType( bool isComplexInternalPixelType,
- bool isVectorImage) ITK_OVERRIDE
+ bool isVectorImage) override
{
this->SetIsComplex(isComplexInternalPixelType);
this->SetIsVectorImage(isVectorImage);
@@ -129,19 +129,19 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Reads 3D data from multiple files assuming one slice per file. */
virtual void ReadVolume(void* buffer);
@@ -156,18 +156,18 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE;
+ bool CanStreamWrite() override;
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
/** Get all resolutions possible from the file dimensions */
bool GetAvailableResolutions(std::vector<unsigned int>& res);
@@ -180,10 +180,10 @@ public:
* Currently this overview count is only based on the first band
* If no pre-computed overviews are available we provide the overview
* count based on size division by 2*/
- unsigned int GetOverviewsCount() ITK_OVERRIDE;
+ unsigned int GetOverviewsCount() override;
/** Get description about overviews available into the file specified */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE;
+ std::vector<std::string> GetOverviewsInfo() override;
/** Returns gdal pixel type as string */
std::string GetGdalPixelTypeAsString() const;
@@ -196,9 +196,9 @@ protected:
*/
GDALImageIO();
/** Destructor.*/
- ~GDALImageIO() ITK_OVERRIDE;
+ ~GDALImageIO() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Read all information on the image*/
void InternalReadImageInformation();
/** Write all information on the image*/
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
index e4e13cd11a909a11f226e4b39b660b79da4be155..275c0db252434ef5d3db4dbdcf093b1cf713a61b 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
@@ -43,8 +43,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
GDALImageIOFactory();
- ~GDALImageIOFactory() ITK_OVERRIDE;
+ ~GDALImageIOFactory() override;
private:
GDALImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h b/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
index 50815a7124281986e471eec07f222b05c95299e7..1a803887faf1dc49a75b0c9bddfd2398afce0249 100644
--- a/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
+++ b/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
@@ -160,15 +160,15 @@ public:
void SetInputFileName( const std::string & str );
- void Update() ITK_OVERRIDE;
+ void Update() override;
protected:
GDALOverviewsBuilder();
- ~GDALOverviewsBuilder() ITK_OVERRIDE {};
+ ~GDALOverviewsBuilder() override {};
- void PrintSelf( std::ostream & os, itk::Indent indent ) const ITK_OVERRIDE;
+ void PrintSelf( std::ostream & os, itk::Indent indent ) const override;
private:
diff --git a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
index af76c375c214ca95a427eeffae780d3ad7d78cd9..003ea24d91567335ef86d355541ef2a221ccd085 100644
--- a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
+++ b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
@@ -93,7 +93,7 @@ public:
protected:
OGRIOHelper();
- ~OGRIOHelper() ITK_OVERRIDE;
+ ~OGRIOHelper() override;
private:
OGRIOHelper(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
index d4b1b8c46cccd977fd1be16c09f2031b7e34a5ae..2344ef6fca541478a916b704f8c9206d526efd62 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
@@ -91,29 +91,29 @@ public:
/** Determine the file type. Returns true if this VectorDataIO can read the
* file specified. */
- bool CanReadFile(const char*) const ITK_OVERRIDE;
+ bool CanReadFile(const char*) const override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(itk::DataObject* data) ITK_OVERRIDE;
+ void Read(itk::DataObject* data) override;
/*-------- This part of the interfaces deals with writing data. ----- */
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) const ITK_OVERRIDE;
+ bool CanWriteFile(const char*) const override;
/** Writes the data to disk from the memory buffer provided */
- void Write(const itk::DataObject* data, char ** papszOptions = ITK_NULLPTR) ITK_OVERRIDE;
+ void Write(const itk::DataObject* data, char ** papszOptions = ITK_NULLPTR) override;
protected:
/** Constructor.*/
OGRVectorDataIO();
/** Destructor.*/
- ~OGRVectorDataIO() ITK_OVERRIDE;
+ ~OGRVectorDataIO() override;
/* virtual void InternalReadVectorDataInformation(){}; */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
OGRVectorDataIO(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
index 8202f5d70401ca025302e5bf66970459dd215e76..c872aeeba8353777a6d041c2a68d5b05605d5cd6 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
@@ -41,8 +41,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
OGRVectorDataIOFactory();
- ~OGRVectorDataIOFactory() ITK_OVERRIDE;
+ ~OGRVectorDataIOFactory() override;
private:
OGRVectorDataIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
index a48dfcb3092447a4ccc3dfb1dd7da05c5ebc75e9..c991edea6cba7c9e697d52109ad95f4ba9ff4034 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
@@ -90,27 +90,27 @@ public:
/** Determine the file type. Returns true if this VectorDataIO can read the
* file specified. */
- bool CanReadFile(const char*) const ITK_OVERRIDE;
+ bool CanReadFile(const char*) const override;
/** Reads the data from disk into the data structure provided. */
- void Read(itk::DataObject* data) ITK_OVERRIDE;
+ void Read(itk::DataObject* data) override;
/*-------- This part of the interfaces deals with writing data. ----- */
/** Determine the file type. Returns true if this VectorDataIO can read the
* file specified. */
- bool CanWriteFile(const char*) const ITK_OVERRIDE;
+ bool CanWriteFile(const char*) const override;
/** Writes the data to disk from the data structure provided */
- void Write(const itk::DataObject* data, char ** papszOptions = ITK_NULLPTR) ITK_OVERRIDE;
+ void Write(const itk::DataObject* data, char ** papszOptions = ITK_NULLPTR) override;
protected:
/** Constructor.*/
KMLVectorDataIO();
/** Destructor.*/
- ~KMLVectorDataIO() ITK_OVERRIDE;
+ ~KMLVectorDataIO() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
static const kmldom::FeaturePtr GetRootFeature(const kmldom::ElementPtr& root);
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
index b480454ac9646647ab56d930257abd8a1747b386..590eaf25febae3f68a6447d51a3bb43b20a7c660 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -58,7 +58,7 @@ public:
protected:
KMLVectorDataIOFactory();
- ~KMLVectorDataIOFactory() ITK_OVERRIDE;
+ ~KMLVectorDataIOFactory() override;
private:
KMLVectorDataIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIO.h b/Modules/IO/IOLUM/include/otbLUMImageIO.h
index 0597064be56c99b075db81b49241c0e6b2796503..effe0388ca6875025a44580ef59af973ac6f122d 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIO.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIO.h
@@ -62,19 +62,19 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Reads 3D data from multiple files assuming one slice per file. */
virtual void ReadVolume(void* buffer);
@@ -83,27 +83,27 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
// JULIEN: NOT USED, NOT IMPLEMENTED
//void SampleImage(void* buffer, int XBegin, int YBegin, int SizeXRead, int SizeYRead, int XSample, int YSample);
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -112,7 +112,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -121,13 +121,13 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
protected:
/** Constructor.*/
LUMImageIO();
/** Destructor.*/
- ~LUMImageIO() ITK_OVERRIDE;
+ ~LUMImageIO() override;
bool OpenOneraDataFileForReading(const char* filename);
bool OpenOneraHeaderFileForReading(const char* filename);
@@ -136,7 +136,7 @@ protected:
bool OpenOneraDataFileForWriting(const char* filename);
bool OpenOneraHeaderFileForWriting(const char* filename);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LUMImageIO(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
index 8a11fe3595350e2c77a2e50e3062cf25252e6c93..f1c06592f7270c4125e2a7db778ce558c15ff8b2 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
LUMImageIOFactory();
- ~LUMImageIOFactory() ITK_OVERRIDE;
+ ~LUMImageIOFactory() override;
private:
LUMImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
index 6de01a473c4ebc5253c46dc4098853eec2f356c0..fed00e395b42e341387940c2054ed02d45d10213 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
@@ -55,47 +55,47 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/*-------- This part of the interfaces deals with writing data. ----- */
/** Determine the file type. Returns true if this ImageIO can write the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegions has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
MSTARImageIO();
- ~MSTARImageIO() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MSTARImageIO() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -104,7 +104,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -113,7 +113,7 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
private:
MSTARImageIO(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
index c72d136008073418960c46cb0e14b406cfea219a..0b980fd77e409f9f58bdc372647c01161e1904b7 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
MSTARImageIOFactory();
- ~MSTARImageIOFactory() ITK_OVERRIDE;
+ ~MSTARImageIOFactory() override;
private:
MSTARImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIO.h b/Modules/IO/IOONERA/include/otbONERAImageIO.h
index 3715471e8ffc7e8931298f218b726293fbe32871..620f9ddb6fc4cf26637ab9efd59fe5b77d73b87d 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIO.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIO.h
@@ -60,19 +60,19 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Reads 3D data from multiple files assuming one slice per file. */
virtual void ReadVolume(void* buffer);
@@ -81,27 +81,27 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
// JULIEN: NOT USED, NOT IMPLEMENTED
//void SampleImage(void* buffer, int XBegin, int YBegin, int SizeXRead, int SizeYRead, int XSample, int YSample);
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -110,7 +110,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -119,13 +119,13 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
protected:
/** Constructor.*/
ONERAImageIO();
/** Destructor.*/
- ~ONERAImageIO() ITK_OVERRIDE;
+ ~ONERAImageIO() override;
bool OpenOneraDataFileForReading(const char* filename);
bool OpenOneraHeaderFileForReading(const char* filename);
@@ -136,7 +136,7 @@ protected:
bool OpenOneraDataFileForWriting(const char* filename);
bool OpenOneraHeaderFileForWriting(const char* filename);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Dimension along Ox of the image*/
int m_width;
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
index 7b0f638342c194ccad3225185dd4f5cad5ba47d4..673360712754c7fa61f19477666daf655ed7c841 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
ONERAImageIOFactory();
- ~ONERAImageIOFactory() ITK_OVERRIDE;
+ ~ONERAImageIOFactory() override;
private:
ONERAImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IORAD/include/otbRADImageIO.h b/Modules/IO/IORAD/include/otbRADImageIO.h
index c5ebbd9aee2f0e5474f7b8e6b3ba26224547cc5b..d7823fd036d9c7b317f725630f25dd5904b3a423 100644
--- a/Modules/IO/IORAD/include/otbRADImageIO.h
+++ b/Modules/IO/IORAD/include/otbRADImageIO.h
@@ -62,19 +62,19 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Reads 3D data from multiple files assuming one slice per file. */
virtual void ReadVolume(void* buffer);
@@ -83,28 +83,28 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
// JULIEN: NOT USED, NOT IMPLEMENTED
// void SampleImage(void* buffer, int XBegin, int YBegin, int SizeXRead, int SizeYRead, int XSample, int YSample);
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -113,7 +113,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -122,13 +122,13 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
protected:
/** Constructor.*/
RADImageIO();
/** Destructor.*/
- ~RADImageIO() ITK_OVERRIDE;
+ ~RADImageIO() override;
bool OpenOneraDataFileForReading(const char* filename);
bool OpenOneraHeaderFileForReading(const char* filename);
@@ -138,7 +138,7 @@ protected:
bool OpenOneraDataFileForWriting(const char* filename);
bool OpenOneraHeaderFileForWriting(const char* filename);
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RADImageIO(const Self &); //purposely not implemented
diff --git a/Modules/IO/IORAD/include/otbRADImageIOFactory.h b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
index 19f884fd399ef2cbe37844c9448f4a303aa58603..1a01a6187ab2faca7555001d06d610d1d024bd51 100644
--- a/Modules/IO/IORAD/include/otbRADImageIOFactory.h
+++ b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
@@ -40,8 +40,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -59,7 +59,7 @@ public:
protected:
RADImageIOFactory();
- ~RADImageIOFactory() ITK_OVERRIDE;
+ ~RADImageIOFactory() override;
private:
RADImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
index 99ac2bd784995c50727cd8129538cff8a60dcfa6..27a8db556e7c157f8a0f0d312e7a0d5cb31c2960 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
@@ -92,41 +92,41 @@ public:
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanReadFile(const char*) ITK_OVERRIDE;
+ bool CanReadFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream read the specified file */
- bool CanStreamRead() ITK_OVERRIDE
+ bool CanStreamRead() override
{
return true;
}
/** Set the spacing and dimension information for the set filename. */
- void ReadImageInformation() ITK_OVERRIDE;
+ void ReadImageInformation() override;
/** Reads the data from disk into the memory buffer provided. */
- void Read(void* buffer) ITK_OVERRIDE;
+ void Read(void* buffer) override;
/** Determine the file type. Returns true if this ImageIO can read the
* file specified. */
- bool CanWriteFile(const char*) ITK_OVERRIDE;
+ bool CanWriteFile(const char*) override;
/** Determine the file type. Returns true if the ImageIO can stream write the specified file */
- bool CanStreamWrite() ITK_OVERRIDE
+ bool CanStreamWrite() override
{
return true;
}
/** Writes the spacing and dimensions of the image.
* Assumes SetFileName has been called with a valid file name. */
- void WriteImageInformation() ITK_OVERRIDE;
+ void WriteImageInformation() override;
/** Writes the data to disk from the memory buffer provided. Make sure
* that the IORegion has been set properly. */
- void Write(const void* buffer) ITK_OVERRIDE;
+ void Write(const void* buffer) override;
/** Get the number of overviews available into the file specified
* This imageIO didn't support overviews */
- unsigned int GetOverviewsCount() ITK_OVERRIDE
+ unsigned int GetOverviewsCount() override
{
// MANTIS-1154: Source image is always considered as the best
// resolution overview.
@@ -135,7 +135,7 @@ public:
/** Get information about overviews available into the file specified
* This imageIO didn't support overviews */
- std::vector<std::string> GetOverviewsInfo() ITK_OVERRIDE
+ std::vector<std::string> GetOverviewsInfo() override
{
std::vector<std::string> desc;
return desc;
@@ -144,26 +144,26 @@ public:
/** Provide hist about the output container to deal with complex pixel
* type (Not used here) */
void SetOutputImagePixelType( bool itkNotUsed(isComplexInternalPixelType),
- bool itkNotUsed(isVectorImage)) ITK_OVERRIDE{}
+ bool itkNotUsed(isVectorImage)) override{}
protected:
/** Constructor.*/
TileMapImageIO();
/** Destructor.*/
- ~TileMapImageIO() ITK_OVERRIDE;
+ ~TileMapImageIO() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Read all information on the image*/
void InternalReadImageInformation();
/** Write all information on the image*/
void InternalWriteImageInformation();
unsigned int GetActualNumberOfSplitsForWritingCanStreamWrite(unsigned int numberOfRequestedSplits,
- const ImageIORegion& pasteRegion) const ITK_OVERRIDE;
+ const ImageIORegion& pasteRegion) const override;
ImageIORegion GetSplitRegionForWritingCanStreamWrite(unsigned int ithPiece,
unsigned int numberOfActualSplits,
- const ImageIORegion& pasteRegion) const ITK_OVERRIDE;
+ const ImageIORegion& pasteRegion) const override;
/** Number of bands of the image*/
int m_NbBands;
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
index 9edcbc2365c96a68602000a04bb38a462acababd..e946e4064163dd3df2ddd3c37d78827bdfa88798 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -61,7 +61,7 @@ public:
protected:
TileMapImageIOFactory();
- ~TileMapImageIOFactory() ITK_OVERRIDE;
+ ~TileMapImageIOFactory() override;
private:
TileMapImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
index 412e31f2cf32776aef1af1767b9ecc8869e9475d..b9286c5cb7545959cf7d7dbc6ce8b49e415203dd 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
@@ -58,7 +58,7 @@ public:
protected:
TileMapImageIOHelper() {}
- ~TileMapImageIOHelper() ITK_OVERRIDE {}
+ ~TileMapImageIOHelper() override {}
private:
TileMapImageIOHelper(const Self &); //purposely not implemented
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
index 3eb362df0fac98224c95ad90c53642fe08071ab0..bf4dc01a6cf2cc446b18cc112eb4abffa091ab20 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
@@ -64,7 +64,7 @@ public:
typedef std::map<std::string , std::string> GenericMapType;
typedef std::map<std::string , GenericMapType> GenericMapContainer;
- void Modified() const ITK_OVERRIDE
+ void Modified() const override
{
m_IsUpdated = false;
}
@@ -95,8 +95,8 @@ protected:
virtual void Read();
StatisticsXMLFileReader();
- ~StatisticsXMLFileReader() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~StatisticsXMLFileReader() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StatisticsXMLFileReader(const Self&); //purposely not implemented
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
index 0ea02ea82f5cd7401a953b5c34703e649d44b348..c39686c525d700daeb2892e9c11ce5e4880c85da 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
@@ -92,8 +92,8 @@ protected:
virtual void GenerateData();
StatisticsXMLFileWriter();
- ~StatisticsXMLFileWriter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~StatisticsXMLFileWriter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StatisticsXMLFileWriter(const Self&); //purposely not implemented
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index 631f9d7dc27fdda1020a734086e71b95607f7786..f2094973c91f914cdc10e79db218168b543f9937 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -118,17 +118,17 @@ public:
typedef ExtendedFilenameToReaderOptions FNameHelperType;
/** Prepare image allocation at the first call of the pipeline processing */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Does the real work. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Give the reader a chance to indicate that it will produce more
* output than it was requested to produce. ImageFileReader cannot
* currently read a portion of an image (since the ImageIO objects
* cannot read a portion of an image), so the ImageFileReader must
* enlarge the RequestedRegion to the size of the image on disk. */
- void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject *output) override;
/** Set/Get the ImageIO helper class. Often this is created via the object
* factory mechanism that determines whether a particular ImageIO can
@@ -158,8 +158,8 @@ public:
protected:
ImageFileReader();
- ~ImageFileReader() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageFileReader() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Convert a block of pixels from one type to another. */
void DoConvertBuffer(void* buffer, size_t numberOfPixels);
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index b7bc6499b089a47cf7c75822523e56fb9cf819e0..2851c8b03d3372f6353bba967aeaf0f99a1c9ba5 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -168,7 +168,7 @@ public:
/** Override Update() from ProcessObject because this filter
* has no output. */
- void Update() ITK_OVERRIDE;
+ void Update() override;
/** ImageFileWriter Methods */
virtual void SetFileName(const char* extendedFileName);
@@ -201,11 +201,11 @@ public:
protected:
ImageFileWriter();
- ~ImageFileWriter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ImageFileWriter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Does the real work. */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
ImageFileWriter(const ImageFileWriter &); //purposely not implemented
diff --git a/Modules/IO/ImageIO/include/otbImageIOFactory.h b/Modules/IO/ImageIO/include/otbImageIOFactory.h
index 13643537e9e17db2f493f35b484184c5b3cd349e..287c149792eada50c4605aaa1213d6e621c4807a 100644
--- a/Modules/IO/ImageIO/include/otbImageIOFactory.h
+++ b/Modules/IO/ImageIO/include/otbImageIOFactory.h
@@ -59,7 +59,7 @@ public:
protected:
ImageIOFactory();
- ~ImageIOFactory() ITK_OVERRIDE;
+ ~ImageIOFactory() override;
private:
ImageIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
index 173ccc99d4a2a4a0647936eb8cf98d6d606f432a..d31a890d683304f5f75c2791b690c1329f3635f8 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
@@ -428,12 +428,12 @@ public:
protected:
ImageSeriesFileReader();
- ~ImageSeriesFileReader () ITK_OVERRIDE {}
+ ~ImageSeriesFileReader () override {}
/**
* Tests the coherency of the Meta File (especifically band selection) with the image types
*/
- void TestBandSelection(std::vector<unsigned int>& itkNotUsed(bands)) ITK_OVERRIDE{}
+ void TestBandSelection(std::vector<unsigned int>& itkNotUsed(bands)) override{}
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -441,7 +441,7 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- void GenerateData(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ void GenerateData(DataObjectPointerArraySizeType idx) override;
using Superclass::GenerateData;
/**
@@ -449,10 +449,10 @@ protected:
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke through GenerateOutput() or GenerateOutput( idx ).
*/
- void AllocateListOfComponents(void) ITK_OVERRIDE;
+ void AllocateListOfComponents(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
return Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index fa32e38fc204d95aada2b8021e5f6ba6640ea9a8..58b071957e30e90b09ee7899db4d04227b0d0de1 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -133,7 +133,7 @@ public:
{
return m_ListOfFileNames.size();
}
- OutputImageListType * GetOutput(void) ITK_OVERRIDE;
+ OutputImageListType * GetOutput(void) override;
virtual OutputImageType * GetOutput(DataObjectPointerArraySizeType idx);
/** Performs selective file extraction */
@@ -141,14 +141,14 @@ public:
virtual OutputImageType * GenerateOutput(DataObjectPointerArraySizeType idx);
/** Synchronization */
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->GenerateData();
}
protected:
ImageSeriesFileReaderBase();
- ~ImageSeriesFileReaderBase () ITK_OVERRIDE {}
+ ~ImageSeriesFileReaderBase () override {}
enum FileType { kFileName = 0, kImageFileName, kAnyFileName };
/**
@@ -159,7 +159,7 @@ protected:
virtual void TestFileExistenceAndReadability(std::string& file, FileType fileType);
virtual void TestBandSelection(std::vector<unsigned int>& itkNotUsed(bands)) {}
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -181,7 +181,7 @@ protected:
virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
std::string m_FileName;
OutputImageListPointerType m_OutputList;
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
index 548611ada1cc86963d6b263e9b16c468c5a88eca..b09880bce29f0fcca68a4e81b2817ad644bded56 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
@@ -91,17 +91,17 @@ public:
m_Buffer = pBuff;
}
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->GenerateData();
}
protected:
ScalarBufferToImageFileWriter();
- ~ScalarBufferToImageFileWriter() ITK_OVERRIDE { /* don't call ClearBuffer, user's care */}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ScalarBufferToImageFileWriter() override { /* don't call ClearBuffer, user's care */}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 869fe49bc2f1d9cd9b50992291e34216836b19ae..d8957ee2d68e5a3cd08c9ff922cbe9857c3f8917 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -136,7 +136,7 @@ public:
itkSetStringMacro(Path);
/** Update Method */
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->Write();
}
@@ -167,8 +167,8 @@ public:
protected:
KmzProductWriter();
- ~KmzProductWriter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~KmzProductWriter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**Method for Tiling the input image*/
virtual void Tiling();
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
index 042e2a5a5bbfb9713151ebb7f912f6ceffbff0d1..1eb5e1e7749068106a3d910a678c2407ed40be01 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -91,9 +91,9 @@ public:
protected:
DifferenceImageFilter();
- ~DifferenceImageFilter() ITK_OVERRIDE {}
+ ~DifferenceImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** DifferenceImageFilter can be implemented as a multithreaded
* filter. Therefore, this implementation provides a
@@ -107,11 +107,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& threadRegion,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void AfterThreadedGenerateData() ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void AfterThreadedGenerateData() override;
+ void GenerateOutputInformation() override;
ScalarRealType m_DifferenceThreshold;
RealType m_MeanDifference;
diff --git a/Modules/IO/TestKernel/include/otbTestHelper.h b/Modules/IO/TestKernel/include/otbTestHelper.h
index 32e0dba890815d4381d93f0005c4551fcb12c4c8..0bf593400f920792cd212eaaaa307fcdf13641b1 100644
--- a/Modules/IO/TestKernel/include/otbTestHelper.h
+++ b/Modules/IO/TestKernel/include/otbTestHelper.h
@@ -71,7 +71,7 @@ public:
std::string("Integer"),std::string("Integer64")));
}
- ~TestHelper() ITK_OVERRIDE{}
+ ~TestHelper() override{}
int RegressionTestAllImages(const StringList& baselineFilenamesImage,
const StringList& testFilenamesImage);
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
index 71b3bea7bc57bc48248102f297ee88567a4fb769..3571baf21b87d41305427bc5fd48aebd42503996 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -120,20 +120,20 @@ public:
/** Prepare the allocation of the output vector data during the first back
* propagation of the pipeline. */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Does the real work. */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
VectorDataFileReader();
- ~VectorDataFileReader() ITK_OVERRIDE;
+ ~VectorDataFileReader() override;
std::string m_ExceptionMessage;
typename VectorDataIOBaseType::Pointer m_VectorDataIO;
bool m_UserSpecifiedVectorDataIO; // keep track whether the
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
std::string m_FileName; // The file to be read
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index 520586e661569cf1be3ae4c0bc714fd212a34156..4ef6ba6e129fca2ba33423931ef40cae66b15a4a 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -93,9 +93,9 @@ public:
/** Does the real work. */
virtual void Write();
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void Update() ITK_OVERRIDE
+ void Update() override
{
this->Write();
}
@@ -106,9 +106,9 @@ public:
protected:
VectorDataFileWriter();
- ~VectorDataFileWriter() ITK_OVERRIDE;
+ ~VectorDataFileWriter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
std::string m_FileName; // The file to be read
typename VectorDataIOBaseType::Pointer m_VectorDataIO;
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
index 556722fb3b7dacfa10d40deb8680e16c3f5a93d8..62754644faf24d031217cbbb0597b8ac83e6fde9 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
@@ -62,7 +62,7 @@ public:
protected:
VectorDataIOFactory();
- ~VectorDataIOFactory() ITK_OVERRIDE;
+ ~VectorDataIOFactory() override;
private:
VectorDataIOFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
index da0cdcfa220493c7a20f78367b7484dabeb6fc35..bc5891e2469b0d5370750e00696977d538049fd6 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
@@ -85,7 +85,7 @@ public:
enum MassOfBeliefDefinitionMethod {PRECISION, RECALL, ACCURACY, KAPPA};
- void Update() ITK_OVERRIDE;
+ void Update() override;
/** Accessors */
itkSetMacro(ConfusionMatrix, ConfusionMatrixType);
@@ -141,10 +141,10 @@ protected:
ConfusionMatrixToMassOfBelief();
/** Destructor */
- ~ConfusionMatrixToMassOfBelief() ITK_OVERRIDE {};
+ ~ConfusionMatrixToMassOfBelief() override {};
/** Triggers the computation of the confusion matrix */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
private:
ConfusionMatrixToMassOfBelief(const Self&); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index 723a1aed1b4761410990a8717076f9822766a176..32d4d430fd7a836f70ead380c99aee5178e9c143 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -140,16 +140,16 @@ protected:
/** Constructor */
DSFusionOfClassifiersImageFilter();
/** Destructor */
- ~DSFusionOfClassifiersImageFilter() ITK_OVERRIDE {}
+ ~DSFusionOfClassifiersImageFilter() override {}
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DSFusionOfClassifiersImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
index ac454c1e6f78dfe55da6624b31292f6ba9838b4e..8e8807b7122aecdef62caa855b17dd13f72ce092 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
@@ -71,11 +71,11 @@ public:
/** Remove the last input */
using Superclass::PopBackInput;
- void PopBackInput() ITK_OVERRIDE;
+ void PopBackInput() override;
/** Remove the first input */
using Superclass::PopFrontInput;
- void PopFrontInput() ITK_OVERRIDE;
+ void PopFrontInput() override;
/** Get the idx th input */
const MassFunctionType * GetInput(unsigned int idx);
@@ -88,13 +88,13 @@ protected:
JointMassOfBeliefFilter();
/** Destructor */
- ~JointMassOfBeliefFilter() ITK_OVERRIDE {}
+ ~JointMassOfBeliefFilter() override {}
/** GenerateData */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
JointMassOfBeliefFilter(const Self&); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
index 7e2eff5636242dba64335f8bc7e79cb3a7d03a23..70e8f909fea2001d0ddfccae78b7558ce74eaf3e 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
@@ -180,10 +180,10 @@ protected:
MassOfBelief() {}
/** Desctructor */
- ~MassOfBelief() ITK_OVERRIDE {}
+ ~MassOfBelief() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
MassOfBelief(const Self&); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
index 6623a418958c3d93d2ede1b1d60f32a4b10b3ffe..2c90a53c1e08b887442d6cbd975d1712d1c21b84 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
@@ -95,14 +95,14 @@ public:
/** This method returns the value of the cost function corresponding
* to the specified parameters. */
- MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;
+ MeasureType GetValue( const ParametersType & parameters ) const override;
/** This method returns the derivative of the cost function corresponding
* to the specified parameters. */
void GetDerivative( const ParametersType & parameters,
- DerivativeType & derivative ) const ITK_OVERRIDE;
+ DerivativeType & derivative ) const override;
- unsigned int GetNumberOfParameters(void) const ITK_OVERRIDE;
+ unsigned int GetNumberOfParameters(void) const override;
itkSetMacro(Weight, double);
itkGetConstMacro(Weight, double);
@@ -151,9 +151,9 @@ protected:
/** Constructor */
StandardDSCostFunction();
/** Destructor */
- ~StandardDSCostFunction() ITK_OVERRIDE {}
+ ~StandardDSCostFunction() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
StandardDSCostFunction(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
index 5b331ae6aae32cd9b7364c14c504f964c66ac10f..2a3731307e351be26d95ce30771a647c003c097f 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
@@ -161,13 +161,13 @@ public:
protected:
/** Triggers the Computation */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
VectorDataToDSValidatedVectorDataFilter();
/** Destructor */
- ~VectorDataToDSValidatedVectorDataFilter() ITK_OVERRIDE {}
+ ~VectorDataToDSValidatedVectorDataFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
std::string GetNextID()
{
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 14205f0cd81aa2053d22b7bf90bfc78b5bebfe39..7bf3231a9b8d372473fd5ed0f598d3f2fd7c7c06 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -119,13 +119,13 @@ 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) override;
+ bool CanWriteFile(const std::string & filename) 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;
+ void Save(const std::string & filename, const std::string & name="") override;
+ void Load(const std::string & filename, const std::string & name="") override;
- void Train() ITK_OVERRIDE;
+ void Train() override;
template <class T, class Autoencoder>
void TrainOneLayer(
@@ -151,18 +151,18 @@ public:
protected:
AutoencoderModel();
- ~AutoencoderModel() ITK_OVERRIDE;
+ ~AutoencoderModel() override;
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const 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 override;
private:
/** Internal Network */
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
index 711711ca4b5afd0a9d1864cc7b300dd56d40db64..e04170ec37e5e7b12064fd8d26992288e5573c62 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
AutoencoderModelFactory();
- ~AutoencoderModelFactory() ITK_OVERRIDE;
+ ~AutoencoderModelFactory() override;
private:
AutoencoderModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
index 9bbd28bc0b9ebbe7561bb19ca5f6df5b398a082b..98c84903833c5ec6d7da5fd6d2ac0cb4e114870b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
@@ -61,7 +61,7 @@ public:
protected:
DimensionalityReductionModelFactory();
- ~DimensionalityReductionModelFactory() ITK_OVERRIDE;
+ ~DimensionalityReductionModelFactory() override;
private:
DimensionalityReductionModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index d5538c1700538d6e77adb78c0358108e9730ce73..0cfab267dd0df607cc580ff60d13bad01ea152f8 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -112,19 +112,19 @@ protected:
/** Constructor */
ImageDimensionalityReductionFilter();
/** Destructor */
- ~ImageDimensionalityReductionFilter() ITK_OVERRIDE {}
+ ~ImageDimensionalityReductionFilter() override {}
/** Generate output information */
- virtual void GenerateOutputInformation();
+ virtual void GenerateOutputInformation() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
void ClassicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
void BatchThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageDimensionalityReductionFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index dd8f7a6992b1b3898608c90b47ead64db1a45c8a..cfecceb3904ed5ac2282c4a61f07782f23898c5e 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -80,28 +80,28 @@ 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) override;
+ bool CanWriteFile(const std::string & filename) 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;
+ void Save(const std::string & filename, const std::string & name="") override;
+ void Load(const std::string & filename, const std::string & name="") override;
- void Train() ITK_OVERRIDE;
+ void Train() override;
protected:
PCAModel();
- ~PCAModel() ITK_OVERRIDE;
+ ~PCAModel() override;
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const override;
virtual void DoPredictBatch(
const InputListSampleType *,
const unsigned int & startIndex,
const unsigned int & size,
TargetListSampleType *,
- ConfidenceListSampleType * quality = ITK_NULLPTR) const ITK_OVERRIDE;
+ ConfidenceListSampleType * quality = ITK_NULLPTR) const override;
private:
shark::LinearModel<> m_Encoder;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
index d30a2c4663f0e9b44afc66045ffd1bd24b89dffc..4080014b1032602850da11b010e33388cd54281f 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
@@ -43,8 +43,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -61,7 +61,7 @@ public:
protected:
PCAModelFactory();
- ~PCAModelFactory() ITK_OVERRIDE;
+ ~PCAModelFactory() override;
private:
PCAModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 7f6fb2b08e4a4f0a2e443e90549e1a6461b31d10..e7c77a245cd7b408f3687f5b236c6db0c881edcc 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -101,24 +101,24 @@ 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) override;
+ bool CanWriteFile(const std::string & filename) 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="") override;
+ void Load(const std::string & filename, const std::string & name="") override;
- void Train() ITK_OVERRIDE;
+ void Train() override;
protected:
SOMModel();
- ~SOMModel() ITK_OVERRIDE;
+ ~SOMModel() override;
private:
typename MapType::Pointer m_SOMMap;
virtual TargetSampleType DoPredict(
const InputSampleType& input,
- ConfidenceValueType * quality = ITK_NULLPTR) const;
+ ConfidenceValueType * quality = ITK_NULLPTR) const override;
/** Map size (width, height) */
SizeType m_MapSize;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
index 71d314e5f5cad1bcf31ed7de8505d6dd164309bc..3276d635961ae665f73faf7ec2d825d65e496ae8 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
@@ -43,8 +43,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -61,7 +61,7 @@ public:
protected:
SOMModelFactory();
- ~SOMModelFactory() ITK_OVERRIDE;
+ ~SOMModelFactory() override;
private:
SOMModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
index 9a9d277dc411d49911752b7a184630dc9ea3a185..1bb14365c0312f5c6e15c04620e811500233d200 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
@@ -100,11 +100,11 @@ protected:
/** Constructor */
DecisionTree();
/** Destructor */
- ~DecisionTree() ITK_OVERRIDE;
+ ~DecisionTree() override;
/** Output information redefinition */
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DecisionTree(const Self &); // purposely not implemented
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 58472ddf43660af56d8caf9c769932b9e97cd4da..3677f64c12586de80930684ea484c210c11221ad 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -80,21 +80,21 @@ public:
typedef typename CovarianceEstimatorType::MatrixType CovarianceType;
/** Sets the input sample */
- void SetSample(const TSample* sample) ITK_OVERRIDE;
+ void SetSample(const TSample* sample) override;
/** Sets the component's distribution parameters.
* e.g. Then user can call directly Pdf( MeasurementVectorType & ) */
void SetParameters(const ParametersType& parameters);
/** Show the parameters in a minimal form in comparison to PrintSelf */
- void ShowParameters(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void ShowParameters(std::ostream& os, itk::Indent indent) const override;
protected:
GaussianModelComponent();
- ~GaussianModelComponent() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~GaussianModelComponent() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
GaussianModelComponent(const Self &); //purposely not implemented
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
index 620177e5af42420b3a58a0bced7db1abfe82b4ac..ee2eddff5a825d3ee3dde5fe73baeba1336ff100 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
@@ -113,16 +113,16 @@ protected:
/** Constructor */
ImageClassificationFilter();
/** Destructor */
- ~ImageClassificationFilter() ITK_OVERRIDE {}
+ ~ImageClassificationFilter() override {}
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
void ClassicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
void BatchThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageClassificationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index c188f311986629c69234ab870968d5fbada8c459..53a0a83fe5cd4ba9890c074b349ef1140253a28d 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -106,14 +106,14 @@ protected:
/** Constructor */
KMeansImageClassificationFilter();
/** Destructor */
- ~KMeansImageClassificationFilter() ITK_OVERRIDE {}
+ ~KMeansImageClassificationFilter() override {}
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
KMeansImageClassificationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
index 2bfd9177ff00feda39a6c251dc62cb7e75706733..49e409ec8f30a5a0c095a1f77f79424d3c7fc4dc 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
@@ -181,10 +181,10 @@ protected:
MachineLearningModel();
/** Destructor */
- ~MachineLearningModel() ITK_OVERRIDE;
+ ~MachineLearningModel() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Input list sample */
typename InputListSampleType::Pointer m_InputListSample;
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
index 012e0f1d77935bf1fffaed129bebcf8a8492368f..ef2d6f02bf3439949d0ceaee37182f4b7b40ebb8 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
@@ -48,7 +48,7 @@ public:
protected:
MachineLearningModelFactoryBase();
- ~MachineLearningModelFactoryBase() ITK_OVERRIDE;
+ ~MachineLearningModelFactoryBase() override;
static itk::SimpleMutexLock mutex;
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
index a97ba10eb191a99f8195e8126068a8b47d02e86a..0b598f44b5106525ee11506425e64f1038985460 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.h
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
@@ -156,7 +156,7 @@ public:
int AddComponent(int id, ComponentType* component);
/** Runs the optimization process. */
- void Update() ITK_OVERRIDE;
+ void Update() override;
/** Termination status after running optimization */
typedef enum { CONVERGED = 0, NOT_CONVERGED = 1 } TerminationCodeType;
@@ -176,12 +176,12 @@ public:
/* Return the classification result (as an image) */
TOutputImage * GetOutputImage();
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
protected:
SEMClassifier();
- ~SEMClassifier() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SEMClassifier() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Initialize the first segmentation, either randomly or by using
* a ClassLabelVectorType given in SetClassLabels. */
diff --git a/Modules/Learning/Markov/include/otbMRFEnergy.h b/Modules/Learning/Markov/include/otbMRFEnergy.h
index c8acb543851b2ab055171fdd4363142a41e44756..933539d7ce54951d919eae2ef407cc36807fdd83 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergy.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergy.h
@@ -142,7 +142,7 @@ protected:
MRFEnergy() :
m_NumberOfParameters(1),
m_Parameters(0) {};
- ~MRFEnergy() ITK_OVERRIDE {}
+ ~MRFEnergy() override {}
unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
};
@@ -224,7 +224,7 @@ protected:
m_NumberOfParameters(1),
m_Parameters(0)
{};
- ~MRFEnergy() ITK_OVERRIDE {}
+ ~MRFEnergy() override {}
unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
};
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
index d37e5f7655f1ac2f258fba751c9e417be54689ef..5aa6715c913cdb2ada97ef9134ed045700a92533 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
@@ -63,7 +63,7 @@ public:
itkTypeMacro(MRFEnergyEdgeFidelity, MRFEnergy);
- double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) ITK_OVERRIDE
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) override
{
double val1 = static_cast<double>(value1);
double val2 = static_cast<double>(value2);
@@ -74,7 +74,7 @@ public:
protected:
// The constructor and destructor.
MRFEnergyEdgeFidelity() {};
- ~MRFEnergyEdgeFidelity() ITK_OVERRIDE {}
+ ~MRFEnergyEdgeFidelity() override {}
};
}
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
index 574a589e07db16225490b763835181ca8a14c979..5950ad20463eb58a812258ebc738a72dcbe9235e 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
@@ -59,14 +59,14 @@ public:
itkNewMacro(Self);
itkTypeMacro(MRFEnergyFisherClassification, MRFEnergy);
- void SetNumberOfParameters(const unsigned int nParameters) ITK_OVERRIDE
+ void SetNumberOfParameters(const unsigned int nParameters) override
{
Superclass::SetNumberOfParameters(nParameters);
this->m_Parameters.SetSize(nParameters);
this->Modified();
}
- double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2) ITK_OVERRIDE
+ double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2) override
{
if ((unsigned int)value2 >= this->GetNumberOfParameters()/3)
{
@@ -88,7 +88,7 @@ public:
protected:
// The constructor and destructor.
MRFEnergyFisherClassification() {};
- ~MRFEnergyFisherClassification() ITK_OVERRIDE {};
+ ~MRFEnergyFisherClassification() override {};
};
}
#endif
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
index 5670c06c90ab36ab337a31b01762cde54e6b21ad..556e402433eae610c179a650a1b8caadbd1e967a 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
@@ -68,7 +68,7 @@ public:
itkNewMacro(Self);
- double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) ITK_OVERRIDE
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) override
{
return vnl_math_sqr((static_cast<double>(value1))
- (static_cast<double>(value2)));
@@ -81,7 +81,7 @@ protected:
this->m_NumberOfParameters = 0;
this->m_Parameters.SetSize(this->m_NumberOfParameters);
};
- ~MRFEnergyGaussian() ITK_OVERRIDE {}
+ ~MRFEnergyGaussian() override {}
};
}
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
index 09d617587663178aa07a661817b5e714713fbb7b..1864da2897112f894039ddb8213557012b2f1ef4 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
@@ -64,14 +64,14 @@ public:
itkTypeMacro(MRFEnergyGaussianClassification, MRFEnergy);
- void SetNumberOfParameters(const unsigned int nParameters) ITK_OVERRIDE
+ void SetNumberOfParameters(const unsigned int nParameters) override
{
Superclass::SetNumberOfParameters(nParameters);
this->m_Parameters.SetSize(nParameters);
this->Modified();
}
- double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) ITK_OVERRIDE
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) override
{
if ((unsigned int) value2 >= this->GetNumberOfParameters() / 2)
{
@@ -89,7 +89,7 @@ public:
protected:
// The constructor and destructor.
MRFEnergyGaussianClassification() {};
- ~MRFEnergyGaussianClassification() ITK_OVERRIDE {}
+ ~MRFEnergyGaussianClassification() override {}
};
}
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
index 5f41c47a42cacd3e2b24dbee7556b8756e4e54fb..3c54c69179cf229a1c2d6224d00a6715cfd3e927 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
@@ -66,7 +66,7 @@ public:
itkNewMacro(Self);
- double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) ITK_OVERRIDE
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2) override
{
if (value1 != value2)
{
@@ -86,7 +86,7 @@ protected:
this->m_Parameters.SetSize(this->m_NumberOfParameters);
this->m_Parameters[0] = 1.0;
};
- ~MRFEnergyPotts() ITK_OVERRIDE {}
+ ~MRFEnergyPotts() override {}
};
}
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizer.h b/Modules/Learning/Markov/include/otbMRFOptimizer.h
index 110db833e4cb7069f7269f3ac5473190f2afb5b0..65638b0ed270651fab7f68e0a1addfb4367d41ed 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizer.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizer.h
@@ -76,7 +76,7 @@ protected:
MRFOptimizer() :
m_NumberOfParameters(1),
m_Parameters(1) {}
- ~MRFOptimizer() ITK_OVERRIDE {}
+ ~MRFOptimizer() override {}
unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
index f6f777e059a195d238ce22fc456c14e3ba60d21d..4380e161a819dd1f8c2b0d7a0ac1d27dbd960b17 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
@@ -52,7 +52,7 @@ public:
itkTypeMacro(MRFOptimizerICM, MRFOptimizer);
- inline bool Compute(double deltaEnergy) ITK_OVERRIDE
+ inline bool Compute(double deltaEnergy) override
{
if (deltaEnergy < 0)
{
@@ -66,7 +66,7 @@ public:
protected:
MRFOptimizerICM() {}
- ~MRFOptimizerICM() ITK_OVERRIDE {}
+ ~MRFOptimizerICM() override {}
};
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
index 5b7c75d66817354fb5dfc7cb025bed9f1df067aa..f188046bedc75fa776186f26e54592409b402ae8 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
@@ -72,7 +72,7 @@ public:
this->Modified();
}
- inline bool Compute(double deltaEnergy) ITK_OVERRIDE
+ inline bool Compute(double deltaEnergy) override
{
if (deltaEnergy < 0)
{
@@ -112,7 +112,7 @@ protected:
m_Generator = RandomGeneratorType::GetInstance();
m_Generator->SetSeed();
}
- ~MRFOptimizerMetropolis() ITK_OVERRIDE {}
+ ~MRFOptimizerMetropolis() override {}
RandomGeneratorType::Pointer m_Generator;
};
diff --git a/Modules/Learning/Markov/include/otbMRFSampler.h b/Modules/Learning/Markov/include/otbMRFSampler.h
index 74daee5d8407990fc30a79ed0a77a074b99aa38b..bc505d7b1b11f1ba0d19f3ca2df4d118ed4e9038 100644
--- a/Modules/Learning/Markov/include/otbMRFSampler.h
+++ b/Modules/Learning/Markov/include/otbMRFSampler.h
@@ -111,7 +111,7 @@ protected:
m_EnergyRegularization = EnergyRegularizationType::New();
m_EnergyFidelity = EnergyFidelityType::New();
};
- ~MRFSampler() ITK_OVERRIDE {}
+ ~MRFSampler() override {}
};
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
index dc14a7aafb5742b3df403d712ff5a4bb504f23f9..2bd8688102aa8c56767d11e9c3d6b68ce3e4fb93 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
@@ -65,7 +65,7 @@ public:
itkTypeMacro(MRFSamplerMAP, MRFSampler);
inline int Compute(const InputImageNeighborhoodIterator& itData,
- const LabelledImageNeighborhoodIterator& itRegul) ITK_OVERRIDE
+ const LabelledImageNeighborhoodIterator& itRegul) override
{
if (this->m_NumberOfClasses == 0)
{
@@ -103,7 +103,7 @@ public:
protected:
// The constructor and destructor.
MRFSamplerMAP() {};
- ~MRFSamplerMAP() ITK_OVERRIDE {}
+ ~MRFSamplerMAP() override {}
};
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
index d00eb26929cc6f1f33e3f35e5c81dbe7e9f5a296..5f60b4aca9fcc3224f1954ccde5dcb4b7f920815 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
@@ -66,7 +66,7 @@ public:
itkTypeMacro(MRFSamplerRandom, MRFSampler);
- inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul) ITK_OVERRIDE
+ inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul) override
{
this->m_EnergyBefore = this->m_EnergyFidelity->GetValue(itData, itRegul.GetCenterPixel());
this->m_EnergyBefore += this->m_Lambda
@@ -97,7 +97,7 @@ protected:
m_Generator = RandomGeneratorType::GetInstance();
m_Generator->SetSeed();
}
- ~MRFSamplerRandom() ITK_OVERRIDE {}
+ ~MRFSamplerRandom() override {}
private:
RandomGeneratorType::Pointer m_Generator;
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
index 2ebf55bad5e70a728bef5e837dafdde77725bfda..5c37d94230e454c5e6db4b7f6d9f301ededbc358 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
@@ -72,7 +72,7 @@ public:
itkTypeMacro(MRFSamplerRandomMAP, MRFSampler);
- void SetNumberOfClasses(const unsigned int nClasses) ITK_OVERRIDE
+ void SetNumberOfClasses(const unsigned int nClasses) override
{
if ((nClasses != this->m_NumberOfClasses) || (m_EnergiesInvalid == true))
{
@@ -85,7 +85,7 @@ public:
}
}
- inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul) ITK_OVERRIDE
+ inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul) override
{
if (this->m_NumberOfClasses == 0)
{
@@ -166,7 +166,7 @@ protected:
m_Generator = RandomGeneratorType::GetInstance();
m_Generator->SetSeed();
}
- ~MRFSamplerRandomMAP() ITK_OVERRIDE
+ ~MRFSamplerRandomMAP() override
{
if (m_Energy != ITK_NULLPTR) free(m_Energy);
if (m_RepartitionFunction != ITK_NULLPTR) free(m_RepartitionFunction);
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
index 9e5eeed25be7e712b58bc1760094450aa490a57b..1d94c27531460a01eaf81c37536b5bfe6c590c15 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
@@ -319,8 +319,8 @@ public:
protected:
MarkovRandomFieldFilter();
- ~MarkovRandomFieldFilter() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~MarkovRandomFieldFilter() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Allocate memory for labelled images. This is automatically called
* in GenerateData().
@@ -335,10 +335,10 @@ protected:
virtual void ApplyMarkovRandomFieldFilter();
- void GenerateData() ITK_OVERRIDE;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void EnlargeOutputRequestedRegion(itk::DataObject *) ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateData() override;
+ void GenerateInputRequestedRegion() override;
+ void EnlargeOutputRequestedRegion(itk::DataObject *) override;
+ void GenerateOutputInformation() override;
MarkovRandomFieldFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
index c1a5d603294c1c243b6f3e4610a3816e7a8fd04c..5f71f8cac2a6880b7f99c57c2d18824e9090afbd 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
@@ -91,19 +91,19 @@ protected:
/** Constructor */
PeriodicSOM() {}
/** Destructor */
- ~PeriodicSOM() ITK_OVERRIDE {}
+ ~PeriodicSOM() override {}
/** Output information redefinition */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation ();
}
/** Output allocation redefinition */
- void AllocateOutputs() ITK_OVERRIDE
+ void AllocateOutputs() override
{
Superclass::AllocateOutputs();
}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE
+ void GenerateData(void) override
{
Superclass::GenerateData();
}
@@ -113,16 +113,16 @@ protected:
* \param beta The learning coefficient,
* \param radius The radius of the nieghbourhood.
*/
- void UpdateMap(const NeuronType& sample, double beta, SizeType& radius) ITK_OVERRIDE;
+ void UpdateMap(const NeuronType& sample, double beta, SizeType& radius) override;
/**
* Step one iteration.
*/
- void Step(unsigned int currentIteration) ITK_OVERRIDE
+ void Step(unsigned int currentIteration) override
{
Superclass::Step(currentIteration);
}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Learning/SOM/include/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
index 1563b51165ef6dc010dbe3f274bc837b6f74b1ed..56daddf8bb92a601ef3e03402beb51f1ac5d5f01 100644
--- a/Modules/Learning/SOM/include/otbSOM.h
+++ b/Modules/Learning/SOM/include/otbSOM.h
@@ -125,13 +125,13 @@ protected:
/** Constructor */
SOM();
/** Destructor */
- ~SOM() ITK_OVERRIDE;
+ ~SOM() override;
/** Output information redefinition */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Output allocation redefinition */
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/**
* Update the output map with a new sample.
* \param sample The new sample to learn,
@@ -144,7 +144,7 @@ protected:
*/
virtual void Step(unsigned int currentIteration);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SOM(const Self &); // purposely not implemented
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
index 3d3ff3916853f1189e8305f8647a3632fe103b5f..928d7208264f2d4cf2f3295ec2afb7c8a12c9830 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
@@ -74,11 +74,11 @@ protected:
/** Constructor */
SOMActivationBuilder();
/** Destructor */
- ~SOMActivationBuilder() ITK_OVERRIDE;
+ ~SOMActivationBuilder() override;
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SOMActivationBuilder(const Self &); // purposely not implemented
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
index 6bc0e09701b01c8bda198bf2483bfd2c0286cd2f..55027d4435a73a54db0114e79ffc6de10042c4cc 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.h
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.h
@@ -88,11 +88,11 @@ protected:
/** Constructor */
SOMClassifier();
/** Destructor */
- ~SOMClassifier() ITK_OVERRIDE {}
+ ~SOMClassifier() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Starts the classification process */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
/// The input sample
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index 2d1dbb35f28a582398e0bbc747925076492fd331..08bbb8bf059b18b135aa782fbbd555e283abbc43 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -104,14 +104,14 @@ protected:
/** Constructor */
SOMImageClassificationFilter();
/** Destructor */
- ~SOMImageClassificationFilter() ITK_OVERRIDE {}
+ ~SOMImageClassificationFilter() override {}
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SOMImageClassificationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/SOM/include/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
index 662d782b07c72fc0cfbba6457d312914f75ecb49..160a38e29950dcec7f73800b642aac400e5da424 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.h
+++ b/Modules/Learning/SOM/include/otbSOMMap.h
@@ -92,9 +92,9 @@ protected:
/** Constructor */
SOMMap();
/** Destructor */
- ~SOMMap() ITK_OVERRIDE;
+ ~SOMMap() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SOMMap(const Self &); // purposely not implemented
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
index aadcbe20fedd2a380d61106dd7d9dc718c6897e9..02fba263c4041ced10533b1f1fb89d14eac7f520 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
@@ -81,34 +81,34 @@ protected:
/** Constructor */
SOMWithMissingValue ();
/** Destructor */
- ~SOMWithMissingValue() ITK_OVERRIDE;
+ ~SOMWithMissingValue() override;
/** Output information redefinition */
- void GenerateOutputInformation() ITK_OVERRIDE
+ void GenerateOutputInformation() override
{
Superclass::GenerateOutputInformation ();
}
/** Output allocation redefinition */
- void AllocateOutputs() ITK_OVERRIDE
+ void AllocateOutputs() override
{
Superclass::AllocateOutputs();
}
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE
+ void GenerateData(void) override
{
Superclass::GenerateData();
}
/**
* Update the output map with a new sample, depending on the availability of the data
*/
- void UpdateMap(const NeuronType& sample, double beta, SizeType& radius) ITK_OVERRIDE;
+ void UpdateMap(const NeuronType& sample, double beta, SizeType& radius) override;
/** Step one iteration. */
- void Step(unsigned int currentIteration) ITK_OVERRIDE
+ void Step(unsigned int currentIteration) override
{
Superclass::Step(currentIteration);
}
/** PrintSelf method */
-void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
index 7e9105ad1fbd1e0158fa0ee8bd95001eaf3c1392..f33342d6a1d305922fff1c59454b024ccf941ce2 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
@@ -144,10 +144,10 @@ public:
protected:
// throw the Map to the functor
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
SOMbasedImageFilter ();
- ~SOMbasedImageFilter () ITK_OVERRIDE {}
+ ~SOMbasedImageFilter () override {}
private:
SOMbasedImageFilter (const Self &);
diff --git a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
index c36b029b1c5d73ef8a4b5ec940f07abcad7917ff..d7c32c9d18bb2c33e98a2dcb5cb8a68f2d22d842 100644
--- a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
+++ b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
@@ -73,10 +73,10 @@ public:
/** Get the output samples OGR container */
ogr::DataSource* GetOutputSamples();
- void Synthetize(void) ITK_OVERRIDE{}
+ void Synthetize(void) override{}
/** Reset method called before starting the streaming*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
itkSetMacro(SampleFieldPrefix, std::string);
itkGetMacro(SampleFieldPrefix, std::string);
@@ -91,14 +91,14 @@ protected:
/** Constructor */
PersistentImageSampleExtractorFilter();
/** Destructor */
- ~PersistentImageSampleExtractorFilter() ITK_OVERRIDE {}
+ ~PersistentImageSampleExtractorFilter() override {}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** process only points */
- void ThreadedGenerateVectorData(const ogr::Layer& layerForThread, itk::ThreadIdType threadid) ITK_OVERRIDE;
+ void ThreadedGenerateVectorData(const ogr::Layer& layerForThread, itk::ThreadIdType threadid) override;
private:
PersistentImageSampleExtractorFilter(const Self &); //purposely not implemented
@@ -178,7 +178,7 @@ protected:
/** Constructor */
ImageSampleExtractorFilter() {}
/** Destructor */
- ~ImageSampleExtractorFilter() ITK_OVERRIDE {}
+ ~ImageSampleExtractorFilter() override {}
private:
ImageSampleExtractorFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
index f7e03efd3632e77d8620e219984c504423ac65f6..0b34b436e2d406158f3806f1cbab4308a200946f 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
@@ -67,10 +67,10 @@ public:
/** Runtime information support. */
itkTypeMacro(PersistentOGRDataToClassStatisticsFilter, PersistentSamplingFilterBase);
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
/** Reset method called before starting the streaming*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/** the class count map is stored as output #2 */
const ClassCountObjectType* GetClassCountOutput() const;
@@ -82,24 +82,24 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
protected:
/** Constructor */
PersistentOGRDataToClassStatisticsFilter();
/** Destructor */
- ~PersistentOGRDataToClassStatisticsFilter() ITK_OVERRIDE {}
+ ~PersistentOGRDataToClassStatisticsFilter() override {}
/** Implement generic method called at each candidate position */
void ProcessSample(const ogr::Feature& feature,
typename TInputImage::IndexType& imgIndex,
typename TInputImage::PointType& imgPoint,
- itk::ThreadIdType& threadid) ITK_OVERRIDE;
+ itk::ThreadIdType& threadid) override;
/** Prepare temporary variables for the current feature */
void PrepareFeature(const ogr::Feature& feature,
- itk::ThreadIdType& threadid) ITK_OVERRIDE;
+ itk::ThreadIdType& threadid) override;
private:
PersistentOGRDataToClassStatisticsFilter(const Self &); //purposely not implemented
@@ -183,7 +183,7 @@ protected:
/** Constructor */
OGRDataToClassStatisticsFilter() {}
/** Destructor */
- ~OGRDataToClassStatisticsFilter() ITK_OVERRIDE {}
+ ~OGRDataToClassStatisticsFilter() override {}
private:
OGRDataToClassStatisticsFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
index 8393766bcb81489c5e2582e2b1a38bb8912a4251..5b1364e277a56a1b3fbd079ce987ea6cfad0416a 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
@@ -88,10 +88,10 @@ public:
/** Runtime information support. */
itkTypeMacro(PersistentOGRDataToSamplePositionFilter, PersistentSamplingFilterBase);
- void Synthetize(void) ITK_OVERRIDE{}
+ void Synthetize(void) override{}
/** Reset method called before starting the streaming*/
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
/** Get a reference to the internal samplers at a given level */
SamplerMapType& GetSamplers(unsigned int level);
@@ -115,7 +115,7 @@ public:
/** Make a DataObject of the correct type to be used as the specified
* output. */
- itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ itk::DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
/** Get/Set of the field name storing the original FID of each sample */
@@ -126,21 +126,21 @@ protected:
/** Constructor */
PersistentOGRDataToSamplePositionFilter();
/** Destructor */
- ~PersistentOGRDataToSamplePositionFilter() ITK_OVERRIDE {}
+ ~PersistentOGRDataToSamplePositionFilter() override {}
/** Call samplers on a current position, for a given class */
void ProcessSample(const ogr::Feature& feature,
typename TInputImage::IndexType& imgIndex,
typename TInputImage::PointType& imgPoint,
- itk::ThreadIdType& threadid) ITK_OVERRIDE;
+ itk::ThreadIdType& threadid) override;
/** Method to split the input OGRDataSource
* according to the class partition
*/
- void DispatchInputVectors(void) ITK_OVERRIDE;
+ void DispatchInputVectors(void) override;
/** Fill the output vectors with a special ordering (class partition) */
- void FillOneOutput(unsigned int outIdx, ogr::DataSource* outDS, bool update) ITK_OVERRIDE;
+ void FillOneOutput(unsigned int outIdx, ogr::DataSource* outDS, bool update) override;
private:
PersistentOGRDataToSamplePositionFilter(const Self &); //purposely not implemented
@@ -259,7 +259,7 @@ protected:
/** Constructor */
OGRDataToSamplePositionFilter() {}
/** Destructor */
- ~OGRDataToSamplePositionFilter() ITK_OVERRIDE {}
+ ~OGRDataToSamplePositionFilter() override {}
private:
OGRDataToSamplePositionFilter(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
index bb3b0ac40623ccd7766562f13755ad3e18cae45d..6c8e2ab53cadc6647ee923ca0d419dbe90ce595f 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
@@ -97,21 +97,21 @@ protected:
/** Constructor */
PersistentSamplingFilterBase();
/** Destructor */
- ~PersistentSamplingFilterBase() ITK_OVERRIDE {}
+ ~PersistentSamplingFilterBase() override {}
/** Use the same output information as input image, check the field index
* and the mask footprint */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Use an empty region to input image (pixel values not needed) and set
* the requested region for the mask */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Generate data should thread over */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Allocate in-memory layers for input and outputs */
- void AllocateOutputs(void) ITK_OVERRIDE;
+ void AllocateOutputs(void) override;
/** Start of main processing loop */
virtual void ThreadedGenerateVectorData(const ogr::Layer& layerForThread, itk::ThreadIdType threadid);
diff --git a/Modules/Learning/Sampling/include/otbSamplingRateCalculator.h b/Modules/Learning/Sampling/include/otbSamplingRateCalculator.h
index f391a23410e50999e7af7f937427e8779d5c9efa..e16e8a9a48447e453cf2c70e69b4c881eb1c19fb 100644
--- a/Modules/Learning/Sampling/include/otbSamplingRateCalculator.h
+++ b/Modules/Learning/Sampling/include/otbSamplingRateCalculator.h
@@ -110,10 +110,10 @@ protected:
SamplingRateCalculator();
/** Destructor */
- ~SamplingRateCalculator() ITK_OVERRIDE {}
+ ~SamplingRateCalculator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SamplingRateCalculator(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Sampling/include/otbSamplingRateCalculatorList.h b/Modules/Learning/Sampling/include/otbSamplingRateCalculatorList.h
index 56dc647b53c2d0661881185e9e3c58e880184571..7bc78c188d8e0be07a8da44b22547bb4a8138f15 100644
--- a/Modules/Learning/Sampling/include/otbSamplingRateCalculatorList.h
+++ b/Modules/Learning/Sampling/include/otbSamplingRateCalculatorList.h
@@ -98,7 +98,7 @@ protected:
SamplingRateCalculatorList(){}
/** Destructor */
- ~SamplingRateCalculatorList() ITK_OVERRIDE {}
+ ~SamplingRateCalculatorList() override {}
private:
SamplingRateCalculatorList(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
index ec96746f6db0a8646b4fef008ca8ec6fa9194bf4..36c22666d5e6f71fcedad011e8bac219d93c0ba6 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
@@ -99,21 +99,21 @@ public:
itkSetMacro(MaxDepth, int);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -121,14 +121,14 @@ protected:
BoostMachineLearningModel();
/** Destructor */
- ~BoostMachineLearningModel() ITK_OVERRIDE;
+ ~BoostMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
BoostMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
index 2344f857b1b3794bcbc77224dec7f290fe70f0fc..909dc5e84cdecae0274f55395e8af0578b9476a4 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
BoostMachineLearningModelFactory();
- ~BoostMachineLearningModelFactory() ITK_OVERRIDE;
+ ~BoostMachineLearningModelFactory() override;
private:
BoostMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
index 465b0ae9a30a2024cb3384a2b9181fa8c51ad0ad..6db693ce26b5ba6e02708e2adcd6d05ef24d6561 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
@@ -137,8 +137,8 @@ public:
protected:
ConfusionMatrixCalculator();
- ~ConfusionMatrixCalculator() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ConfusionMatrixCalculator() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
index 2b50388427368260acf538453d8da67d37151d3a..96790db5a8b7bee3ae20d470769fd05cd3423f61 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
@@ -143,7 +143,7 @@ public:
protected:
ConfusionMatrixMeasurements();
- ~ConfusionMatrixMeasurements() ITK_OVERRIDE {}
+ ~ConfusionMatrixMeasurements() override {}
//void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h b/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
index a3874b1c5fa0d278ba755bf7117fe74f4ae4eab7..7ec589690132e0d9527ceb476191df11eedb3469 100644
--- a/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
+++ b/Modules/Learning/Supervised/include/otbCvRTreesWrapper.h
@@ -42,7 +42,7 @@ class OTBSupervised_EXPORT CvRTreesWrapper
public:
typedef std::vector<unsigned int> VotesVectorType;
CvRTreesWrapper();
- ~CvRTreesWrapper() ITK_OVERRIDE;
+ ~CvRTreesWrapper() override;
/** Compute the number of votes for each class. */
void get_votes(const cv::Mat& sample,
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
index 260fc835c79e2aaca65625e7928e3d8ffd122c50..fc47f214052ff9a2f1aebdcd4181d4118181b0f6 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
@@ -154,21 +154,21 @@ public:
}
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -176,13 +176,13 @@ protected:
DecisionTreeMachineLearningModel();
/** Destructor */
- ~DecisionTreeMachineLearningModel() ITK_OVERRIDE;
+ ~DecisionTreeMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DecisionTreeMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
index 1c73cf6de6cb4d577dcea62f8e367a5631d2c116..5635cee32dfb2b77420992ea988f3610359b7061 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
DecisionTreeMachineLearningModelFactory();
- ~DecisionTreeMachineLearningModelFactory() ITK_OVERRIDE;
+ ~DecisionTreeMachineLearningModelFactory() override;
private:
DecisionTreeMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbExhaustiveExponentialOptimizer.h b/Modules/Learning/Supervised/include/otbExhaustiveExponentialOptimizer.h
index cae5fb092d593407aa0855a1e62cb6a7b249d397..ae1c135e0a6e5e21e99bc451890078e53509704a 100644
--- a/Modules/Learning/Supervised/include/otbExhaustiveExponentialOptimizer.h
+++ b/Modules/Learning/Supervised/include/otbExhaustiveExponentialOptimizer.h
@@ -61,7 +61,7 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(ExhaustiveExponentialOptimizer,itk::SingleValuedNonLinearOptimizer);
- void StartOptimization(void) ITK_OVERRIDE;
+ void StartOptimization(void) override;
void StartWalking(void);
void ResumeWalking(void);
@@ -83,8 +83,8 @@ public:
protected:
ExhaustiveExponentialOptimizer();
- ~ExhaustiveExponentialOptimizer() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ExhaustiveExponentialOptimizer() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Advance to the next grid position. */
void AdvanceOneStep(void);
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
index 4ff453acb0cbd60ba029ff86846e3e072b59e6e9..19bbab10de3dc89a7bb5e5f9a287f19340f3fa59 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
@@ -105,21 +105,21 @@ public:
itkSetMacro(UseSurrogates, bool);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -127,14 +127,14 @@ protected:
GradientBoostedTreeMachineLearningModel();
/** Destructor */
- ~GradientBoostedTreeMachineLearningModel() ITK_OVERRIDE;
+ ~GradientBoostedTreeMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GradientBoostedTreeMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
index 7d4d1faad88822285bac50fed67eea52d22883ce..4cc7203d881ee85a7ec69dee818383497738016d 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
@@ -46,8 +46,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -64,7 +64,7 @@ public:
protected:
GradientBoostedTreeMachineLearningModelFactory();
- ~GradientBoostedTreeMachineLearningModelFactory() ITK_OVERRIDE;
+ ~GradientBoostedTreeMachineLearningModelFactory() override;
private:
GradientBoostedTreeMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
index 069ff1eb47b7570f08aba5592ede2e4da8ef49ab..d23411d923b324b843f53556149e68f3fd811bb6 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
@@ -79,21 +79,21 @@ public:
itkSetMacro(DecisionRule, int);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -101,14 +101,14 @@ protected:
KNearestNeighborsMachineLearningModel();
/** Destructor */
- ~KNearestNeighborsMachineLearningModel() ITK_OVERRIDE;
+ ~KNearestNeighborsMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
KNearestNeighborsMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
index acb79f0543da6f355d8aa644e6a563e5ebc6ac91..717a09313e1f3d77cd20ab07b7e99817a53a9b76 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
KNearestNeighborsMachineLearningModelFactory();
- ~KNearestNeighborsMachineLearningModelFactory() ITK_OVERRIDE;
+ ~KNearestNeighborsMachineLearningModelFactory() override;
private:
KNearestNeighborsMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
index 75dc291f3df947dbe9a9ab6d45d4fca8ccd73470..51f102b96c175b8b59521c1e391d64ff41dc085e 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
@@ -89,11 +89,11 @@ public:
protected:
LabelMapClassifier();
- ~LabelMapClassifier() ITK_OVERRIDE {};
+ ~LabelMapClassifier() override {};
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
- void ReleaseInputs() ITK_OVERRIDE;
+ void ReleaseInputs() override;
private:
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
index 329722af5a2dd5d971f6dfaa0f86ef29be3dc188..8d96b2a179bf7ea9aa541bacb2edd4a5b68a64cc 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
@@ -64,21 +64,21 @@ public:
itkTypeMacro(SVMMachineLearningModel, MachineLearningModel);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string &filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string &filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
#define otbSetSVMParameterMacro(name, alias, type) \
@@ -269,13 +269,13 @@ protected:
LibSVMMachineLearningModel();
/** Destructor */
- ~LibSVMMachineLearningModel() ITK_OVERRIDE;
+ ~LibSVMMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LibSVMMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
index 288573e7356dc0b07a828435f4a5b4d146737b69..08bd6c767e7dbe4c7a7b7c34495f3c5ed38f8a54 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
@@ -42,8 +42,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -60,7 +60,7 @@ public:
protected:
LibSVMMachineLearningModelFactory();
- ~LibSVMMachineLearningModelFactory() ITK_OVERRIDE;
+ ~LibSVMMachineLearningModelFactory() override;
private:
LibSVMMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
index 5339802b1d8ae90915e2ffb506a4e5f9dcc6ce77..67ef0758cb98e450695371dbf26c30c2b7e6045d 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
@@ -60,7 +60,7 @@ public:
protected:
MachineLearningModelFactory();
- ~MachineLearningModelFactory() ITK_OVERRIDE;
+ ~MachineLearningModelFactory() override;
private:
MachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
index 3253c23686fcd46e2afcf513546518ade051cb6f..44a1bad5856c67d36ec0f75053212c3eac532a3a 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
@@ -153,21 +153,21 @@ public:
itkSetMacro(Epsilon, double);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -175,15 +175,15 @@ protected:
NeuralNetworkMachineLearningModel();
/** Destructor */
- ~NeuralNetworkMachineLearningModel() ITK_OVERRIDE;
+ ~NeuralNetworkMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
void LabelsToMat(const TargetListSampleType * listSample, cv::Mat & output);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
NeuralNetworkMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
index af6c7b0a265d4bd3ac45a09823997b359efec594..ad8f1dce904e94a8fa317f8410efdf58e3d29e3b 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
NeuralNetworkMachineLearningModelFactory();
- ~NeuralNetworkMachineLearningModelFactory() ITK_OVERRIDE;
+ ~NeuralNetworkMachineLearningModelFactory() override;
private:
NeuralNetworkMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
index 0b1ddc2c3c03512cd482f88fdb0dd330959aa6d4..da1ae46c05e52e6e4029acba01e9ea7c894f0e98 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
@@ -59,21 +59,21 @@ public:
itkTypeMacro(NormalBayesMachineLearningModel, MachineLearningModel);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
protected:
@@ -81,14 +81,14 @@ protected:
NormalBayesMachineLearningModel();
/** Destructor */
- ~NormalBayesMachineLearningModel() ITK_OVERRIDE;
+ ~NormalBayesMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
NormalBayesMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
index 517b93cfefc2978f8f838cd5493bbd4712ae82b9..13306b5b8217b644b6941cf8ba6eb3499eba6d7e 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
NormalBayesMachineLearningModelFactory();
- ~NormalBayesMachineLearningModelFactory() ITK_OVERRIDE;
+ ~NormalBayesMachineLearningModelFactory() override;
private:
NormalBayesMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
index 04bbbca95184da9f4406f8c902349ba8301adb17..4dd7f0c828d144b41d957dbeacaccaee2359bbb5 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
@@ -64,21 +64,21 @@ public:
itkTypeMacro(RandomForestsMachineLearningModel, MachineLearningModel);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
//Setters of RT parameters (documentation get from opencv doxygen 2.4)
@@ -135,14 +135,14 @@ protected:
RandomForestsMachineLearningModel();
/** Destructor */
- ~RandomForestsMachineLearningModel() ITK_OVERRIDE;
+ ~RandomForestsMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/* /\** Input list sample *\/ */
/* typename InputListSampleType::Pointer m_InputListSample; */
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
index f84f937213eb7e7bfb5fd052fd16c85febbd9090..92dd605664f8ad8cb3fc7c9aa8ccfe56208c608d 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
RandomForestsMachineLearningModelFactory();
- ~RandomForestsMachineLearningModelFactory() ITK_OVERRIDE;
+ ~RandomForestsMachineLearningModelFactory() override;
private:
RandomForestsMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
index ceb76a148636d70d4dd3d0b3b836de2c6cb36d87..4056c47c5466322ebfe0eadbd912957208dd2a82 100644
--- a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
+++ b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
@@ -82,19 +82,19 @@ public:
itkGetMacro(DerivativeStep, ParametersValueType);
/** \return The accuracy value corresponding the parameters */
- MeasureType GetValue(const ParametersType& parameters) const ITK_OVERRIDE;
+ MeasureType GetValue(const ParametersType& parameters) const override;
/** \return The accuracy derivative corresponding to the parameters */
- void GetDerivative(const ParametersType& parameters, DerivativeType& derivative) const ITK_OVERRIDE;
+ void GetDerivative(const ParametersType& parameters, DerivativeType& derivative) const override;
/** \return the number of parameters to optimize */
- unsigned int GetNumberOfParameters(void) const ITK_OVERRIDE;
+ unsigned int GetNumberOfParameters(void) const override;
protected:
/// Constructor
SVMCrossValidationCostFunction();
/// Destructor
- ~SVMCrossValidationCostFunction() ITK_OVERRIDE;
+ ~SVMCrossValidationCostFunction() override;
/** Update svm parameters struct according to the input parameters
*/
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
index 07059be9b8c0a0a42f78f8fc9753da1e365c8a5b..d0c36eeb3b55eb7d5acc60d16c454a9ba4bfffa9 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
@@ -66,21 +66,21 @@ public:
itkTypeMacro(SVMMachineLearningModel, MachineLearningModel);
/** Train the machine learning model */
- void Train() ITK_OVERRIDE;
+ void Train() override;
/** Save the model to file */
- void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ bool CanWriteFile(const std::string &) override;
//@}
//Setters/Getters to SVM model
@@ -138,14 +138,14 @@ protected:
SVMMachineLearningModel();
/** Destructor */
- ~SVMMachineLearningModel() ITK_OVERRIDE;
+ ~SVMMachineLearningModel() override;
/** Predict values using the model */
- TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SVMMachineLearningModel(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
index 7ea10ad559302084c942088f35a3b3651b727edd..07ab9b744de2b5e735d4996775ec5f2319e645ea 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
@@ -44,8 +44,8 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE;
- const char* GetDescription(void) const ITK_OVERRIDE;
+ const char* GetITKSourceVersion(void) const override;
+ const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
@@ -62,7 +62,7 @@ public:
protected:
SVMMachineLearningModelFactory();
- ~SVMMachineLearningModelFactory() ITK_OVERRIDE;
+ ~SVMMachineLearningModelFactory() override;
private:
SVMMachineLearningModelFactory(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
index c6a3ae1daedefaeb20b5701150675f2c04a98ae4..ab02a0f7b5a08c81782ea7f9d1dccc4ed5d22af3 100644
--- a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
+++ b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
@@ -86,11 +86,11 @@ public:
protected:
SVMMarginSampler();
- ~SVMMarginSampler() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SVMMarginSampler() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Starts the classification process */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
virtual void DoMarginSampling();
private:
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 8d2c0c81233c5e5486ec8068f86298a2f7053ab8..7dd41d6eed22208d512ecf0e5d4eb5116f2bf5c0 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -83,21 +83,21 @@ public:
itkTypeMacro(SharkRandomForestsMachineLearningModel, MachineLearningModel);
/** Train the machine learning model */
- virtual void Train() ITK_OVERRIDE;
+ virtual void Train() override;
/** Save the model to file */
- virtual void Save(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ virtual void Save(const std::string & filename, const std::string & name="") override;
/** Load the model from file */
- virtual void Load(const std::string & filename, const std::string & name="") ITK_OVERRIDE;
+ virtual void Load(const std::string & filename, const std::string & name="") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- virtual bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ virtual bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- virtual bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ virtual bool CanWriteFile(const std::string &) override;
//@}
/** From Shark doc: Get the number of trees to grow.*/
@@ -142,13 +142,13 @@ protected:
virtual ~SharkRandomForestsMachineLearningModel();
/** Predict values using the model */
- virtual TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const ITK_OVERRIDE;
+ virtual TargetSampleType DoPredict(const InputSampleType& input, ConfidenceValueType *quality=ITK_NULLPTR) const override;
- virtual void DoPredictBatch(const InputListSampleType *, const unsigned int & startIndex, const unsigned int & size, TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const ITK_OVERRIDE;
+ virtual void DoPredictBatch(const InputListSampleType *, const unsigned int & startIndex, const unsigned int & size, TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const 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..756d5102a129921f31e9cb4f371307e631abd3d3 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 override;
+ virtual const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerTest.cxx b/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerTest.cxx
index c818411586fcb2f092249eabceaadb4f7e46704f..1b0dec3f6343262b31da825a4a75728d057dc23a 100644
--- a/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerTest.cxx
+++ b/Modules/Learning/Supervised/test/otbExhaustiveExponentialOptimizerTest.cxx
@@ -72,7 +72,7 @@ public:
};
/** \return The accuracy value corresponding the parameters */
- MeasureType GetValue(const ParametersType& parameters) const ITK_OVERRIDE
+ MeasureType GetValue(const ParametersType& parameters) const override
{
return static_cast<MeasureType> ( m_FunctionInternalParameters.GetElement(0) * parameters.GetElement(0) * parameters.GetElement(0) +
m_FunctionInternalParameters.GetElement(1) * parameters.GetElement(1) * parameters.GetElement(1) +
@@ -83,10 +83,10 @@ public:
};
/** \return the number of parameters to optimize */
- unsigned int GetNumberOfParameters(void) const ITK_OVERRIDE {return 2; };
+ unsigned int GetNumberOfParameters(void) const override {return 2; };
/** \return The accuracy derivative corresponding to the parameters */
- void GetDerivative(const ParametersType& itkNotUsed(parameters), DerivativeType& itkNotUsed(derivative)) const ITK_OVERRIDE {};
+ void GetDerivative(const ParametersType& itkNotUsed(parameters), DerivativeType& itkNotUsed(derivative)) const override {};
/// Constructor
Quadratic2DCostFunction()
@@ -95,7 +95,7 @@ public:
m_FunctionInternalParameters.Fill(0.0);
};
/// Destructor
- ~Quadratic2DCostFunction() ITK_OVERRIDE{};
+ ~Quadratic2DCostFunction() override{};
private:
Quadratic2DCostFunction(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTable.h b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
index b27436a03c3f23f876e1324fdad04735dcdc5daa..f7d1b101834fcd4bc8a0275259953f7ce875e597 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTable.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
@@ -137,8 +137,8 @@ protected:
{
SetLabels(LabelList(), LabelList());
}
- ~ContingencyTable() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent itkNotUsed(indent)) const ITK_OVERRIDE
+ ~ContingencyTable() override {}
+ void PrintSelf(std::ostream& os, itk::Indent itkNotUsed(indent)) const override
{
os << *this;
}
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
index b8d8d924af49ed402c70cad906854560f0f4e9db..614146a8ee97413693fedc04d19efd10e89bfd12 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
@@ -83,8 +83,8 @@ public:
protected:
ContingencyTableCalculator();
- ~ContingencyTableCalculator() ITK_OVERRIDE {}
- //void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ContingencyTableCalculator() override {}
+ //void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ContingencyTableCalculator(const Self &); //purposely not implemented
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index ef74d52f4063a3cca332312c14bb4cbac0c95d57..a060046c61a269f2775ddce6de1b61e829fb47d3 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -90,21 +90,21 @@ public:
itkTypeMacro( SharkKMeansMachineLearningModel, MachineLearningModel );
/** Train the machine learning model */
- virtual void Train() ITK_OVERRIDE;
+ virtual void Train() override;
/** Save the model to file */
- virtual void Save(const std::string &filename, const std::string &name = "") ITK_OVERRIDE;
+ virtual void Save(const std::string &filename, const std::string &name = "") override;
/** Load the model from file */
- virtual void Load(const std::string &filename, const std::string &name = "") ITK_OVERRIDE;
+ virtual void Load(const std::string &filename, const std::string &name = "") override;
/**\name Classification model file compatibility tests */
//@{
/** Is the input model file readable and compatible with the corresponding classifier ? */
- virtual bool CanReadFile(const std::string &) ITK_OVERRIDE;
+ virtual bool CanReadFile(const std::string &) override;
/** Is the input model file writable and compatible with the corresponding classifier ? */
- virtual bool CanWriteFile(const std::string &) ITK_OVERRIDE;
+ virtual bool CanWriteFile(const std::string &) override;
//@}
/** Get the maximum number of iteration for the kMeans algorithm.*/
@@ -130,17 +130,17 @@ protected:
/** Predict values using the model */
virtual TargetSampleType
- DoPredict(const InputSampleType &input, ConfidenceValueType *quality = ITK_NULLPTR) const ITK_OVERRIDE;
+ DoPredict(const InputSampleType &input, ConfidenceValueType *quality = ITK_NULLPTR) const override;
virtual void DoPredictBatch(const InputListSampleType *, const unsigned int &startIndex, const unsigned int &size,
- TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const ITK_OVERRIDE;
+ TargetListSampleType *, ConfidenceListSampleType * = ITK_NULLPTR) const override;
template<typename DataType>
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 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..05365b8ff757c959d6a83be96cb6447b9082aca1 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 override;
+ virtual const char* GetDescription(void) const override;
/** Method for class instantiation. */
itkFactorylessNewMacro(Self);
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
index c404d25d5025001edf111dbcd91a003a1f76c493..f008e22bbb46c34eb77b2c8fafb464a68f5bb4dd 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
@@ -214,7 +214,7 @@ public:
const InputImageType* GetInput();
/** Does the real work. */
- virtual void Update();
+ virtual void Update() override;
/** SimpleParallelTiffWriter Methods */
virtual void SetFileName(const char* extendedFileName);
@@ -255,7 +255,7 @@ public:
protected:
SimpleParallelTiffWriter();
virtual ~SimpleParallelTiffWriter();
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SimpleParallelTiffWriter(const SimpleParallelTiffWriter &); //purposely not implemented
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index e14f374ca460b3b9e4e9663d7244c0e38784e9c8..2a31c34c090029160be7dd9699af03f7064d0f64 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -73,9 +73,9 @@ protected:
/** Constructor */
ImageListToRCC8GraphFilter();
/** Destructor */
- ~ImageListToRCC8GraphFilter() ITK_OVERRIDE {}
+ ~ImageListToRCC8GraphFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageListToRCC8GraphFilter(const Self &); //purposely not implemented
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
index 345de1067adb8c82f885d82b42fb5d9e24754c03..16e7b2196077732e056fd8852eee4c97c90e26be 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -84,11 +84,11 @@ protected:
/** Constructor */
ImageMultiSegmentationToRCC8GraphFilter();
/** Destructor */
- ~ImageMultiSegmentationToRCC8GraphFilter() ITK_OVERRIDE;
+ ~ImageMultiSegmentationToRCC8GraphFilter() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Get the composition knowledge.
* \param r1 First RCC8 relation value,
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
index c1778371ffac67684a0a6453de193ba322f7c3ad..7e074277a8fbebcaf41d6019a9a2e3862761d8f4 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
@@ -118,7 +118,7 @@ protected:
/** Constructor */
ImageToImageRCC8Calculator();
/** Destructor */
- ~ImageToImageRCC8Calculator() ITK_OVERRIDE {}
+ ~ImageToImageRCC8Calculator() override {}
/**
* Compute the minimal image region required.
* \return The minimal region required.
@@ -173,9 +173,9 @@ protected:
*/
BoolImagePointerType ConvertToBoolImage(ImagePointerType image, PixelType insideValue);
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The RCC8 relation value */
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index aab4a679ccebe9f4a579fe7ff2216a5b67ae19b3..2dd119d9468bd6dca88f7628522be09f9b30d1fb 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -123,9 +123,9 @@ protected:
/** Constructor */
PolygonListToRCC8GraphFilter();
/** Destructor */
- ~PolygonListToRCC8GraphFilter() ITK_OVERRIDE;
+ ~PolygonListToRCC8GraphFilter() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Multi-threading implementation */
@@ -151,7 +151,7 @@ protected:
/** End Multi-threading implementation */
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Get the composition knowledge.
* \param r1 First RCC8 relation value,
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
index 5c27c5f8d27d38c758fec6e41809d13d1c2fa7b1..4f81008a0805c8209d4d1102b46a9e24c731a35c 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
@@ -109,9 +109,9 @@ protected:
/** Constructor */
PolygonToPolygonRCC8Calculator();
/** Destructor */
- ~PolygonToPolygonRCC8Calculator() ITK_OVERRIDE {}
+ ~PolygonToPolygonRCC8Calculator() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The RCC8 relation value */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Edge.h b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
index 9dfb9005dd62f515d1920417b68a2da614d323ca..58490e89c5e8802e4daa925bd93dd9eb19c784b2 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Edge.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
@@ -56,9 +56,9 @@ protected:
/** Constructor */
RCC8Edge();
/** Desctructor */
- ~RCC8Edge() ITK_OVERRIDE {}
+ ~RCC8Edge() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The RCC8 value */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
index 4130636425a910746b0b4db13a1071afb47be85c..fc1f7f965f24d5faf6b300ce7674508896efeb8b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
@@ -127,9 +127,9 @@ protected:
/** Constructor */
RCC8Graph();
/** Destructor */
- ~RCC8Graph() ITK_OVERRIDE {}
+ ~RCC8Graph() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Initialize a range of vertex.
* \param num The index of the last vertices to initialize.
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
index 08d8bf3a1e8ac1751f75a86d4d170e862a7028f6..31879d4809a74994ce2b32d390a8dd26e632f678 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
@@ -92,9 +92,9 @@ protected:
/** Constructor */
RCC8GraphFileReader();
/** Destructor */
- ~RCC8GraphFileReader() ITK_OVERRIDE;
+ ~RCC8GraphFileReader() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/**
* Parse edge information from a given line.
* \param line The line to parse.
@@ -107,7 +107,7 @@ protected:
void ParseVertex(const std::string& line);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** File name */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index 010e42fe0ad0fdfe89900bd3333044e4bd737b32..f9c893cb519a32412e46e24add0f690760ca973b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -107,17 +107,17 @@ public:
/**
* Update method.
*/
- void Update(void) ITK_OVERRIDE;
+ void Update(void) override;
protected:
/** Constructor */
RCC8GraphFileWriter();
/** Destructor */
- ~RCC8GraphFileWriter() ITK_OVERRIDE;
+ ~RCC8GraphFileWriter() override;
/**
* Main computation method.
*/
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/**
* Write Method.
* Performs checkings and invoke GenerateData().
@@ -143,7 +143,7 @@ protected:
/**
* PrintSelf method
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** Filename of the graph file to write */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
index 0c4acf40b0ca0d4f474b6a89efdbfddddcc3ec32..a70f4bcf6a9a3656073ed48bff4636060cba74fb 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
@@ -57,9 +57,9 @@ protected:
/** Constructor */
RCC8GraphSource();
/** Destructor */
- ~RCC8GraphSource() ITK_OVERRIDE {}
+ ~RCC8GraphSource() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RCC8GraphSource(const Self &); //purposely not implemented
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
index a7c02a152d52842770c23fdce32d68d6ad13e767..b432ded5499cfa3ae0ea36a07d4ae0c34a91b359 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
@@ -82,9 +82,9 @@ protected:
/** Constructor */
RCC8VertexBase();
/** Desctructor */
- ~RCC8VertexBase() ITK_OVERRIDE {}
+ ~RCC8VertexBase() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The segmentation level */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
index c1dc5299746b717a45968e7b25a33d13a9f499f3..c9695fb2e3f89247f1662b6ce73d91a14ec53624 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
@@ -61,20 +61,20 @@ public:
* Set the VertexWithCompacity attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
*/
- void SetAttributesMap(AttributesMapType attributes) ITK_OVERRIDE;
+ void SetAttributesMap(AttributesMapType attributes) override;
/**
* Get an attributes vector representing the VertexWithCompacity attributes.
* \return The attributes vector
*/
- AttributesMapType GetAttributesMap(void) ITK_OVERRIDE;
+ AttributesMapType GetAttributesMap(void) override;
protected:
/** Constructor */
RCC8VertexWithCompacity();
/** Desctructor */
- ~RCC8VertexWithCompacity() ITK_OVERRIDE {}
+ ~RCC8VertexWithCompacity() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The compacity */
diff --git a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
index dbf78a9c4a93e69e4b258af214ae03734d5ff3ec..6b8ca2c517690d4c2f4ce1b404a74e5bb8d5619e 100644
--- a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
@@ -151,7 +151,7 @@ class NDBI : public TM4AndTM5IndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDBI";
}
@@ -159,10 +159,10 @@ public:
/// Constructor
NDBI() {}
/// Desctructor
- ~NDBI() ITK_OVERRIDE {}
+ ~NDBI() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& pTM4, const TInput2& pTM5) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pTM4, const TInput2& pTM5) const override
{
double dTM4 = static_cast<double>(pTM4);
double dTM5 = static_cast<double>(pTM5);
@@ -190,7 +190,7 @@ class ISU : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "ISU";
}
@@ -198,7 +198,7 @@ public:
/// Constructor
ISU() : m_A(100.), m_B(25.) {}
/// Desctructor
- ~ISU() ITK_OVERRIDE {}
+ ~ISU() override {}
/** Set/Get A correction */
void SetA(const double pA)
@@ -220,7 +220,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& pRed, const TInput2& pNIR) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pRed, const TInput2& pNIR) const override
{
double dRed = static_cast<double>(pRed);
double dNIR = static_cast<double>(pNIR);
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
index 829d3c4f48a88369441e5abea75602a7b5df8766..000fd046233b2d7362515c596f55a78013329dfc 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
@@ -72,9 +72,9 @@ public:
protected:
GAndRIndexImageFilter();
- ~GAndRIndexImageFilter() ITK_OVERRIDE {}
+ ~GAndRIndexImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/* void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
itk::ThreadIdType threadId );
diff --git a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
index fd586c9474c5fce467957e2e4f68fea269f89b50..a94a63f162ed28374dd3a2bf37d713d0fc21d83c 100644
--- a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
+++ b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
@@ -343,7 +343,7 @@ public:
virtual std::string GetName() const = 0;
LandsatTMIndex() {}
- ~LandsatTMIndex() ITK_OVERRIDE {}
+ ~LandsatTMIndex() override {}
};
@@ -370,13 +370,13 @@ class Bright : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "Bright";
}
Bright() {}
- ~Bright() ITK_OVERRIDE {}
+ ~Bright() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -411,13 +411,13 @@ class Vis : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "Vis";
}
Vis() {}
- ~Vis() ITK_OVERRIDE {}
+ ~Vis() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -444,13 +444,13 @@ class NIR : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NIR";
}
NIR() {}
- ~NIR() ITK_OVERRIDE {}
+ ~NIR() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -476,13 +476,13 @@ class MIR1 : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "MIR1";
}
MIR1() {}
- ~MIR1() ITK_OVERRIDE {}
+ ~MIR1() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -508,13 +508,13 @@ class MIR2 : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "MIR2";
}
MIR2() {}
- ~MIR2() ITK_OVERRIDE {}
+ ~MIR2() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -540,13 +540,13 @@ class TIR : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "TIR";
}
TIR() {}
- ~TIR() ITK_OVERRIDE {}
+ ~TIR() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -586,13 +586,13 @@ class MIRTIR : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "MIRTIR";
}
MIRTIR() {}
- ~MIRTIR() ITK_OVERRIDE {}
+ ~MIRTIR() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -626,13 +626,13 @@ class NDVI : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDVI";
}
NDVI() {}
- ~NDVI() ITK_OVERRIDE {}
+ ~NDVI() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -673,13 +673,13 @@ class NDBSI : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDBSI";
}
NDBSI() {}
- ~NDBSI() ITK_OVERRIDE {}
+ ~NDBSI() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -716,13 +716,13 @@ class BIO : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "BIO";
}
BIO() {}
- ~BIO() ITK_OVERRIDE {}
+ ~BIO() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -762,13 +762,13 @@ class NDSI : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDSI";
}
NDSI() {}
- ~NDSI() ITK_OVERRIDE {}
+ ~NDSI() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -819,13 +819,13 @@ class NDSIVis : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDSIVis";
}
NDSIVis() {}
- ~NDSIVis() ITK_OVERRIDE {}
+ ~NDSIVis() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -864,13 +864,13 @@ class NDBBBI : public LandsatTMIndex<TInput, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDBBBI";
}
NDBBBI() {}
- ~NDBBBI() ITK_OVERRIDE {}
+ ~NDBBBI() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -984,7 +984,7 @@ public:
m_FvNDBSI->SetMembership(Medium, -0.20, -0.20, 0.0, 0.0);
m_FvNDBSI->SetMembership(High, 0.0, 0.0, maximumValue, maximumValue);
}
- ~LinguisticVariables() ITK_OVERRIDE {}
+ ~LinguisticVariables() override {}
inline itk::FixedArray<unsigned int, 11> operator ()(const TInput& inputPixel)
{
@@ -1068,7 +1068,7 @@ public:
}
KernelSpectralRule() : m_TV1(0.7), m_TV2(0.5) { }
- ~KernelSpectralRule() ITK_OVERRIDE {}
+ ~KernelSpectralRule() override {}
void SetTV1(PrecisionType tv1)
{
@@ -1163,13 +1163,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM ThickCloudsSpectralRule";
}
ThickCloudsSpectralRule() { }
- ~ThickCloudsSpectralRule() ITK_OVERRIDE {}
+ ~ThickCloudsSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1221,13 +1221,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM ThinCloudsSpectralRule";
}
ThinCloudsSpectralRule() { }
- ~ThinCloudsSpectralRule() ITK_OVERRIDE {}
+ ~ThinCloudsSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1282,13 +1282,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM SnowOrIceSpectralRule";
}
SnowOrIceSpectralRule() { }
- ~SnowOrIceSpectralRule() ITK_OVERRIDE {}
+ ~SnowOrIceSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1341,13 +1341,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM WaterOrShadowSpectralRule";
}
WaterOrShadowSpectralRule() { }
- ~WaterOrShadowSpectralRule() ITK_OVERRIDE {}
+ ~WaterOrShadowSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1388,13 +1388,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM PitbogOrGreenhouseSpectralRule";
}
PitbogOrGreenhouseSpectralRule() { }
- ~PitbogOrGreenhouseSpectralRule() ITK_OVERRIDE {}
+ ~PitbogOrGreenhouseSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1446,13 +1446,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM DominantBlueSpectralRule";
}
DominantBlueSpectralRule() { }
- ~DominantBlueSpectralRule() ITK_OVERRIDE {}
+ ~DominantBlueSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1494,13 +1494,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM VegetationSpectralRule";
}
VegetationSpectralRule() { }
- ~VegetationSpectralRule() ITK_OVERRIDE {}
+ ~VegetationSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1554,13 +1554,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM RangelandSpectralRule";
}
RangelandSpectralRule() { }
- ~RangelandSpectralRule() ITK_OVERRIDE {}
+ ~RangelandSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1615,13 +1615,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM BarrenLandOrBuiltUpOrCloudsSpectralRule";
}
BarrenLandOrBuiltUpOrCloudsSpectralRule() { }
- ~BarrenLandOrBuiltUpOrCloudsSpectralRule() ITK_OVERRIDE {}
+ ~BarrenLandOrBuiltUpOrCloudsSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1673,13 +1673,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM FlatResponseBarrenLandOrBuiltUpSpectralRule";
}
FlatResponseBarrenLandOrBuiltUpSpectralRule() { }
- ~FlatResponseBarrenLandOrBuiltUpSpectralRule() ITK_OVERRIDE {}
+ ~FlatResponseBarrenLandOrBuiltUpSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1727,13 +1727,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM ShadowWithBarrenLandSpectralRule";
}
ShadowWithBarrenLandSpectralRule() { }
- ~ShadowWithBarrenLandSpectralRule() ITK_OVERRIDE {}
+ ~ShadowWithBarrenLandSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1774,13 +1774,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM ShadowWithVegetationSpectralRule";
}
ShadowWithVegetationSpectralRule() { }
- ~ShadowWithVegetationSpectralRule() ITK_OVERRIDE {}
+ ~ShadowWithVegetationSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1822,13 +1822,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM ShadowCloudOrSnowSpectralRule";
}
ShadowCloudOrSnowSpectralRule() { }
- ~ShadowCloudOrSnowSpectralRule() ITK_OVERRIDE {}
+ ~ShadowCloudOrSnowSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
@@ -1877,13 +1877,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM WetlandSpectralRule";
}
WetlandSpectralRule() { }
- ~WetlandSpectralRule() ITK_OVERRIDE {}
+ ~WetlandSpectralRule() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
index d6a1b16768e8bde558bd42fb6c36e0a38165aced..3a230c4a10293617babdb3dda655d9043582fc62 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
@@ -98,9 +98,9 @@ protected:
/// Constructor
MultiChannelGAndRIndexImageFilter() : m_GreenIndex(1), m_RedIndex(2) {};
/// Destructor
- ~MultiChannelGAndRIndexImageFilter() ITK_OVERRIDE {}
+ ~MultiChannelGAndRIndexImageFilter() override {}
/// Before generating data, set functor parameters
- void BeforeThreadedGenerateData() ITK_OVERRIDE
+ void BeforeThreadedGenerateData() override
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
if (m_GreenIndex < 1 || m_RedIndex < 1 ||
@@ -112,7 +112,7 @@ protected:
this->GetFunctor().SetRedIndex(m_RedIndex);
}
/// PrintSelf Method
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
this->Superclass::PrintSelf(os, indent);
os << indent << "Green index: " << m_GreenIndex << std::endl;
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
index f01f00d11b28845c260c48803c0b21f9ee571f56..8094f66ac43e282c6df4562836c705ecc6b2ec63 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
@@ -110,9 +110,9 @@ protected:
/// Constructor
MultiChannelRAndBAndNIRIndexImageFilter() : m_RedIndex(3), m_BlueIndex(1), m_NIRIndex(4) {};
/// Destructor
- ~MultiChannelRAndBAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~MultiChannelRAndBAndNIRIndexImageFilter() override {}
/// Before generating data, set functor parameters
- void BeforeThreadedGenerateData() ITK_OVERRIDE
+ void BeforeThreadedGenerateData() override
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
if (m_RedIndex < 1 || m_BlueIndex < 1 || m_NIRIndex < 1 ||
@@ -125,7 +125,7 @@ protected:
this->GetFunctor().SetNIRIndex(m_NIRIndex);
}
/// PrintSelf
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
this->Superclass::PrintSelf(os, indent);
os << indent << "Red index: " << m_RedIndex << std::endl;
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
index bdd0cb1045b9c5adafadb3bdbb216022d6833598..6b8daf81ed96d751b3870a785c59f2e48648594f 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
@@ -110,9 +110,9 @@ protected:
/// Constructor
MultiChannelRAndGAndNIRIndexImageFilter() : m_RedIndex(3), m_GreenIndex(2), m_NIRIndex(4) {};
/// Destructor
- ~MultiChannelRAndGAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~MultiChannelRAndGAndNIRIndexImageFilter() override {}
/// Before generating data, set functor parameters
- void BeforeThreadedGenerateData() ITK_OVERRIDE
+ void BeforeThreadedGenerateData() override
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
@@ -126,7 +126,7 @@ protected:
this->GetFunctor().SetNIRIndex(m_NIRIndex);
}
/// PrintSelf
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
this->Superclass::PrintSelf(os, indent);
os << indent << "Red index: " << m_RedIndex << std::endl;
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
index 3bc1c49d727846bfb8fe2a7a4a68219b8b6bb533..7b07d757d81796b82ea5acc1d142958efe7341ac 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
@@ -98,9 +98,9 @@ protected:
/// Constructor
MultiChannelRAndNIRIndexImageFilter() : m_RedIndex(3), m_NIRIndex(4) {};
/// Destructor
- ~MultiChannelRAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~MultiChannelRAndNIRIndexImageFilter() override {}
/// Before generating data, set functor parameters
- void BeforeThreadedGenerateData() ITK_OVERRIDE
+ void BeforeThreadedGenerateData() override
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
if (m_RedIndex < 1 || m_NIRIndex < 1 ||
@@ -112,7 +112,7 @@ protected:
this->GetFunctor().SetNIRIndex(m_NIRIndex);
}
/// PrintSelf Method
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
this->Superclass::PrintSelf(os, indent);
os << indent << "Red index: " << m_RedIndex << std::endl;
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
index f3e704d08cb0544d83c773b56556bd4245a6b9f4..028adb1623ac2afe53e9c1b34fc91b043beecfa3 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
@@ -88,7 +88,7 @@ public:
typedef std::vector<PrecisionType> OutputType;
- OutputType Evaluate( const DataNodeType& node ) const ITK_OVERRIDE;
+ OutputType Evaluate( const DataNodeType& node ) const override;
/** Set/Get methods */
itkGetConstMacro(NDVIThreshold, PrecisionType);
@@ -117,8 +117,8 @@ public:
protected:
NDVIDataNodeFeatureFunction();
- ~NDVIDataNodeFeatureFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~NDVIDataNodeFeatureFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
NDVIDataNodeFeatureFunction(const Self&); //purposely not implemented
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
index 04646b1f1878e5857a2d78c2722e43b77d327bc7..ad01b1b2c65642a7202fcfd9108421779e9555e2 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
@@ -74,9 +74,9 @@ public:
protected:
RAndBAndNIRIndexImageFilter();
- ~RAndBAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~RAndBAndNIRIndexImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RAndBAndNIRIndexImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
index 5a721b67461ba565bdc30727d069eba2bcba3550..26cb6eb0a45093c43e49059eda861db12329425c 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
@@ -74,9 +74,9 @@ public:
protected:
RAndGAndNIRIndexImageFilter();
- ~RAndGAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~RAndGAndNIRIndexImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RAndGAndNIRIndexImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
index fc118fb663cd2e271ab3241a625d44892770ef6c..c93b6df863f094aa2280bfc0ab9167ff4c9a2b48 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
@@ -71,9 +71,9 @@ public:
protected:
RAndNIRIndexImageFilter();
- ~RAndNIRIndexImageFilter() ITK_OVERRIDE {}
+ ~RAndNIRIndexImageFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/* void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
itk::ThreadIdType threadId );
diff --git a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
index 57d2179871008e4bab01b9a64ed25eec7ffcf9c3..6ed1b201c05e31eaab18124c409fb96e12584688 100644
--- a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
@@ -287,7 +287,7 @@ class IR : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "IR";
}
@@ -295,10 +295,10 @@ public:
/// Constructor
IR() {}
/// Desctructor
- ~IR() ITK_OVERRIDE {}
+ ~IR() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const override
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
@@ -330,7 +330,7 @@ class IC : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "IC";
}
@@ -338,10 +338,10 @@ public:
/// Constructor
IC() {}
/// Desctructor
- ~IC() ITK_OVERRIDE {}
+ ~IC() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const override
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
@@ -369,7 +369,7 @@ class IB : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "IB";
}
@@ -377,10 +377,10 @@ public:
/// Constructor
IB() {}
/// Desctructor
- ~IB() ITK_OVERRIDE {}
+ ~IB() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const override
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
@@ -404,7 +404,7 @@ class IB2 : public GAndRAndNirIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "IB2";
}
@@ -412,10 +412,10 @@ public:
/// Constructor
IB2() {}
/// Desctructor
- ~IB2() ITK_OVERRIDE {}
+ ~IB2() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed, const TInput2& pNir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed, const TInput2& pNir) const override
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
diff --git a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
index 48b3402d8ff05540abf9121d96abe9ce6def44b2..a83cc354d7278a46128f7e9e99f9081f0a62b999 100644
--- a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
@@ -414,7 +414,7 @@ class NDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDVI";
}
@@ -422,10 +422,10 @@ public:
/// Constructor
NDVI() {}
/// Desctructor
- ~NDVI() ITK_OVERRIDE {}
+ ~NDVI() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
@@ -454,15 +454,15 @@ class RVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "RVI";
}
RVI() {}
- ~RVI() ITK_OVERRIDE {}
+ ~RVI() override {}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
@@ -493,13 +493,13 @@ class PVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "PVI";
}
PVI() : m_A(0.90893), m_B(7.46216), m_Coeff(0.74) {}
- ~PVI() ITK_OVERRIDE {}
+ ~PVI() override {}
/** Set/Get A and B parameters */
void SetA(const double A)
{
@@ -519,7 +519,7 @@ public:
return (m_B);
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -552,13 +552,13 @@ class SAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "SAVI";
}
SAVI() : m_L(0.5) {}
- ~SAVI() ITK_OVERRIDE {}
+ ~SAVI() override {}
/** Set/Get L correction */
void SetL(const double L)
@@ -571,7 +571,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -606,13 +606,13 @@ class TSAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "TSAVI";
}
TSAVI() : m_A(0.7), m_S(0.9), m_X(0.08) {}
- ~TSAVI() ITK_OVERRIDE {}
+ ~TSAVI() override {}
/** Set/Get S and A parameters */
void SetS(const double S)
@@ -642,7 +642,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -679,7 +679,7 @@ class WDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "WDVI";
}
@@ -687,7 +687,7 @@ public:
/// Constructor
WDVI() : m_S(0.4) {}
/// Desctructor
- ~WDVI() ITK_OVERRIDE {}
+ ~WDVI() override {}
// Operator on r and nir single pixel values
/** Set/Get Slop of soil line */
void SetS(const double s)
@@ -699,7 +699,7 @@ public:
return (m_S);
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
@@ -727,7 +727,7 @@ class MSAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "MSAVI";
}
@@ -739,7 +739,7 @@ public:
{
m_WDVIfunctor.SetS(m_S);
}
- ~MSAVI() ITK_OVERRIDE {}
+ ~MSAVI() override {}
/** Set/Get Slop of soil line */
void SetS(const double s)
{
@@ -760,7 +760,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -802,16 +802,16 @@ class MSAVI2 : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "MSAVI2";
}
MSAVI2() {}
- ~MSAVI2() ITK_OVERRIDE {}
+ ~MSAVI2() override {}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -840,16 +840,16 @@ class GEMI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "GEMI";
}
GEMI() {}
- ~GEMI() ITK_OVERRIDE {}
+ ~GEMI() override {}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -894,13 +894,13 @@ class AVI : public RAndGAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "AVI";
}
AVI() : m_LambdaG(560.), m_LambdaR(660.), m_LambdaNir(830.) {}
- ~AVI() ITK_OVERRIDE {}
+ ~AVI() override {}
/** Set/Get Lambda red parameter*/
void SetLambdaR(const double lr)
{
@@ -929,7 +929,7 @@ public:
return (m_LambdaNir);
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& g, const TInput3& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& g, const TInput3& nir) const override
{
double dr = static_cast<double>(r);
double dg = static_cast<double>(g);
@@ -989,13 +989,13 @@ class ARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "ARVI";
}
ARVI() : m_Gamma(0.5) {}
- ~ARVI() ITK_OVERRIDE {}
+ ~ARVI() override {}
/** Set/Get Gamma parameter */
void SetGamma(const double gamma)
@@ -1008,7 +1008,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const override
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
@@ -1043,13 +1043,13 @@ class TSARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "TSARVI";
}
TSARVI() : m_A(0.0), m_B(0.0), m_X(0.08), m_Gamma(0.5) {}
- ~TSARVI() ITK_OVERRIDE {}
+ ~TSARVI() override {}
/** Set/Get A and B parameters */
void SetA(const double A)
@@ -1088,7 +1088,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const override
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
@@ -1131,13 +1131,13 @@ class EVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "EVI";
}
EVI() : m_G(2.5), m_C1(6.0), m_C2(7.5), m_L(1.0) {}
- ~EVI() ITK_OVERRIDE {}
+ ~EVI() override {}
/** Set/Get G parameter */
void SetG(const double g)
{
@@ -1175,7 +1175,7 @@ public:
return (m_L);
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const override
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
@@ -1218,16 +1218,16 @@ class IPVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "IPVI";
}
IPVI() {}
- ~IPVI() ITK_OVERRIDE {}
+ ~IPVI() override {}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
@@ -1257,14 +1257,14 @@ class TNDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "TNDVI";
}
typedef NDVI<TInput1, TInput2, TOutput> NDVIFunctorType;
TNDVI() {}
- ~TNDVI() ITK_OVERRIDE {}
+ ~TNDVI() override {}
NDVIFunctorType GetNDVI(void) const
{
@@ -1272,7 +1272,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dval = this->GetNDVI() (r, nir) + 0.5;
if (dval < 0)
@@ -1309,14 +1309,14 @@ class LAIFromNDVILogarithmic : public RAndNIRIndexBase<TInput1, TInput2, TOutput
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LAIFromNDVILogarithmic";
}
typedef NDVI<TInput1, TInput2, TOutput> NDVIFunctorType;
LAIFromNDVILogarithmic() : m_NdviSoil(0.10), m_NdviInf(0.89), m_ExtinctionCoefficient(0.71) {}
- ~LAIFromNDVILogarithmic() ITK_OVERRIDE {}
+ ~LAIFromNDVILogarithmic() override {}
NDVIFunctorType GetNDVI(void) const
{
@@ -1351,7 +1351,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double dval = this->GetNDVI() (r, nir);
if (dval < 0)
@@ -1395,14 +1395,14 @@ class LAIFromReflectancesLinear : public RAndNIRIndexBase<TInput1, TInput2, TOut
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LAIFromReflectancesLinear";
}
typedef NDVI<TInput1, TInput2, TOutput> NDVIFunctorType;
LAIFromReflectancesLinear() : m_RedCoef(-17.91), m_NirCoef(12.26) {}
- ~LAIFromReflectancesLinear() ITK_OVERRIDE {}
+ ~LAIFromReflectancesLinear() override {}
NDVIFunctorType GetReflectances(void) const
{
@@ -1428,7 +1428,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
return (static_cast<TOutput>(m_RedCoef*r+m_NirCoef*nir));
}
@@ -1464,7 +1464,7 @@ private:
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LAIFromNDVIFormosat2Functor";
}
@@ -1472,10 +1472,10 @@ private:
/// Constructor
LAIFromNDVIFormosat2Functor() {}
/// Desctructor
- ~LAIFromNDVIFormosat2Functor() ITK_OVERRIDE {}
+ ~LAIFromNDVIFormosat2Functor() override {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const override
{
double a = 0.1519;
double b = 3.9443;
diff --git a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
index 10f11fa3a8d2fd836b952996fe9bf67d747b8a0e..feb14fc3c9c02a64c8a6b94ad32b47da0d1ebc27 100644
--- a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
@@ -126,15 +126,15 @@ class WaterIndexFunctor : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "WaterIndexFunctor";
}
WaterIndexFunctor() {}
- ~WaterIndexFunctor() ITK_OVERRIDE {}
+ ~WaterIndexFunctor() override {}
protected:
- inline TOutput Evaluate(const TInput1& id1, const TInput2& id2) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& id1, const TInput2& id2) const override
{
double dindex1 = static_cast<double>(id1);
double dindex2 = static_cast<double>(id2);
@@ -202,7 +202,7 @@ class NDWI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDWI";
}
@@ -211,7 +211,7 @@ public:
/// Constructor
NDWI() {}
/// Desctructor
- ~NDWI() ITK_OVERRIDE {}
+ ~NDWI() override {}
WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
@@ -263,7 +263,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& nir, const TInput2& mir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& nir, const TInput2& mir) const override
{
return (static_cast<TOutput>(GetWIFunctor() (nir, mir)));
}
@@ -287,7 +287,7 @@ class NDWI2 : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "NDWI2";
}
@@ -296,7 +296,7 @@ public:
/// Constructor
NDWI2() {}
/// Desctructor
- ~NDWI2() ITK_OVERRIDE {}
+ ~NDWI2() override {}
WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
@@ -348,7 +348,7 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1& g, const TInput2& nir) const ITK_OVERRIDE
+ inline TOutput Evaluate(const TInput1& g, const TInput2& nir) const override
{
return (static_cast<TOutput>(GetWIFunctor() (g, nir)));
}
@@ -650,7 +650,7 @@ public:
reference[0] = 136.0; reference[1] = 132.0; reference[2] = 47.0; reference[3] = 24.0;
this->SetReferenceWaterPixel(reference);
}
- ~WaterSqrtSpectralAngleFunctor() ITK_OVERRIDE {}
+ ~WaterSqrtSpectralAngleFunctor() override {}
/** Set Reference Pixel */
void SetReferenceWaterPixel(InputVectorPixelType ref)
@@ -742,7 +742,7 @@ public:
}
protected:
- inline TOutputPixel Evaluate(const TInputVectorPixel& inPix) const ITK_OVERRIDE
+ inline TOutputPixel Evaluate(const TInputVectorPixel& inPix) const override
{
return static_cast<TOutputPixel>(Superclass::Evaluate(inPix));
}
diff --git a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
index d90d827fd4da8254459ac0aef11ece3a09c5bdca..0ad1616833a671942b3ccadd6a37702754b441b5 100644
--- a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
@@ -73,7 +73,7 @@ public:
protected:
WaterSqrtSpectralAngleImageFilter() {}
- ~WaterSqrtSpectralAngleImageFilter() ITK_OVERRIDE {}
+ ~WaterSqrtSpectralAngleImageFilter() override {}
private:
WaterSqrtSpectralAngleImageFilter(Self &); // purposely not implemented
diff --git a/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h b/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
index 284312d81909ff7409e02284f27a3ff8132cfe39..f3bc34584916b874455e6a81c7838935d420404e 100644
--- a/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
+++ b/Modules/Radiometry/LandSatClassifier/include/otbLandsatTMSpectralRuleBasedClassifier.h
@@ -183,13 +183,13 @@ public:
typedef bool OutputPixelType;
/** Return the index name */
- std::string GetName() const ITK_OVERRIDE
+ std::string GetName() const override
{
return "LandsatTM SpectralRuleBasedClassifier";
}
SpectralRuleBasedClassifier() { }
- ~SpectralRuleBasedClassifier() ITK_OVERRIDE {}
+ ~SpectralRuleBasedClassifier() override {}
inline TOutput operator ()(const TInput& inputPixel)
{
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
index 801554d15732e75a5c823385215918ba6ce8d940..20adbd6e39c275d9add6193dd394d0faccab2690 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
@@ -87,9 +87,9 @@ protected:
/** Constructor */
AeronetData();
/** Destructor */
- ~AeronetData() ITK_OVERRIDE {}
+ ~AeronetData() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** Angstrom coefficient */
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
index 93b16a797967fd376eaec31a624b749619b15e4c..74a514a465424efe794aa28014f7eec1d5ae106a 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
@@ -126,12 +126,12 @@ protected:
/** Constructor */
AeronetFileReader();
/** Destructor */
- ~AeronetFileReader() ITK_OVERRIDE;
+ ~AeronetFileReader() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
index 56f45de702acfb510599375252d05974961518cd..f1516e26efb033a9cc7b2add0fee3683d9594c23 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
@@ -137,12 +137,12 @@ public:
/** Constructor */
AtmosphericCorrectionParameters();
/** Destructor */
- ~AtmosphericCorrectionParameters() ITK_OVERRIDE {}
+ ~AtmosphericCorrectionParameters() override {}
protected:
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
AtmosphericCorrectionParameters(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
index b219982e7902c8ceb2264f153069f52a845a5c8a..5daf902b5a73d8c3b87425145944f55d3f7d9fb8 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
@@ -119,9 +119,9 @@ protected:
/** Constructor */
AtmosphericRadiativeTermsSingleChannel();
/** Destructor */
- ~AtmosphericRadiativeTermsSingleChannel() ITK_OVERRIDE {}
+ ~AtmosphericRadiativeTermsSingleChannel() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
AtmosphericRadiativeTermsSingleChannel(const Self &); //purposely not implemented
@@ -266,9 +266,9 @@ protected:
/** Constructor */
AtmosphericRadiativeTerms();
/** Destructor */
- ~AtmosphericRadiativeTerms() ITK_OVERRIDE {}
+ ~AtmosphericRadiativeTerms() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
AtmosphericRadiativeTerms(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
index 6bcb770447952822d799c5f1933599e4fdbbf8d5..3a1b75de08914b827685231c2aa2b9be11804002 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
@@ -145,12 +145,12 @@ public:
/** Constructor */
ImageMetadataCorrectionParameters();
/** Destructor */
- ~ImageMetadataCorrectionParameters() ITK_OVERRIDE {}
+ ~ImageMetadataCorrectionParameters() override {}
protected:
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageMetadataCorrectionParameters(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
index fc8b7c3bbde428c1907ead63b869c77bd6707a78..695bdf33e113b6a8863e82ac9b4cb43e6c5dc290 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
@@ -171,10 +171,10 @@ protected:
};
/** Destructor */
- ~ImageToRadianceImageFilter() ITK_OVERRIDE {}
+ ~ImageToRadianceImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
this->GetInput()->GetMetaDataDictionary());
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
index 6dbc688a7f1e0861f4624e0a14d2fab256a49293..8bca51abee384877da358abbf966502471f57767 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
@@ -251,10 +251,10 @@ protected:
};
/** Destructor */
- ~ImageToReflectanceImageFilter() ITK_OVERRIDE {}
+ ~ImageToReflectanceImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
index b52793fb4817d27d510d91d31580225eb093808f..b7585dbfff57a6f9fdf383edb5592e7437c2b543 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
@@ -172,10 +172,10 @@ protected:
};
/** Destructor */
- ~RadianceToImageImageFilter() ITK_OVERRIDE {}
+ ~RadianceToImageImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
this->GetInput()->GetMetaDataDictionary());
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
index 9e4d667b5edaa63752e2ff746b7fad97e2e4c3bf..07c6de1dac81368360768ec97d057c8cb8638431 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
@@ -247,10 +247,10 @@ protected:
};
/** Destructor */
- ~RadianceToReflectanceImageFilter() ITK_OVERRIDE {}
+ ~RadianceToReflectanceImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
this->GetInput()->GetMetaDataDictionary());
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
index 6050d66777077a99b24d82a1baf04496947a2f1b..cba938f79dc85dbd76f1541a01dc3b8bd9422fdb 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
@@ -237,10 +237,10 @@ protected:
};
/** Destructor */
- ~ReflectanceToImageImageFilter() ITK_OVERRIDE {}
+ ~ReflectanceToImageImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
index 69352382feae6b50c9679f93586b71cedb6366d0..64e72fa0cdd714539a4f0abfa3857b265f8653d8 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
@@ -231,10 +231,10 @@ protected:
};
/** Destructor */
- ~ReflectanceToRadianceImageFilter() ITK_OVERRIDE {}
+ ~ReflectanceToRadianceImageFilter() override {}
/** Update the functor list and input parameters */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
OpticalImageMetadataInterface::Pointer imageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(
this->GetInput()->GetMetaDataDictionary());
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index 7fc9c223503f3d4f51da64949e15efb3f3297740..df71735c0f7a329aab7e1a7bf25d280e95567766 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -240,18 +240,18 @@ protected:
/** Constructor */
ReflectanceToSurfaceReflectanceImageFilter();
/** Destructor */
- ~ReflectanceToSurfaceReflectanceImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~ReflectanceToSurfaceReflectanceImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Initialize the parameters of the functor before the threads run. */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Fill AtmosphericRadiativeTerms using image metadata*/
void UpdateAtmosphericRadiativeTerms();
/** Update Functors parameters */
void UpdateFunctors();
/** If modified, we need to compute the functor parameters again */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
index f1cb28992a6ea2dc9070bfba6dc65d5648ad540d..ddd04f0ef5e1ca30a18d72e4477de221c199503b 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
@@ -79,16 +79,16 @@ public:
protected:
SpectralSensitivityReader();
- ~SpectralSensitivityReader() ITK_OVERRIDE;
+ ~SpectralSensitivityReader() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Find the filename using image metadata */
void FindFileName();
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Struct use to remove multiple spaces in file */
struct BothAre
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 435a88c0010cfda9bc07c3d16a3367c0e0a04874..8b1290f976ae0e97d9de3fb1ecdac91122fec471 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -267,11 +267,11 @@ public:
protected:
SurfaceAdjacencyEffectCorrectionSchemeFilter();
- ~SurfaceAdjacencyEffectCorrectionSchemeFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SurfaceAdjacencyEffectCorrectionSchemeFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Initialize the parameters of the functor before the threads run. */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Fill AtmosphericRadiativeTerms using image metadata*/
void UpdateAtmosphericRadiativeTerms();
@@ -280,7 +280,7 @@ protected:
void UpdateFunctors();
/** If modified, we need to compute the functor parameters again */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
index 94d5afcb8b27bcdd71a99ac1e2740519f756ff1c..444e811611fa3e56acd2b927d05c69d918c0772b 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
@@ -63,10 +63,10 @@ protected:
/** Constructor */
WavelengthSpectralBands();
/** Destructor */
- ~WavelengthSpectralBands() ITK_OVERRIDE {}
+ ~WavelengthSpectralBands() override {}
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
WavelengthSpectralBands(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
index 6284aba4f72f139b628a91bf6ea243c862ed0ca3..2b4ae21d3f926324984cda4ea767479a2056560e 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
@@ -85,17 +85,17 @@ public:
typedef typename ParametricFunctionType::ConstPointer ParametricFunctionConstPointer;
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -106,7 +106,7 @@ public:
* \warning this method caches BufferedRegion information.
* If the BufferedRegion has changed, user must call
* SetInputImage again to update cached values. */
- void SetInputImage( const InputImageType * ptr ) ITK_OVERRIDE;
+ void SetInputImage( const InputImageType * ptr ) override;
/** Get/Set the Scale value */
@@ -140,8 +140,8 @@ public:
protected:
SarBrightnessFunction();
- ~SarBrightnessFunction() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SarBrightnessFunction() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SarBrightnessFunction(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
index 7fa55f16c2ae663ed54441589e769c551bf01d39..f7587b4130238b99ae729961fa45ec3e695af344 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
@@ -84,12 +84,12 @@ public:
protected:
SarBrightnessToImageFilter();
- ~SarBrightnessToImageFilter() ITK_OVERRIDE {}
+ ~SarBrightnessToImageFilter() override {}
/** Update the function list and input parameters*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SarBrightnessToImageFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
index 9733b50c1d57761afcaf309c61fb76011bcc6cdd..e65b7e680939eb0c266c963e4ee10e41df2f3190 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
@@ -70,16 +70,16 @@ protected:
SarDeburstImageFilter();
// Destructor
- virtual ~SarDeburstImageFilter() ITK_OVERRIDE {};
+ virtual ~SarDeburstImageFilter() override {};
// Needs to be re-implemented since size of output is modified
- virtual void GenerateOutputInformation() ITK_OVERRIDE;
+ virtual void GenerateOutputInformation() override;
// Needs to be re-implemented since size of output is modified
- virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ virtual void GenerateInputRequestedRegion() override;
// Actual processing
- virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
RegionType OutputRegionToInputRegion(const RegionType& outputRegion) const;
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
index 0ce4d69bb9e78f0597f941c19129766ecca00241..17dd6372fd197980ade38c4e755251063b1aefb5 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
@@ -79,10 +79,10 @@ public:
typedef typename itk::NumericTraits<InputPixelType>::ScalarRealType RealType;
/** Evaluate the function at specific positions */
- RealType Evaluate(const PointType& point) const ITK_OVERRIDE;
+ RealType Evaluate(const PointType& point) const override;
/** Evalulate the function at specified index */
- RealType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE
+ RealType EvaluateAtIndex(const IndexType& index) const override
{
PointType point;
point[0] = static_cast<typename PointType::ValueType>(index[0]);
@@ -91,7 +91,7 @@ public:
}
RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -127,8 +127,8 @@ public:
protected:
SarParametricMapFunction();
- ~SarParametricMapFunction() ITK_OVERRIDE{}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SarParametricMapFunction() override{}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
SarParametricMapFunction(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
index eb78e1d76542fd6dd48d94b14addd69a5d416ab9..3fb6463376aa78d5fa1915af16ed6d469217e3b3 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
@@ -82,17 +82,17 @@ public:
typedef typename ParametricFunctionType::ConstPointer ParametricFunctionConstPointer;
/** Evalulate the function at specified index */
- OutputType EvaluateAtIndex(const IndexType& index) const ITK_OVERRIDE;
+ OutputType EvaluateAtIndex(const IndexType& index) const override;
/** Evaluate the function at non-integer positions */
- OutputType Evaluate(const PointType& point) const ITK_OVERRIDE
+ OutputType Evaluate(const PointType& point) const override
{
IndexType index;
this->ConvertPointToNearestIndex(point, index);
return this->EvaluateAtIndex(index);
}
- OutputType EvaluateAtContinuousIndex(const ContinuousIndexType& cindex) const ITK_OVERRIDE
+ OutputType EvaluateAtContinuousIndex(const ContinuousIndexType& cindex) const override
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex(cindex, index);
@@ -103,7 +103,7 @@ public:
* \warning this method caches BufferedRegion information.
* If the BufferedRegion has changed, user must call
* SetInputImage again to update cached values. */
- void SetInputImage( const InputImageType * ptr ) ITK_OVERRIDE;
+ void SetInputImage( const InputImageType * ptr ) override;
/** Get/Set the Scale value */
@@ -172,10 +172,10 @@ protected:
SarRadiometricCalibrationFunction();
/** default, empty, virtual dtor */
- ~SarRadiometricCalibrationFunction() ITK_OVERRIDE{}
+ ~SarRadiometricCalibrationFunction() override{}
/** print method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Flags to indicate if these values needs to be applied in calibration*/
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
index 9910ddf76ee7f964f0d729fb8a5d6871677a9004..19e49832d819f9bb1f9819a20e14a2051028da89 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
@@ -112,13 +112,13 @@ protected:
SarRadiometricCalibrationToImageFilter();
/** Empty, default virtual dtor */
- ~SarRadiometricCalibrationToImageFilter() ITK_OVERRIDE {}
+ ~SarRadiometricCalibrationToImageFilter() override {}
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Update the function list and input parameters*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
private:
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
index 0fe02d2e356009e24335abc1993fb66e03e0f3a9..ca65a82c4938273efca8667fcdace633f33404e4 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
@@ -143,10 +143,10 @@ protected:
/** Constructor */
TerraSarBrightnessImageFilter(){};
/** Destructor */
- ~TerraSarBrightnessImageFilter() ITK_OVERRIDE {}
+ ~TerraSarBrightnessImageFilter() override {}
/** Initialize the functor vector */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
private:
TerraSarBrightnessImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
index 1ed84cf295867d5cc916a16f27aac64211c63c59..bf33680f8621474107c737066808ed821a50114a 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
@@ -96,7 +96,7 @@ class AtmosphericEffects
/** Constructor from a ASCII file */
//AtmosphericEffects( const std::string & filename );
/** Destructor */
- ~AtmosphericEffects() ITK_OVERRIDE {};
+ ~AtmosphericEffects() override {};
/** PrintSelf method */
//void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
index 999d65aafebfbab7db9bbbf01e00c8e94fdf74e7..04973ed9a706ae8c6d47ecba03912103e3eb0903 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
@@ -166,13 +166,13 @@ public:
protected:
ImageSimulationMethod();
- ~ImageSimulationMethod() ITK_OVERRIDE
+ ~ImageSimulationMethod() override
{
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
// virtual void GenerateData();
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
ImageSimulationMethod(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
index 2bbed5e700aa682638e0755ebc2f5083a5b94868..c8dd54ea8907ee4db0456af153023fd8791294b7 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
@@ -120,12 +120,12 @@ public:
protected:
LabelMapToSimulatedImageFilter();
- ~LabelMapToSimulatedImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelMapToSimulatedImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
+ void GenerateOutputInformation() override;
private:
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
index a91fbae7931b6d145f4a30545ff502032726a6ab..a65f6998e4d6c843b1729ee4956888e42e728545 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
@@ -86,11 +86,11 @@ public:
// virtual const ParametersType & GetStep1Parameters();
//virtual const ParametersType & GetStep2Parameters();
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
LabelToProSailParameters();
- ~LabelToProSailParameters() ITK_OVERRIDE {}
+ ~LabelToProSailParameters() override {}
private:
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
index 0b524971556245b04c773be3ec40ad484f25d4f5..db03b1bbe21ee95f09d61f7711b9e4c2f8bc33a5 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
@@ -93,7 +93,7 @@ public:
protected:
LabelToSimulationParametersBase(){};
- ~LabelToSimulationParametersBase() ITK_OVERRIDE {}
+ ~LabelToSimulationParametersBase() override {}
private:
diff --git a/Modules/Radiometry/Simulation/include/otbLeafParameters.h b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
index 1ed4e20a10d7be7c9798e39319b773628343e6d8..ed7af69394bd465918e24c681fc4088930d051d1 100644
--- a/Modules/Radiometry/Simulation/include/otbLeafParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
@@ -78,9 +78,9 @@ class OTBSimulation_EXPORT LeafParameters : public itk::DataObject
/** Constructor */
LeafParameters();
/** Destructor */
- ~LeafParameters() ITK_OVERRIDE;
+ ~LeafParameters() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LeafParameters(const Self&); //purposely not implemented
diff --git a/Modules/Radiometry/Simulation/include/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
index ea021d2811178d4c2d55ffbdad044e00e60b2356..5790a66ed30b6c14da3db6f34c577077c6408142 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 override;
private:
diff --git a/Modules/Radiometry/Simulation/include/otbProspectModel.h b/Modules/Radiometry/Simulation/include/otbProspectModel.h
index 7b7468068a8a35d9fac1cb6b9914b8eb47a4006c..668659c09dd08811036fdc774f0c2d538a3c96e1 100644
--- a/Modules/Radiometry/Simulation/include/otbProspectModel.h
+++ b/Modules/Radiometry/Simulation/include/otbProspectModel.h
@@ -66,21 +66,21 @@ class OTBSimulation_EXPORT ProspectModel : public SimulationStep1Base
LeafParametersType * GetInput();
/** GenerateData */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Get Output reflectance/transmittance*/
- SpectralResponseType * GetReflectance() ITK_OVERRIDE;
- SpectralResponseType * GetTransmittance() ITK_OVERRIDE;
+ SpectralResponseType * GetReflectance() override;
+ SpectralResponseType * GetTransmittance() override;
protected:
/** Constructor */
ProspectModel();
/** Destructor */
- ~ProspectModel() ITK_OVERRIDE;
+ ~ProspectModel() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType) override;
using Superclass::MakeOutput;
/** Compute Transmission of isotropic radiation across an interface between two dielectrics*/
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index d9a944bf7d1c9f639b718d6aeee7e030f2fd8646..4a97b1ec994337aedb1f48d0ea5bf70598adda2b 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -113,7 +113,7 @@ public:
virtual bool Clear();
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* \param PrecisionType
@@ -135,7 +135,7 @@ protected:
/** Constructor from a ASCII file */
//ReduceSpectralResponse( const std::string & filename );
/** Destructor */
- ~ReduceSpectralResponse() ITK_OVERRIDE
+ ~ReduceSpectralResponse() override
{
}
;
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
index 7050b8c0a51e5c29e349fdf981b0f8827a3a0c25..c8e334ae5ec59c6c94140ad88406557b675994a7 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -109,7 +109,7 @@ namespace otb
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
@@ -125,7 +125,7 @@ namespace otb
/** Constructor from a ASCII file */
//ReduceSpectralResponseClassifierRAndNIR( const std::string & filename );
/** Destructor */
- ~ReduceSpectralResponseClassifierRAndNIR() ITK_OVERRIDE {};
+ ~ReduceSpectralResponseClassifierRAndNIR() override {};
/** PrintSelf method */
//void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
index 4cc13e159852eda76206b12bb8759ed77f868f9d..2fde7522dfb442ac29b5237a588e337b2d3a391e 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
@@ -127,7 +127,7 @@ public:
inline ValuePrecisionType operator()(const PrecisionType & lambda, const unsigned int numBand);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** get vector of RSR */
RSRVectorType & GetRSR()
@@ -147,7 +147,7 @@ protected:
/** Constructor from a ASCII file */
//SatelliteRSR( const std::string & filename );
/** Destructor */
- ~SatelliteRSR() ITK_OVERRIDE
+ ~SatelliteRSR() override
{
}
;
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
index 9bb396188b725ef75ed88ce5c35f45b702b52684..ecf5472ab0d109796d5d9c533fd3cd819ee2417f 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
@@ -69,7 +69,7 @@ public:
protected:
SimulationStep1Base(){};
- ~SimulationStep1Base() ITK_OVERRIDE {}
+ ~SimulationStep1Base() override {}
private:
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
index 10db201a365a101d201a36ab36770106ba7d03f1..5aed410ef77c42c6074acbbadac90c4ac837e6fc 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
@@ -70,7 +70,7 @@ protected:
{
}
;
- ~SimulationStep2Base() ITK_OVERRIDE
+ ~SimulationStep2Base() override
{
}
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
index 3009be20fea4452f4c868713b84b4c5ae1011f50..7e5b72aa987d4be9408953f92b76804485c99434 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
@@ -112,12 +112,12 @@ public:
protected:
SpatialisationFilter();
- ~SpatialisationFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~SpatialisationFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
virtual void ProcessObject(unsigned int obj);
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
private:
SpatialisationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
index 5ccd1fa935d3a2ccb7bc31041013b9989dfba4b4..789924e4f5948b5182087744c9a442c37f78aacf 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
@@ -104,7 +104,7 @@ public:
void Load(const std::string & filename, ValuePrecisionType coefNormalization = 1.0);
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** get vector of spectral responses */
VectorPairType & GetResponse()
@@ -163,7 +163,7 @@ protected:
/** Constructor from a ASCII file */
//SpectralResponse( const std::string & filename );
/** Destructor */
- ~SpectralResponse() ITK_OVERRIDE
+ ~SpectralResponse() override
{
}
;
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index c07fbd4c97638e0154b88e1d2c2a4df8d614ecda..840f880dbef325d0cb7596a95f49ec331edb975b 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -263,18 +263,18 @@ protected:
/** Constructor */
SurfaceReflectanceToReflectanceFilter();
/** Destructor */
- ~SurfaceReflectanceToReflectanceFilter() ITK_OVERRIDE {};
+ ~SurfaceReflectanceToReflectanceFilter() override {};
/** Initialize the functor vector */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Fill AtmosphericRadiativeTerms using image metadata*/
void UpdateAtmosphericRadiativeTerms();
/** Update Functors parameters */
void UpdateFunctors();
/** If modified, we need to compute the functor parameters again */
- void Modified() const ITK_OVERRIDE;
+ void Modified() const override;
private:
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index 0ace44f23c6c1ec8d0c74b0ec51e800067d700c0..56a89eeccb9a26a7e10ea2a9aeb600ff214f73b7 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -184,15 +184,15 @@ protected:
/**
* Destructor.
*/
- ~DisparityMapEstimationMethod() ITK_OVERRIDE;
+ ~DisparityMapEstimationMethod() override;
/**
* Standard PrintSelf method.
*/
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Main computation method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
DisparityMapEstimationMethod(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
index 3c8b7d22e79364fa686590d9fb00df83a0f1e547..1031f95bbf3738b890c538dab55d7c0deeb447dc 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
@@ -151,8 +151,8 @@ public:
protected:
DisparityMapMedianFilter();
- ~DisparityMapMedianFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~DisparityMapMedianFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** MedianImageFilter needs a larger input requested region than
* the output requested region. As such, MedianImageFilter needs
@@ -160,13 +160,13 @@ protected:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** apply median filter */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
DisparityMapMedianFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
index eb505e58dd0cf555431190cdc5208e912907a033..1558f7592f33bf0232b3813064dc20e82cd81eaf 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -144,26 +144,26 @@ protected:
DisparityMapTo3DFilter();
/** Destructor */
- ~DisparityMapTo3DFilter() ITK_OVERRIDE;
+ ~DisparityMapTo3DFilter() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
index 0e3bb5905db48d59b37efdb28a5d320db0afdfcb..7ed891c1f2b5d84822138dbf0360741e76f0588a 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -149,29 +149,29 @@ protected:
DisparityMapToDEMFilter();
/** Destructor */
- ~DisparityMapToDEMFilter() ITK_OVERRIDE;
+ ~DisparityMapToDEMFilter() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
/** After threaded generate data : sum up temporary DEMs */
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
index fb811e230f5a89d1a46e8a4c620cfddb9e27373a..92133ed381d638932c898f104b12de92d945f195 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -119,23 +119,23 @@ protected:
DisparityTranslateFilter();
/** Destructor */
- ~DisparityTranslateFilter() ITK_OVERRIDE{};
+ ~DisparityTranslateFilter() override{};
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
index 18bd032b64624cede4b264b2041035f534e80e74..5d909dd2796ac87abfc43360be6596c0b1e1e11d 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
@@ -189,16 +189,16 @@ protected:
/** Constructor */
FineRegistrationImageFilter();
/** Destructor */
- ~FineRegistrationImageFilter() ITK_OVERRIDE {};
+ ~FineRegistrationImageFilter() override {};
/** Threaded generate data */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Generate the input requested regions */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
private:
FineRegistrationImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index c6cdc5f21146b862ad478a4793a1a486ce56abe5..94a28101d54851c3ffa473979700068aa0c7ddc6 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -157,19 +157,19 @@ protected:
MultiDisparityMapTo3DFilter();
/** Destructor */
- ~MultiDisparityMapTo3DFilter() ITK_OVERRIDE;
+ ~MultiDisparityMapTo3DFilter() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
private:
MultiDisparityMapTo3DFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
index c33bb1791455a120a8689b5ef66e7cdad6f9983a..b7b7a724364125700428b40cc76954b6a6aac361 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
@@ -137,18 +137,18 @@ public:
protected:
NCCRegistrationFilter();
- ~NCCRegistrationFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~NCCRegistrationFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Initialize the state of filter and equation before each iteration. */
- void InitializeIteration() ITK_OVERRIDE;
+ void InitializeIteration() override;
/** Apply update. */
using Superclass::ApplyUpdate;
virtual void ApplyUpdate(TimeStepType dt);
/** Update the Input requested region. */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
private:
NCCRegistrationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
index 352ea6d16c776ada443004b1799203b6cdd26301..ac5580ab6fdd3f2ed536d5608be5bebd8f9afb77 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
@@ -120,38 +120,38 @@ public:
}
/** This class uses a constant timestep of 1. */
- TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData)) const ITK_OVERRIDE
+ TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData)) const override
{
return m_TimeStep;
}
/** Return a pointer to a global data structure that is passed to
* this object from the solver at each calculation. */
- void *GetGlobalDataPointer() const ITK_OVERRIDE
+ void *GetGlobalDataPointer() const override
{
GlobalDataStruct *global = new GlobalDataStruct();
return global;
}
/** Release memory for global data structure. */
- void ReleaseGlobalDataPointer(void *GlobalData) const ITK_OVERRIDE
+ void ReleaseGlobalDataPointer(void *GlobalData) const override
{
delete (GlobalDataStruct *) GlobalData;
}
/** Set the object's state before each iteration. */
- void InitializeIteration() ITK_OVERRIDE;
+ void InitializeIteration() override;
/** This method is called by a finite difference solver image filter at
* each pixel that does not lie on a data set boundary */
PixelType ComputeUpdate(const NeighborhoodType& neighborhood,
void *globalData,
- const FloatOffsetType& offset = FloatOffsetType(0.0)) ITK_OVERRIDE;
+ const FloatOffsetType& offset = FloatOffsetType(0.0)) override;
protected:
NCCRegistrationFunction();
- ~NCCRegistrationFunction() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~NCCRegistrationFunction() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** FixedImage image neighborhood iterator type. */
typedef itk::ConstNeighborhoodIterator<FixedImageType> FixedImageNeighborhoodIteratorType;
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
index 824e65da5db61fb5f2d6e9156daf1a39a24ad990..496ee3a4236231104d0b550a7a78e956d676073b 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
@@ -418,10 +418,10 @@ public:
return m_Functor;
}
- /** Set initial horizontal disparity field (optional, ITK_OVERRIDE m_InitHorizontalDisparity) */
+ /** Set initial horizontal disparity field (optional, override m_InitHorizontalDisparity) */
void SetHorizontalDisparityInput( const TOutputDisparityImage * hfield);
- /** Set initial vertical disparity field (optional, ITK_OVERRIDE m_InitVerticalDisparity) */
+ /** Set initial vertical disparity field (optional, override m_InitVerticalDisparity) */
void SetVerticalDisparityInput( const TOutputDisparityImage * vfield);
/** Get the initial disparity fields */
@@ -447,19 +447,19 @@ protected:
PixelWiseBlockMatchingImageFilter();
/** Destructor */
- ~PixelWiseBlockMatchingImageFilter() ITK_OVERRIDE;
+ ~PixelWiseBlockMatchingImageFilter() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
private:
PixelWiseBlockMatchingImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index 316930a2aa8c5692a101904fa973b4f835079a74..c5489f78ead9381e379944fb49554ba28b5d9870 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -210,29 +210,29 @@ protected:
SubPixelDisparityImageFilter();
/** Destructor */
- ~SubPixelDisparityImageFilter() ITK_OVERRIDE;
+ ~SubPixelDisparityImageFilter() override;
/** \brief Verify that the input images are compatible
*
* This method needs to be re-implemented from ImageToImageFilter since
* the initial images and disparity maps may not have the same size
*/
- void VerifyInputInformation() ITK_OVERRIDE;
+ void VerifyInputInformation() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
/** After threaded generate data */
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
private:
SubPixelDisparityImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
index 8f89e6315535ad4831eef88c6301db3e3fc9def0..93d440ead4c2ebc9760434f8f08757134b270239 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
@@ -66,11 +66,11 @@ protected:
/** Constructor */
BSplinesInterpolateDisplacementFieldGenerator() {};
/** Destructor */
- ~BSplinesInterpolateDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~BSplinesInterpolateDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
BSplinesInterpolateDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index 4af2d2a82ee54a8ebd4cbb1387950a72ca8c5c75..8ead3ebe92f3a9d8dc70cb6d9719742c45def90e 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -106,13 +106,13 @@ protected:
/** Constructor */
BSplinesInterpolateTransformDisplacementFieldGenerator();
/** Destructor */
- ~BSplinesInterpolateTransformDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~BSplinesInterpolateTransformDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/**
* Test whether a parameter is angular or not.
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
index 341499979f7085c17c33458cd52dad4228fada03..0aaa57fcca326196526f7abc554db57b8aa505f1 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
@@ -67,11 +67,11 @@ protected:
/** Constructor */
NNearestPointsLinearInterpolateDisplacementFieldGenerator() {};
/** Destructor */
- ~NNearestPointsLinearInterpolateDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~NNearestPointsLinearInterpolateDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
NNearestPointsLinearInterpolateDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
index e83a3675615afe02cf5daaa4b3fb68da63320fed..a3f307fb40ae1336c1b8e769f5cd682d867fad60 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
@@ -74,11 +74,11 @@ protected:
/** Constructor */
NNearestTransformsLinearInterpolateDisplacementFieldGenerator() {};
/** Destructor */
- ~NNearestTransformsLinearInterpolateDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~NNearestTransformsLinearInterpolateDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
NNearestTransformsLinearInterpolateDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
index cfe80219b10e2581f73672db12f5a89164d415a3..b52405d6c10cd9fbac9c4a66e2bc70dbf7e72bf7 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
@@ -64,11 +64,11 @@ protected:
/** Constructor */
NearestPointDisplacementFieldGenerator() {};
/** Destructor */
- ~NearestPointDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~NearestPointDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
NearestPointDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
index 0ddae1eb841225158f8aa3657d82a2f2f93dd4d7..cda52183223b97a8f8756c6fd7dade9722c1e2ff 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
@@ -67,11 +67,11 @@ protected:
/** Constructor */
NearestTransformDisplacementFieldGenerator() {};
/** Destructor */
- ~NearestTransformDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~NearestTransformDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
NearestTransformDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
index 77028b48b4b169e2844943282a1f69ca66f912f5..bbd237cb10ea0a11cefad72488bd4ac63afaeb22 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
@@ -125,11 +125,11 @@ protected:
/** Constructor */
PointSetToDisplacementFieldGenerator();
/** Destructor */
- ~PointSetToDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~PointSetToDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/**
* Generate the n nearest valid point in point set, where a valid point has a sufficient metric value.
* \param index The index of the pixel to compute.
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
index 998c1f57c288fad58eb6789a73b96857213cbe70..7618deceb6201ecf1baa9c22cb96d4d7f0ec482d 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
@@ -84,9 +84,9 @@ protected:
/** Constructor */
PointSetWithTransformToDisplacementFieldGenerator();
/** Destructor */
- ~PointSetWithTransformToDisplacementFieldGenerator() ITK_OVERRIDE {}
+ ~PointSetWithTransformToDisplacementFieldGenerator() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
PointSetWithTransformToDisplacementFieldGenerator(const Self &); //purposely not implemented
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
index 1f3e48d17784320ee721ce579741af0ce79e3e6d..9e6542dfd2932364a070999e83a8cb04922ee632 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
@@ -151,16 +151,16 @@ protected:
/** Constructor */
AdhesionCorrectionFilter();
/** Destructor */
- ~AdhesionCorrectionFilter() ITK_OVERRIDE {};
+ ~AdhesionCorrectionFilter() override {};
/** Threaded generate data */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Generate the input requested regions */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Generate output information */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
private:
AdhesionCorrectionFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
index a9f620fbc24ebc3ca2db2efef4b0b682ba266218..07cd1703d74e6eb809e5e08561cae2e3197a0b2e 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
@@ -114,16 +114,16 @@ protected:
BijectionCoherencyFilter();
/** Destructor */
- ~BijectionCoherencyFilter() ITK_OVERRIDE{};
+ ~BijectionCoherencyFilter() override{};
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputRegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const OutputRegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
private:
BijectionCoherencyFilter(const Self&); //purposely not implemented
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
index 419381bc19d3f8c6c0cd22d6edd581e2ba663a77..c7e96cbb106cb9dde235f121a03781bbcc99542f 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
@@ -87,7 +87,7 @@ protected:
LineOfSightOptimizer();
/** Destructor */
- ~LineOfSightOptimizer() ITK_OVERRIDE{};
+ ~LineOfSightOptimizer() override{};
private:
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index 21e8287b64695538db359950de0d079d6ab743e8..6dc2c0e1a943957b8fa947e7c61e9709794dde90 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -232,29 +232,29 @@ protected:
Multi3DMapToDEMFilter();
/** Destructor */
- ~Multi3DMapToDEMFilter() ITK_OVERRIDE;
+ ~Multi3DMapToDEMFilter() override;
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Before threaded generate data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) ITK_OVERRIDE;
+ void ThreadedGenerateData(const RegionType & outputRegionForThread, itk::ThreadIdType threadId) override;
/** After threaded generate data */
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index 8a5137c4f662ce0aee315573f403199a363424a7..40d1423006d9aed543b6a6305ffea9ab4a74ecbf 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -190,24 +190,24 @@ protected:
StereoSensorModelToElevationFilter();
/** Destructor */
- ~StereoSensorModelToElevationFilter() ITK_OVERRIDE;
+ ~StereoSensorModelToElevationFilter() override;
/** Threaded generate data */
void ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType threadId) ITK_OVERRIDE;
+ itk::ThreadIdType threadId) override;
/** Generate the input requested regions */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Things to do before the threaded generate-data */
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() ITK_OVERRIDE {}
+ void VerifyInputInformation() override {}
private:
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
index 8fe1adc44f7e3d3de212df479d9ba885ad79a0a7..efd6ed38cfa2315f8ebb039e3c9950037b013c03 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
@@ -166,19 +166,19 @@ protected:
StereorectificationDisplacementFieldSource( void );
/** Destructor */
- ~StereorectificationDisplacementFieldSource( void ) ITK_OVERRIDE {};
+ ~StereorectificationDisplacementFieldSource( void ) override {};
/** Generate output images information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Enlarge output requested region (no streaming) */
- void EnlargeOutputRequestedRegion(itk::DataObject * itkNotUsed(output)) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion(itk::DataObject * itkNotUsed(output)) override;
/** Compute the deformation field */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf( std::ostream& os, itk::Indent indent ) const ITK_OVERRIDE;
+ void PrintSelf( std::ostream& os, itk::Indent indent ) const override;
private:
StereorectificationDisplacementFieldSource( const Self& ); // purposely
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
index 867b94ec407c8e1b6073df37d91433776f61a235..b5bf076015771e81b74418113437a3b85880c9ef 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
@@ -111,18 +111,18 @@ public:
/** return list of Mu Parser functions**/
Parser::FunctionMapType GetFunList() const;
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
- void EnlargeOutputRequestedRegion(itk::DataObject *) ITK_OVERRIDE {}
+ void EnlargeOutputRequestedRegion(itk::DataObject *) override {}
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
LabelObjectOpeningMuParserFilter();
- ~LabelObjectOpeningMuParserFilter() ITK_OVERRIDE;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelObjectOpeningMuParserFilter() override;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
LabelObjectOpeningMuParserFilter(const Self&); //purposely not implemented
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index a33dd9d86c6ac02e3e44c8c139df4fb8e4ad223d..047c0efafcd055e944d92f233f74ab77bacd47e2 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -181,9 +181,9 @@ public:
protected:
PersistentConnectedComponentSegmentationOBIAToVectorDataFilter();
- ~PersistentConnectedComponentSegmentationOBIAToVectorDataFilter() ITK_OVERRIDE;
+ ~PersistentConnectedComponentSegmentationOBIAToVectorDataFilter() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
private:
ObjectSizeType m_MinimumObjectSize;
@@ -199,7 +199,7 @@ private:
bool m_ComputeFeretDiameter;
bool m_ComputePerimeter;
- VectorDataPointerType ProcessTile() ITK_OVERRIDE;
+ VectorDataPointerType ProcessTile() override;
};
/** \class StreamingConnectedComponentSegmentationOBIAToVectorDataFilter
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
index b3781f7237a8740dac4eb43c0e70fcbc135a3533..0664c20e2792139d7863fb0be055e32fefbc9e05 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
@@ -115,20 +115,20 @@ public:
InputSpectralImageType * GetInputSpectralImage();
protected:
- void EnlargeOutputRequestedRegion( itk::DataObject *output ) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion( itk::DataObject *output ) override;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Constructor */
LabelImageRegionMergingFilter();
/** Destructor */
- ~LabelImageRegionMergingFilter() ITK_OVERRIDE;
+ ~LabelImageRegionMergingFilter() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Method to build a map of adjacent regions */
RegionAdjacencyMapType LabelImageToRegionAdjacencyMap(typename OutputLabelImageType::Pointer inputLabelImage);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
index b881185a7651e6f89bfe1248ecf36257b41f5b63..932d64309ae3cd62aed1df6437eafef73074ca89 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
@@ -114,20 +114,20 @@ public:
InputSpectralImageType * GetInputSpectralImage();
protected:
- void EnlargeOutputRequestedRegion( itk::DataObject *output ) ITK_OVERRIDE;
+ void EnlargeOutputRequestedRegion( itk::DataObject *output ) override;
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Constructor */
LabelImageRegionPruningFilter();
/** Destructor */
- ~LabelImageRegionPruningFilter() ITK_OVERRIDE;
+ ~LabelImageRegionPruningFilter() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Method to build a map of adjacent regions */
RegionAdjacencyMapType LabelImageToRegionAdjacencyMap(typename OutputLabelImageType::Pointer inputLabelImage);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index eef1020ad71e1dac2084f8179d41122d5fd57842..9e0202ef81990a9b72f59b09b95d3260ae57a825 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -114,17 +114,17 @@ public:
protected:
LabelImageToOGRDataSourceFilter();
- ~LabelImageToOGRDataSourceFilter() ITK_OVERRIDE {}
+ ~LabelImageToOGRDataSourceFilter() override {}
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Generate Data method*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** DataObject pointer */
typedef itk::DataObject::Pointer DataObjectPointer;
- DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) ITK_OVERRIDE;
+ DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override;
using Superclass::MakeOutput;
private:
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index a72ae77386e5433cb8f4af1b5537b82739c375bb..6d1b189be323c92235abf44187ebf528d6643ff8 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -104,12 +104,12 @@ public:
protected:
LabelImageToVectorDataFilter();
- ~LabelImageToVectorDataFilter() ITK_OVERRIDE {}
+ ~LabelImageToVectorDataFilter() override {}
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Generate Data method*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
LabelImageToVectorDataFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index 8b81e0365317e6b4cc74bd6e3bb155e327b0d970..3e17c8983fac86b18aa6b352802a1c63b9f634cf 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -115,9 +115,9 @@ public:
protected:
LabelMapToVectorDataFilter();
- ~LabelMapToVectorDataFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ ~LabelMapToVectorDataFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ void GenerateData() override;
private:
LabelMapToVectorDataFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
index 421075334f14fb41a2ebc4b9f4a826f4f44e8e82..bec0926d8d85c83e4e1d8408d3710c89cd72b708 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
@@ -140,14 +140,14 @@ public:
void SetOutputParametersFromImage(const ImageBaseType * image);
protected:
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
OGRDataSourceToLabelImageFilter();
- ~OGRDataSourceToLabelImageFilter() ITK_OVERRIDE {}
+ ~OGRDataSourceToLabelImageFilter() override {}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
OGRDataSourceToLabelImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
index 433917b811ba7eb60340e25584f97942972e3910..98c5760c62587acb166c418b4807d07f946d55be 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
@@ -74,9 +74,9 @@ public:
typedef ogr::Layer OGRLayerType;
typedef ogr::Feature OGRFeatureType;
- void AllocateOutputs() ITK_OVERRIDE;
- void Reset(void) ITK_OVERRIDE;
- void Synthetize(void) ITK_OVERRIDE;
+ void AllocateOutputs() override;
+ void Reset(void) override;
+ void Synthetize(void) override;
/** This method creates the output layer in the OGRLayer set by the user.
* \note This methode must be called before the call of Update .
@@ -96,11 +96,11 @@ public:
protected:
PersistentImageToOGRLayerFilter();
- ~PersistentImageToOGRLayerFilter() ITK_OVERRIDE;
+ ~PersistentImageToOGRLayerFilter() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
index e5f1aef4611538cbb815886f53b3e86e09ba15ca..3b49caaa61c3558bc6e5c95aee58a22290947eee 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
@@ -86,11 +86,11 @@ public:
OutputVectorDataType* GetOutputVectorData() const;
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
- void Reset(void) ITK_OVERRIDE;
+ void Reset(void) override;
- void Synthetize(void) ITK_OVERRIDE;
+ void Synthetize(void) override;
/** Specify the name of the output shapefile to write. */
itkSetStringMacro(FileName);
@@ -98,11 +98,11 @@ public:
protected:
PersistentImageToVectorDataFilter();
- ~PersistentImageToVectorDataFilter() ITK_OVERRIDE {}
+ ~PersistentImageToVectorDataFilter() override {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
ExtractImageFilterPointerType m_ExtractFilter;
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index be354efbb68e1f0871f25335a8647fa0497dd3e5..eb197d050f6bc85f0884a5e8cffddea3c4e106eb 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -136,10 +136,10 @@ public:
}
protected:
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
RasterizeVectorDataFilter();
- ~RasterizeVectorDataFilter() ITK_OVERRIDE
+ ~RasterizeVectorDataFilter() override
{
if (m_OGRDataSourcePointer != ITK_NULLPTR)
{
@@ -147,9 +147,9 @@ protected:
}
}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
RasterizeVectorDataFilter(const Self&); //purposely not implemented
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index c7a0627250ab9516d93412d7e55fd81e0e5e1cb6..d240df3fc7ce8b0bd37cf2a203249c78f199b586 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -124,10 +124,10 @@ public:
void SetOutputParametersFromImage(const ImageBaseType * image);
protected:
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
VectorDataToLabelImageFilter();
- ~VectorDataToLabelImageFilter() ITK_OVERRIDE
+ ~VectorDataToLabelImageFilter() override
{
// Destroy the geometries stored
for (unsigned int idx = 0; idx < m_SrcDataSetGeometries.size(); ++idx)
@@ -141,9 +141,9 @@ protected:
}
}
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
VectorDataToLabelImageFilter(const Self&); //purposely not implemented
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 924b6ff894961d86f2153036444bf8baf3f42fae..9c3656dd3497e577346b46ce0446f28cf139a06d 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -161,18 +161,18 @@ public:
const InputVectorDataType * GetInput(void);
const InputVectorDataType * GetInput(unsigned int idx);
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
protected:
VectorDataToLabelMapFilter();
- ~VectorDataToLabelMapFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~VectorDataToLabelMapFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Standard pipeline method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** VectorDataToLabelMapFilter needs the entire input. Therefore
* it must provide an implementation GenerateInputRequestedRegion().
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index acedfcebebbc1093331c8be85a22ec28bab0b596..28a2baec1efa69722ba524e90edb1b8b9d4da564 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -187,20 +187,20 @@ public:
; itkGetMacro(InitialLabel, LabelType)
;
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
protected:
VectorDataToLabelMapWithAttributesFilter();
- ~VectorDataToLabelMapWithAttributesFilter() ITK_OVERRIDE
+ ~VectorDataToLabelMapWithAttributesFilter() override
{
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/**
* Standard pipeline method.
*/
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** VectorDataToLabelMapWithAttributesFilter needs the entire input. Therefore
* it must provide an implementation GenerateInputRequestedRegion().
diff --git a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
index b1a67e420087fb0ec6fda1ed95a80a436b12435c..4e34052d2133a5c9c2b91a3f74191bc9e3485e50 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
@@ -98,7 +98,7 @@ protected:
{
this->SetRadius(1);
}
- ~LabelToBoundaryImageFilter() ITK_OVERRIDE { }
+ ~LabelToBoundaryImageFilter() override { }
private:
LabelToBoundaryImageFilter( const Self & ); // Not implemented
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
index 3e8c27e0929212856a281c1650e21dcb2c334d11..be83bcb2a2e2fcbf785af1dfb607f9bb4f67edc6 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
@@ -109,11 +109,11 @@ public:
protected:
LabelizeConfidenceConnectedImageFilter();
- ~LabelizeConfidenceConnectedImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelizeConfidenceConnectedImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Region growing */
- void RegionGrowing(const IndexType indexSeed) ITK_OVERRIDE;
+ void RegionGrowing(const IndexType indexSeed) override;
private:
LabelizeConfidenceConnectedImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
index 37ce1dfd747f748fe5a8265f2904b1f182a9cf5b..018f343997092ea5c1c1a100f586754235a7679d 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
@@ -82,11 +82,11 @@ public:
protected:
LabelizeConnectedThresholdImageFilter();
- ~LabelizeConnectedThresholdImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelizeConnectedThresholdImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Region growing */
- void RegionGrowing(const IndexType indexSeed) ITK_OVERRIDE;
+ void RegionGrowing(const IndexType indexSeed) override;
private:
LabelizeConnectedThresholdImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
index d817bb3f6b90f6b1e2b1cddab5235022023501a9..1f8b5305bd7d44965f25e767825d5e802d49a790 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
@@ -96,11 +96,11 @@ public:
protected:
LabelizeImageFilterBase();
- ~LabelizeImageFilterBase() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelizeImageFilterBase() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Region growing */
virtual void RegionGrowing(const IndexType itkNotUsed(indexSeed)) {}
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
index 768377f48c04b08df610b95312322d6d7bf68702..9264ba669ed5b34dae874951ec7bcbbc9d478508 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -104,11 +104,11 @@ public:
protected:
LabelizeNeighborhoodConnectedImageFilter();
- ~LabelizeNeighborhoodConnectedImageFilter() ITK_OVERRIDE {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ ~LabelizeNeighborhoodConnectedImageFilter() override {}
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Region growing */
- void RegionGrowing(const IndexType indexSeed) ITK_OVERRIDE;
+ void RegionGrowing(const IndexType indexSeed) override;
private:
LabelizeNeighborhoodConnectedImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
index c02dd8e432c2bf56ae85c88fe27272a6c329a108..b065125bc7645c25002fa760a8584cb2f3b47e3c 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
@@ -130,10 +130,10 @@ public:
protected:
MeanShiftConnectedComponentSegmentationFilter();
- ~MeanShiftConnectedComponentSegmentationFilter() ITK_OVERRIDE;
+ ~MeanShiftConnectedComponentSegmentationFilter() override;
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
+ void GenerateData() override;
private:
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
index 5f33cefe4a20053b9553ebb0b5ce65a28522819c..03c19157eb33ca0d7b2877cd021cae320ed5e7f2 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
@@ -173,11 +173,11 @@ public:
protected:
MeanShiftSegmentationFilter();
- ~MeanShiftSegmentationFilter() ITK_OVERRIDE;
+ ~MeanShiftSegmentationFilter() override;
// virtual void GenerateOutputInformation(void);
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
index fa71ec68ab63532c05ad067d75f8dc59a30ef8ca..cae56e1625c5fd66abee1d008eb745f7fe1228a2 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
@@ -210,30 +210,30 @@ public:
protected:
HooverInstanceFilter();
- ~HooverInstanceFilter() ITK_OVERRIDE {};
+ ~HooverInstanceFilter() override {};
/** Re implement the allocate output method to handle the second output correctly */
- void AllocateOutputs() ITK_OVERRIDE;
+ void AllocateOutputs() override;
/** Re implement the release input method to handle the second input correctly */
- void ReleaseInputs() ITK_OVERRIDE;
+ void ReleaseInputs() override;
/** Actions :
* - Fill cardinalities of GT regions
*/
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
/** Actions:
* - Check matrix size
* - Init cardinalities lists
* - Fill cardinalities list for MS (GT is done by ThreadedProcessLabelObject)
*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Actions :
* - Compute Hoover instances
*/
- void AfterThreadedGenerateData() ITK_OVERRIDE;
+ void AfterThreadedGenerateData() override;
private:
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
index 2daca45480d6589659aabdc5547fe01a3427d6ed..efedebd57f8f0f921f122d49a9221e9b08fa47b0 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
@@ -89,16 +89,16 @@ protected:
/** Constructor */
HooverMatrixFilter();
- ~HooverMatrixFilter() ITK_OVERRIDE {};
+ ~HooverMatrixFilter() override {};
/** Action : Resize the matrix
*/
- void BeforeThreadedGenerateData() ITK_OVERRIDE;
+ void BeforeThreadedGenerateData() override;
/** Action : fill the line of the confusion matrix corresponding to
* the given label object
*/
- void ThreadedProcessLabelObject( LabelObjectType * labelObject ) ITK_OVERRIDE;
+ void ThreadedProcessLabelObject( LabelObjectType * labelObject ) override;
private:
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
index c3639adf0a51d1ec2fdeaf8c5bf7975f97924aaa..f1d5e29ae6308534d6f28c2b495f0e757b563e80 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
@@ -79,15 +79,15 @@ protected:
/** Constructor */
ClosingOpeningMorphologicalFilter();
/** Destructor */
- ~ClosingOpeningMorphologicalFilter() ITK_OVERRIDE {}
+ ~ClosingOpeningMorphologicalFilter() override {}
/* void GenerateInputRequestedRegion(); */
/* void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)); */
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ClosingOpeningMorphologicalFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
index f409881fcb6defb14682415772edfb8d09bf7e7f..dcd0f39432d20ed63eacebd195b66f15a148a663 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
@@ -215,7 +215,7 @@ public:
*
*/
using Superclass::SetInput;
- void SetInput(const TInputImage * image) ITK_OVERRIDE
+ void SetInput(const TInputImage * image) override
{
this->SetInput1(image);
}
@@ -242,7 +242,7 @@ public:
itkGetMacro(Sigma, double);
/** Set the functor parameters before calling the ThreadedGenerateData() */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
this->GetFunctor().SetConvexLabel(m_ConvexLabel);
this->GetFunctor().SetConcaveLabel(m_ConcaveLabel);
@@ -260,9 +260,9 @@ protected:
m_Sigma = 0.0;
};
/** Destructor */
- ~ConvexOrConcaveClassificationFilter() ITK_OVERRIDE {}
+ ~ConvexOrConcaveClassificationFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << indent << "ConvexLabel: " << m_ConvexLabel << std::endl;
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index 6c2174532a5609f606cf7dadd128761b5d73d8db..d2e77b8772ce329b6de7fc23246f2ea157e1f68d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -149,13 +149,13 @@ public:
protected:
/** GenerateData */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
GeodesicMorphologyDecompositionImageFilter();
/** Destructor */
- ~GeodesicMorphologyDecompositionImageFilter() ITK_OVERRIDE {}
+ ~GeodesicMorphologyDecompositionImageFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
GeodesicMorphologyDecompositionImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index 92cfb85df6bfd3acbb2b1ecbad2ca9d1f049d46b..91d51758e82ac7764a21ed27cd01fae2ef13cea9 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -116,7 +116,7 @@ public:
* Get The leveling images for each scale.
* \return The leveling images for each scale.
*/
- OutputImageListType* GetOutput(void) ITK_OVERRIDE;
+ OutputImageListType* GetOutput(void) override;
/**
* Get convex membership function for each scale
* \return The convex membership function for each scale.
@@ -132,15 +132,15 @@ protected:
/** Constructor */
GeodesicMorphologyIterativeDecompositionImageFilter();
/** Destructor */
- ~GeodesicMorphologyIterativeDecompositionImageFilter() ITK_OVERRIDE {}
+ ~GeodesicMorphologyIterativeDecompositionImageFilter() override {}
/** Generate output information */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** Generate input requested region */
- void GenerateInputRequestedRegion() ITK_OVERRIDE;
+ void GenerateInputRequestedRegion() override;
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
/** The step for the scale analysis */
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
index 3c7a16920d4ad09dfb894b726a866db797125ba2..6211c5969706c1c279ce6ed286474b462b79138b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
@@ -117,7 +117,7 @@ public:
* Set the original input image
*/
using Superclass::SetInput;
- void SetInput(const TInputImage * input) ITK_OVERRIDE
+ void SetInput(const TInputImage * input) override
{
this->SetInput1(input);
}
@@ -126,9 +126,9 @@ protected:
/** Constructor */
GeodesicMorphologyLevelingFilter() {};
/** Destructor */
- ~GeodesicMorphologyLevelingFilter() ITK_OVERRIDE {}
+ ~GeodesicMorphologyLevelingFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
index 0c6a3f66040efec4353929fca69e763591044a5a..85223e736c8942959b079c2791740bde2ac57cdc 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
@@ -91,17 +91,17 @@ protected:
/** Get the pointer to the filter */
itkGetObjectMacro(Filter, FilterType);
/** GenerateData method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** GenerateOutputInformation method */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Constructor */
ImageToProfileFilter();
/** Destructor */
- ~ImageToProfileFilter() ITK_OVERRIDE {}
+ ~ImageToProfileFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ImageToProfileFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
index f3d08451e3334c9fca02db5fd190a8a3b688ff13..a5af9642872343166e61db758688da098673e6bc 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
@@ -77,7 +77,7 @@ public:
protected:
/** Set the profile parameter */
- void SetProfileParameter(ParameterType param) ITK_OVERRIDE
+ void SetProfileParameter(ParameterType param) override
{
StructuringElementType se;
se.SetRadius(param);
@@ -87,9 +87,9 @@ protected:
/** Constructor */
MorphologicalClosingProfileFilter() {};
/** Destructor */
- ~MorphologicalClosingProfileFilter() ITK_OVERRIDE {}
+ ~MorphologicalClosingProfileFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
index 83fde0a9f8c0c7f5f886083b7817550cc6fa64a7..2c8d5bdbbf248ebf42fb77cfc16b971e5c13b62d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
@@ -77,7 +77,7 @@ public:
protected:
/** Set the profile parameter */
- void SetProfileParameter(ParameterType param) ITK_OVERRIDE
+ void SetProfileParameter(ParameterType param) override
{
StructuringElementType se;
se.SetRadius(param);
@@ -87,9 +87,9 @@ protected:
/** Constructor */
MorphologicalOpeningProfileFilter() {};
/** Destructor */
- ~MorphologicalOpeningProfileFilter() ITK_OVERRIDE {}
+ ~MorphologicalOpeningProfileFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
}
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
index 401c3fde2301604337b51993f8dc5e5bf88e141b..f61f87fc82bb53b93113a258d8af4305d343ac10 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
@@ -106,9 +106,9 @@ itkGetConstReferenceMacro(Sigma,double);
protected:
MorphologicalProfilesSegmentationFilter();
-~MorphologicalProfilesSegmentationFilter() ITK_OVERRIDE;
+~MorphologicalProfilesSegmentationFilter() override;
-void GenerateData() ITK_OVERRIDE;
+void GenerateData() override;
private:
typename OpeningProfileFilterType::Pointer m_OpeningProfile;
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
index 5bf49f3356420c54093d087aed16a93b77992269..bcb21040a6b3d55234c2964bb220066cbfe51496 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -222,7 +222,7 @@ public:
itkGetMacro(LabelSeparator, LabelType);
/** Set the functor parameters before calling the ThreadedGenerateData() */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE
+ void BeforeThreadedGenerateData(void) override
{
this->GetFunctor().SetLabelSeparator(m_LabelSeparator);
this->GetFunctor().SetSigma(m_Sigma);
@@ -236,9 +236,9 @@ protected:
m_Sigma = 0.0;
};
/** Destructor */
- ~MultiScaleConvexOrConcaveClassificationFilter() ITK_OVERRIDE {}
+ ~MultiScaleConvexOrConcaveClassificationFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override
{
Superclass::PrintSelf(os, indent);
os << indent << "LabelSeparator: " << m_LabelSeparator << std::endl;
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
index d434913a51b68b982efb360447fb3f420dbc9341..4e690115084feb3c39938368db6b7d264470168b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
@@ -79,15 +79,15 @@ protected:
/** Constructor */
OpeningClosingMorphologicalFilter();
/** Destructor */
- ~OpeningClosingMorphologicalFilter() ITK_OVERRIDE {}
+ ~OpeningClosingMorphologicalFilter() override {}
/* void GenerateInputRequestedRegion(); */
/* void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)); */
/** Main computation method */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
OpeningClosingMorphologicalFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 64ed396fa0ed5fa366457954af5ad8f5ec1546c1..805070251d18d61b004832c504f65bc12ddf7d68 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -86,26 +86,26 @@ public:
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
/** Constructor */
ProfileDerivativeToMultiScaleCharacteristicsFilter();
/** Destructor */
- ~ProfileDerivativeToMultiScaleCharacteristicsFilter() ITK_OVERRIDE {}
+ ~ProfileDerivativeToMultiScaleCharacteristicsFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ProfileDerivativeToMultiScaleCharacteristicsFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index f71b7c5536172f3e409f3e51319ff138692f9aa8..cef78cc730bb3ff6bc4d4a8b9e6d1c262994b38f 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -78,20 +78,20 @@ public:
/** Generate output information for the ImageList and for each image
in the list. */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Generate input requested region for each image in the list. */
- void GenerateInputRequestedRegion(void) ITK_OVERRIDE;
+ void GenerateInputRequestedRegion(void) override;
protected:
/** Main computation method */
- void GenerateData(void) ITK_OVERRIDE;
+ void GenerateData(void) override;
/** Constructor */
ProfileToProfileDerivativeFilter();
/** Destructor */
- ~ProfileToProfileDerivativeFilter() ITK_OVERRIDE {}
+ ~ProfileToProfileDerivativeFilter() override {}
/**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
ProfileToProfileDerivativeFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index 9f111d292a71f4df9ba00a1563f93be1e603e537..9149fbf21391820a8a18685822a822da6b145949 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -106,11 +106,11 @@ public:
itkGetMacro(StreamSize, SizeType);
/** Generate Data method. This method must be called explicitly (not through the \c Update method). */
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
protected:
OGRLayerStreamStitchingFilter();
- ~OGRLayerStreamStitchingFilter() ITK_OVERRIDE {}
+ ~OGRLayerStreamStitchingFilter() override {}
struct FusionStruct
{
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index a64db1a245dbe16bd05c9a649f3ba6bd4e9b1edf..f797bafee24f1c6c6ece5dea80e487b8a5f86d14 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -144,14 +144,14 @@ public:
protected:
PersistentImageToOGRLayerSegmentationFilter();
- ~PersistentImageToOGRLayerSegmentationFilter() ITK_OVERRIDE;
+ ~PersistentImageToOGRLayerSegmentationFilter() override;
private:
PersistentImageToOGRLayerSegmentationFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
- OGRDataSourcePointerType ProcessTile() ITK_OVERRIDE;
+ OGRDataSourcePointerType ProcessTile() override;
int m_TileMaxLabel;
@@ -349,7 +349,7 @@ protected:
/** Constructor */
StreamingImageToOGRLayerSegmentationFilter() {}
/** Destructor */
- ~StreamingImageToOGRLayerSegmentationFilter() ITK_OVERRIDE {}
+ ~StreamingImageToOGRLayerSegmentationFilter() override {}
private:
StreamingImageToOGRLayerSegmentationFilter(const Self &); //purposely not implemented
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index 9d35385b121b9037247d54ba578d4488b491cc5d..32239f115ac77d4bb0fb96e75acaa1d4b4049d16 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -84,9 +84,9 @@ public:
protected:
WatershedSegmentationFilter();
- ~WatershedSegmentationFilter() ITK_OVERRIDE;
+ ~WatershedSegmentationFilter() override;
- void GenerateData() ITK_OVERRIDE;
+ void GenerateData() override;
private:
typename CastImageFilterType::Pointer m_CastFilter;
diff --git a/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
index f9304f511be6b9ced53feb28a66ebd830ee54e53..13fc872f8623b7c72699c98ea4f9470dc45f5ef1 100644
--- a/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
+++ b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
@@ -121,12 +121,12 @@ public:
protected:
ImageRegionSplitter() {}
- ~ImageRegionSplitter() ITK_OVERRIDE {}
+ ~ImageRegionSplitter() override {}
unsigned int GetNumberOfSplitsInternal(unsigned int,
const IndexValueType regionIndex[],
const SizeValueType regionSize[],
- unsigned int requestedNumber) const ITK_OVERRIDE
+ unsigned int requestedNumber) const override
{
// this function adapts the legecy method, defined in this class
// be used by the ImageRegionSplitterBase.
@@ -145,7 +145,7 @@ protected:
unsigned int i,
unsigned int numberOfPieces,
IndexValueType regionIndex[],
- SizeValueType regionSize[]) const ITK_OVERRIDE
+ SizeValueType regionSize[]) const override
{
// this function adapts the legecy method, defined in this class
// be used by the ImageRegionSplitterBase.
@@ -166,7 +166,7 @@ protected:
return numberOfPieces;
}
- void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream & os, Indent indent) const override;
private:
ImageRegionSplitter(const ImageRegionSplitter &); //purposely not implemented
diff --git a/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h
index ecdc5a421aaab662c7258731f11619c0c45d3665..2a9b77c3947c9757ba8fadc43f3d11feb789cfef 100644
--- a/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h
+++ b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h
@@ -37,9 +37,9 @@ namespace itk
* spacing, origin and direction of the reference image will be used.
*
* Since this filter produces an image which is a different size than
- * its input, it needs to ITK_OVERRIDE several of the methods defined
+ * its input, it needs to override several of the methods defined
* in ProcessObject in order to properly manage the pipeline execution model.
- * In particular, this filter ITK_OVERRIDEs
+ * In particular, this filter overrides
* ProcessObject::GenerateInputRequestedRegion() and
* ProcessObject::GenerateOutputInformation().
*
@@ -154,13 +154,13 @@ public:
void SetOutputParametersFromImage(const ImageBaseType *image);
/** DisplacementFieldImageFilter produces a vector image. */
- void GenerateOutputInformation(void) ITK_OVERRIDE;
+ void GenerateOutputInformation(void) override;
/** Just checking if transform is set. */
- void BeforeThreadedGenerateData(void) ITK_OVERRIDE;
+ void BeforeThreadedGenerateData(void) override;
/** Compute the Modified Time based on changes to the components. */
- ModifiedTimeType GetMTime(void) const ITK_OVERRIDE;
+ ModifiedTimeType GetMTime(void) const override;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -173,16 +173,16 @@ public:
protected:
TransformToDisplacementFieldSource(void);
- ~TransformToDisplacementFieldSource(void) ITK_OVERRIDE {}
+ ~TransformToDisplacementFieldSource(void) override {}
- void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream & os, Indent indent) const override;
/** TransformToDisplacementFieldSource can be implemented as a multithreaded
* filter.
*/
void ThreadedGenerateData(
const OutputImageRegionType & outputRegionForThread,
- ThreadIdType threadId) ITK_OVERRIDE;
+ ThreadIdType threadId) override;
/** Default implementation for resampling that works for any
* transformation type.
diff --git a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
index a47d8cf82a4c318d3d6a977fa6659f298c04845d..8e268752d5f889131ade395ca86dd8d546d630f6 100644
--- a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
+++ b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
@@ -102,7 +102,7 @@ public:
protected:
UnaryFunctorImageFilter();
- ~UnaryFunctorImageFilter() ITK_OVERRIDE {}
+ ~UnaryFunctorImageFilter() override {}
/** UnaryFunctorImageFilter can produce an image which is a different
* resolution than its input image. As such, UnaryFunctorImageFilter
@@ -112,7 +112,7 @@ protected:
* below.
*
* \sa ProcessObject::GenerateOutputInformaton() */
- void GenerateOutputInformation() ITK_OVERRIDE;
+ void GenerateOutputInformation() override;
/** UnaryFunctorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -125,7 +125,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread,
- ThreadIdType threadId) ITK_OVERRIDE;
+ ThreadIdType threadId) override;
private:
UnaryFunctorImageFilter(const Self &); //purposely not implemented
diff --git a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h
index 542b29e6f8c65dd98cd919bcf0f363cc8072c193..c1d0cb776145c4f322f25df99a3b2163b5322d8f 100644
--- a/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h
+++ b/Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h
@@ -276,7 +276,7 @@ public:
bool autovalidateForwardModelFromGCPs(double resTol = 25);
//Pure virtual in base class
- bool useForward() const;
+ bool useForward() const override;
void optimizeTimeOffsetsFromGcps();
@@ -336,7 +336,7 @@ public:
virtual std::ostream& print(std::ostream& out) const override;
protected:
- TYPE_DATA;
+ TYPE_DATA
/**
* Compute range and doppler frequency from an input point, sensor
diff --git a/Modules/Visualization/Ice/include/otbFragmentShader.h b/Modules/Visualization/Ice/include/otbFragmentShader.h
index 99559dd163c90d73002f57d6a6ca1897b2d5a174..7b931c8699e46481a683d6085bc4fba6c6a42fd8 100644
--- a/Modules/Visualization/Ice/include/otbFragmentShader.h
+++ b/Modules/Visualization/Ice/include/otbFragmentShader.h
@@ -58,7 +58,7 @@ public:
protected:
FragmentShader();
- ~FragmentShader() ITK_OVERRIDE;
+ ~FragmentShader() override;
void BuildShader();
diff --git a/Modules/Visualization/Ice/include/otbFragmentShaderRegistry.h b/Modules/Visualization/Ice/include/otbFragmentShaderRegistry.h
index 6e5fc6e08f252cd23dc5bbd2bd319e88303bae95..f1aae8be0dc5e0b299c1937240a6fbd1dbac860d 100644
--- a/Modules/Visualization/Ice/include/otbFragmentShaderRegistry.h
+++ b/Modules/Visualization/Ice/include/otbFragmentShaderRegistry.h
@@ -55,7 +55,7 @@ public:
protected:
FragmentShaderRegistry();
- ~FragmentShaderRegistry() ITK_OVERRIDE;
+ ~FragmentShaderRegistry() override;
private:
typedef std::map<std::string, std::pair<unsigned int, unsigned int> > ShaderMapType;
diff --git a/Modules/Visualization/Ice/include/otbGlActor.h b/Modules/Visualization/Ice/include/otbGlActor.h
index 2c20ce7bc302cc753f0334dfcc71e2bc9baee2cf..d11a4ef3c1b29dfa49d1ea793c367a0f9a19078b 100644
--- a/Modules/Visualization/Ice/include/otbGlActor.h
+++ b/Modules/Visualization/Ice/include/otbGlActor.h
@@ -72,7 +72,7 @@ public:
protected:
GlActor();
- ~GlActor() ITK_OVERRIDE;
+ ~GlActor() override;
private:
// prevent implementation
diff --git a/Modules/Visualization/Ice/include/otbGlImageActor.h b/Modules/Visualization/Ice/include/otbGlImageActor.h
index b70ecc429bc33b6ee9d8b3cf8ba333d070326da7..9f2c4b7ac11414b231f19272f17fe647115fa5a9 100644
--- a/Modules/Visualization/Ice/include/otbGlImageActor.h
+++ b/Modules/Visualization/Ice/include/otbGlImageActor.h
@@ -80,16 +80,16 @@ public:
void Initialize(const std::string & filename);
// Retrieve the full extent of the actor
- void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const ITK_OVERRIDE;
+ void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const override;
// Update internal actor state with respect to ViewSettings
- void ProcessViewSettings() ITK_OVERRIDE;
+ void ProcessViewSettings() override;
// Heavy load/unload operations of data
- void UpdateData() ITK_OVERRIDE;
+ void UpdateData() override;
// Gl rendering of current state
- void Render() ITK_OVERRIDE;
+ void Render() override;
// Automatic color adjustment
void AutoColorAdjustment( double & minRed, double & maxRed,
@@ -101,15 +101,15 @@ public:
const PointType & GetOrigin() const;
- const GeoInterface::Spacing2 & GetSpacing() const ITK_OVERRIDE;
+ const GeoInterface::Spacing2 & GetSpacing() const override;
- std::string GetWkt() const ITK_OVERRIDE;
+ std::string GetWkt() const override;
ImageKeywordlistType GetKwl() const;
- bool HasKwl() const ITK_OVERRIDE;
+ bool HasKwl() const override;
- bool GetKwl( ImageKeywordlist & ) const ITK_OVERRIDE;
+ bool GetKwl( ImageKeywordlist & ) const override;
MetaDataDictionaryType & GetMetaDataDictionary() const;
@@ -191,11 +191,11 @@ public:
bool TransformFromViewport( Point2d & out,
const Point2d & in,
- bool isPhysical = true ) const ITK_OVERRIDE;
+ bool isPhysical = true ) const override;
bool TransformToViewport( Point2d & out,
const Point2d & in,
- bool isPhysical = true ) const ITK_OVERRIDE;
+ bool isPhysical = true ) const override;
void UpdateTransforms();
@@ -203,7 +203,7 @@ public:
protected:
GlImageActor();
- ~GlImageActor() ITK_OVERRIDE;
+ ~GlImageActor() override;
typedef ImageFileReader<VectorImageType> ReaderType;
typedef MultiChannelExtractROI<float,float> ExtractROIFilterType;
diff --git a/Modules/Visualization/Ice/include/otbGlROIActor.h b/Modules/Visualization/Ice/include/otbGlROIActor.h
index 769bb414e8dcff9072f3f6ee1fc863925398c69e..907b424afcd15ff5f1c32f43380b54444253cde7 100644
--- a/Modules/Visualization/Ice/include/otbGlROIActor.h
+++ b/Modules/Visualization/Ice/include/otbGlROIActor.h
@@ -49,16 +49,16 @@ public:
itkNewMacro(Self);
// Retrieve the full extent of the actor
- void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const ITK_OVERRIDE;
+ void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const override;
// Update internal actor state with respect to ViewSettings
- void ProcessViewSettings() ITK_OVERRIDE;
+ void ProcessViewSettings() override;
// Heavy load/unload operations of data
- void UpdateData() ITK_OVERRIDE;
+ void UpdateData() override;
// Gl rendering of current state
- void Render() ITK_OVERRIDE;
+ void Render() override;
void SetUL( const PointType & );
@@ -87,7 +87,7 @@ public:
protected:
GlROIActor();
- ~GlROIActor() ITK_OVERRIDE;
+ ~GlROIActor() override;
private:
// prevent implementation
diff --git a/Modules/Visualization/Ice/include/otbGlVectorActor.h b/Modules/Visualization/Ice/include/otbGlVectorActor.h
index 3ab74c1ac788158ecda76b8ad6d0c55ec5293ff9..7c40b41ef98afea051cc235c2a9624d264098358 100644
--- a/Modules/Visualization/Ice/include/otbGlVectorActor.h
+++ b/Modules/Visualization/Ice/include/otbGlVectorActor.h
@@ -67,19 +67,19 @@ public:
void SetCurrentLayer(const std::string & layername);
// Retrieve the full extent of the actor
- void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const ITK_OVERRIDE;
+ void GetExtent(double & ulx, double & uly, double & lrx, double & lry) const override;
// Return actor extent in its own geometry
void GetBoundingBox(double & ulx, double & uly, double & lrx, double & lry) const;
// Update internal actor state with respect to ViewSettings
- void ProcessViewSettings() ITK_OVERRIDE;
+ void ProcessViewSettings() override;
// Heavy load/unload operations of data
- void UpdateData() ITK_OVERRIDE;
+ void UpdateData() override;
// Gl rendering of current state
- void Render() ITK_OVERRIDE;
+ void Render() override;
PointType ViewportToVectorTransform(const PointType & point) const;
@@ -106,7 +106,7 @@ public:
itkSetMacro(LineWidth,double);
itkGetConstReferenceMacro(LineWidth,double);
- std::string GetWkt() const ITK_OVERRIDE;
+ std::string GetWkt() const override;
//
// otb::GlActor overloads.
@@ -114,13 +114,13 @@ public:
bool TransformFromViewport( Point2d & out,
const Point2d & in,
- bool isPhysical = true ) const ITK_OVERRIDE;
+ bool isPhysical = true ) const override;
protected:
GlVectorActor();
- ~GlVectorActor() ITK_OVERRIDE;
+ ~GlVectorActor() override;
// Internal class to hold tiles
diff --git a/Modules/Visualization/Ice/include/otbGlView.h b/Modules/Visualization/Ice/include/otbGlView.h
index 58c2022941fc9e22dbcc0cfc960c53cc8c770de1..63c43a3753f809c4530bcc996860d8f60efa3eab 100644
--- a/Modules/Visualization/Ice/include/otbGlView.h
+++ b/Modules/Visualization/Ice/include/otbGlView.h
@@ -280,7 +280,7 @@ public:
protected:
GlView();
- ~GlView() ITK_OVERRIDE;
+ ~GlView() override;
private:
// prevent implementation
diff --git a/Modules/Visualization/Ice/include/otbImageSettings.h b/Modules/Visualization/Ice/include/otbImageSettings.h
index 5b026f0bf436c17bb556cf8266a377aa7ea14069..a530f454942bbf5ab8db9dc3cb7c2837d3c1d799 100644
--- a/Modules/Visualization/Ice/include/otbImageSettings.h
+++ b/Modules/Visualization/Ice/include/otbImageSettings.h
@@ -81,7 +81,7 @@ public:
protected:
ImageSettings();
- ~ImageSettings() ITK_OVERRIDE;
+ ~ImageSettings() override;
private:
diff --git a/Modules/Visualization/Ice/include/otbStandardShader.h b/Modules/Visualization/Ice/include/otbStandardShader.h
index 1b3179302394f943a27856d9c4b4587649525f37..1553f39bd18332f636a44f663effeebe1dc32e0a 100644
--- a/Modules/Visualization/Ice/include/otbStandardShader.h
+++ b/Modules/Visualization/Ice/include/otbStandardShader.h
@@ -89,18 +89,18 @@ public:
itkSetMacro(Center,PointType);
itkGetConstReferenceMacro(Center,PointType);
- void SetupShader() ITK_OVERRIDE;
+ void SetupShader() override;
itkNewMacro(Self);
protected:
StandardShader();
- ~StandardShader() ITK_OVERRIDE;
+ ~StandardShader() override;
- std::string GetSource() const ITK_OVERRIDE;
+ std::string GetSource() const override;
- std::string GetName() const ITK_OVERRIDE;
+ std::string GetName() const override;
private:
// prevent implementation
diff --git a/Modules/Visualization/Ice/include/otbViewSettings.h b/Modules/Visualization/Ice/include/otbViewSettings.h
index 40637d0890cca5af3c0f4ed12df23aedd9f8f818..a29ea74d0222312c4c0d5736e5057bbfe0799227 100644
--- a/Modules/Visualization/Ice/include/otbViewSettings.h
+++ b/Modules/Visualization/Ice/include/otbViewSettings.h
@@ -148,7 +148,7 @@ public:
protected:
ViewSettings();
- ~ViewSettings() ITK_OVERRIDE;
+ ~ViewSettings() override;
private:
// prevent implementation
diff --git a/Modules/Visualization/IceViewer/include/otbIceViewer.h b/Modules/Visualization/IceViewer/include/otbIceViewer.h
index af409bdbabfda3b8c08492ba46b706f263b5eaea..75539f09794b56be9b946302dff2ffa570dff3ba 100644
--- a/Modules/Visualization/IceViewer/include/otbIceViewer.h
+++ b/Modules/Visualization/IceViewer/include/otbIceViewer.h
@@ -76,7 +76,7 @@ protected:
IceViewer();
- ~IceViewer() ITK_OVERRIDE;
+ ~IceViewer() override;
// Non-static callbacks
virtual void scroll_callback(GLFWwindow * window, double xoffset, double yoffset);
diff --git a/Modules/Visualization/Mapla/include/mvdMaplaApplication.h b/Modules/Visualization/Mapla/include/mvdMaplaApplication.h
index c425d8feded759e0944b58886c4c7b28d6a673cb..dcb85aefea5d887bb3a963dacdaf2ed96e374b7f 100644
--- a/Modules/Visualization/Mapla/include/mvdMaplaApplication.h
+++ b/Modules/Visualization/Mapla/include/mvdMaplaApplication.h
@@ -100,7 +100,7 @@ public:
MaplaApplication( QApplication* qtApp );
/** \brief Destructor. */
- ~MaplaApplication() ITK_OVERRIDE;
+ ~MaplaApplication() override;
//
// STATIC METHODS.
@@ -143,7 +143,7 @@ protected:
// Protected attributes.
protected:
- void virtual_InitializeCore() ITK_OVERRIDE;
+ void virtual_InitializeCore() override;
/*-[ PRIVATE SECTION ]-----------------------------------------------------*/
diff --git a/Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h b/Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
index e66c4a9548198705afe74ea3d93f855bf07db372..2af3740a505f0dbf4758d2359e4434808faaf1cf 100644
--- a/Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
+++ b/Modules/Visualization/Mapla/include/mvdMaplaMainWindow.h
@@ -104,7 +104,7 @@ public:
MaplaMainWindow( QWidget* Parent =0, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~MaplaMainWindow() ITK_OVERRIDE;
+ ~MaplaMainWindow() override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
@@ -121,7 +121,7 @@ protected:
//
// QMainWindow methods.
- void closeEvent( QCloseEvent* event ) ITK_OVERRIDE;
+ void closeEvent( QCloseEvent* event ) override;
//
// Protected attributes.
@@ -135,11 +135,11 @@ protected slots:
/**
*/
- void OnAboutToChangeModel( const AbstractModel* ) ITK_OVERRIDE;
+ void OnAboutToChangeModel( const AbstractModel* ) override;
/**
*/
- void OnModelChanged( AbstractModel* ) ITK_OVERRIDE;
+ void OnModelChanged( AbstractModel* ) override;
/**
*/
@@ -178,9 +178,9 @@ private:
//
// I18nMainWindow methods.
- void virtual_SetupUI() ITK_OVERRIDE;
+ void virtual_SetupUI() override;
- void virtual_ConnectUI() ITK_OVERRIDE;
+ void virtual_ConnectUI() override;
//
// Private attributes.
diff --git a/Modules/Visualization/Monteverdi/include/mvdApplication.h b/Modules/Visualization/Monteverdi/include/mvdApplication.h
index dff4eed963b648fd07cb08b00c66331d053c5f0e..c9cf8b6e87956f6147315bf2d0f6cf0f041f6692 100644
--- a/Modules/Visualization/Monteverdi/include/mvdApplication.h
+++ b/Modules/Visualization/Monteverdi/include/mvdApplication.h
@@ -99,7 +99,7 @@ public:
Application( QApplication* qtApp );
/** \brief Destructor. */
- ~Application() ITK_OVERRIDE;
+ ~Application() override;
/**
* \return The number of outdated dataset-models present in the
@@ -160,7 +160,7 @@ protected:
// Protected attributes.
protected:
- void virtual_InitializeCore() ITK_OVERRIDE;
+ void virtual_InitializeCore() override;
/*-[ PRIVATE SECTION ]-----------------------------------------------------*/
diff --git a/Modules/Visualization/Monteverdi/include/mvdMainWindow.h b/Modules/Visualization/Monteverdi/include/mvdMainWindow.h
index f8523b7f5dd5fa4b303b778ca7308d76c559e61a..3ae223763f6392aa498f81f9fcaf5776f3211a9f 100644
--- a/Modules/Visualization/Monteverdi/include/mvdMainWindow.h
+++ b/Modules/Visualization/Monteverdi/include/mvdMainWindow.h
@@ -125,7 +125,7 @@ public:
MainWindow( QWidget* p =0, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~MainWindow() ITK_OVERRIDE;
+ ~MainWindow() override;
/**
*/
@@ -183,7 +183,7 @@ protected:
//
// QMainWindow methods.
- void closeEvent( QCloseEvent* event ) ITK_OVERRIDE;
+ void closeEvent( QCloseEvent* event ) override;
//
// Protected attributes.
@@ -197,11 +197,11 @@ protected slots:
/**
*/
- void OnAboutToChangeModel( const AbstractModel * ) ITK_OVERRIDE;
+ void OnAboutToChangeModel( const AbstractModel * ) override;
/**
*/
- void OnModelChanged( AbstractModel * ) ITK_OVERRIDE;
+ void OnModelChanged( AbstractModel * ) override;
/**
*/
@@ -344,11 +344,11 @@ private:
//
// I18nMainWindow methods.
- void virtual_SetupUI() ITK_OVERRIDE;
+ void virtual_SetupUI() override;
- void virtual_ConnectUI() ITK_OVERRIDE;
+ void virtual_ConnectUI() override;
- void virtual_InitializeUI() ITK_OVERRIDE;
+ void virtual_InitializeUI() override;
//
// Private attributes.
diff --git a/Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h b/Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h
index c33030849830653e08d1a0429444bf88452f038b..25a555cb99f006053763e019c3c8256fc8484bdc 100644
--- a/Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h
+++ b/Modules/Visualization/Monteverdi/include/mvdPreferencesDialog.h
@@ -92,7 +92,7 @@ public:
PreferencesDialog( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
- ~PreferencesDialog() ITK_OVERRIDE;
+ ~PreferencesDialog() override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h b/Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
index 8eff3030ebf21d1ffe3400a46551b6ac09c513d4..d2e6723d4bc81c1d9556cea4bbe6a3b0f818268e 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdAbstractImageModel.h
@@ -171,7 +171,7 @@ public:
public:
/** Destructor */
- ~AbstractImageModel() ITK_OVERRIDE;
+ ~AbstractImageModel() override;
/** */
inline int GetId() const;
@@ -322,7 +322,7 @@ protected:
//
// AbstractModel methods.
- void virtual_BuildModel( void* context ) ITK_OVERRIDE;
+ void virtual_BuildModel( void* context ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h b/Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h
index ab4065a91b1882092f79319c6f0222d792b89037..e556edf4c40f5d07960f42e9b0aa197f94f71ad8 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdAbstractLayerModel.h
@@ -121,7 +121,7 @@ class OTBMonteverdiCore_EXPORT AbstractLayerModel :
public:
/** \brief Destructor. */
- ~AbstractLayerModel() ITK_OVERRIDE;
+ ~AbstractLayerModel() override;
/**
*/
@@ -201,7 +201,7 @@ private:
//
// VisibleInterface overloads.
- void virtual_SignalVisibilityChanged( bool ) ITK_OVERRIDE;
+ void virtual_SignalVisibilityChanged( bool ) override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h b/Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h
index e6b9178c3c2cc5bf18f69fc0e0faf4788138ea82..f6f84f37825ee5100a0777b351e11f8aac438471 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdAbstractModel.h
@@ -91,7 +91,7 @@ class OTBMonteverdiCore_EXPORT AbstractModel :
public:
/** Destructor */
- ~AbstractModel() ITK_OVERRIDE;
+ ~AbstractModel() override;
/** */
template< typename TModel >
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h b/Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h
index 800bbbc130690dbd316efb9e5ba6dfb7ee48d119..4ae16dc4ee42adcdd9d14f2369af60cb090f504f 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdAbstractWorker.h
@@ -91,7 +91,7 @@ class OTBMonteverdiCore_EXPORT AbstractWorker :
public:
/** \brief Destructor. */
- ~AbstractWorker() ITK_OVERRIDE;
+ ~AbstractWorker() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h b/Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h
index 68956e666adbda53ddd15cd5c12d6398fb3e0db3..eeeb38fc12bfa1047e22c17b7b57b2cf82ebebec 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdApplicationsBrowser.h
@@ -112,7 +112,7 @@ public:
ApplicationsBrowser( QObject* p =NULL );
/** \brief Destructor. */
- ~ApplicationsBrowser() ITK_OVERRIDE;
+ ~ApplicationsBrowser() override;
/** set the path where to look for applications */
void SetAutoLoadPath(const std::string & itk_auto_load_path);
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h b/Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h
index 3baa0ceed2d5e6879e44198350fdf0b70fbf8d6d..9fc780511497f0a5dbe777cfa2e53ab854afd631 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdBackgroundTask.h
@@ -100,7 +100,7 @@ public:
/**
* \brief Destructor.
*/
- ~BackgroundTask() ITK_OVERRIDE;
+ ~BackgroundTask() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h b/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
index 52d3b56043f6045a12b737dbc2c156a12dfa80f9..aa1aec03711073dd4a3279e886ef214d676076b2 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
@@ -175,7 +175,7 @@ public:
HistogramModel( QObject* p =NULL );
/** \brief Destructor. */
- ~HistogramModel() ITK_OVERRIDE;
+ ~HistogramModel() override;
/**
*/
@@ -234,7 +234,7 @@ protected:
// AbstractModel methods.
/** */
- void virtual_BuildModel( void* context =NULL ) ITK_OVERRIDE;
+ void virtual_BuildModel( void* context =NULL ) override;
//
// Protected attributes.
@@ -276,9 +276,9 @@ private:
// SerializableInterface methods.
//
- void virtual_Read( QIODevice* device ) ITK_OVERRIDE;
+ void virtual_Read( QIODevice* device ) override;
- void virtual_Write( QIODevice& device ) const ITK_OVERRIDE;
+ void virtual_Write( QIODevice& device ) const override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h b/Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h
index 52a2f263a7040279e14a2bade0c36bc2903e7c1e..778030ccdbe385904d0faa051898a4101aa07510 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdI18nCoreApplication.h
@@ -142,7 +142,7 @@ public:
I18nCoreApplication( QCoreApplication* qtApp );
/** \brief Destructor. */
- ~I18nCoreApplication() ITK_OVERRIDE;
+ ~I18nCoreApplication() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h b/Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h
index ab735e5cc8c96fdfe457ce5bf4fe921964611063..00e574ff5ac9c01b04efc128bd214de8f1ffcaff 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdImageImporter.h
@@ -122,7 +122,7 @@ public:
/**
* \brief Destructor.
*/
- ~ImageImporter() ITK_OVERRIDE;
+ ~ImageImporter() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -177,9 +177,9 @@ private:
//
// AbstractWorker oveloads.
- QObject* virtual_Do() ITK_OVERRIDE;
+ QObject* virtual_Do() override;
- QString virtual_GetFirstProgressText() const ITK_OVERRIDE;
+ QString virtual_GetFirstProgressText() const override;
//
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdMyClass.h b/Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
index 854ebbb31ef55bd9d275120f67f0eecf8f48f342..2dcf415eb22dc1379c94e0fc64c2cc0ebbd43dbb 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdMyClass.h
@@ -94,7 +94,7 @@ public:
MyClass( QObject* p =NULL );
/** \brief Destructor. */
- ~MyClass() ITK_OVERRIDE;
+ ~MyClass() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h b/Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
index eb40330126e6d4098ff3857ba87db53a8de10e3f..a7cdbc3330021975debd5c1cf3fd296c494d2429 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdOverviewBuilder.h
@@ -110,12 +110,12 @@ public:
/**
* \brief Destructor.
*/
- ~OverviewBuilder() ITK_OVERRIDE;
+ ~OverviewBuilder() override;
//
// ProgressInterface overloads.
- void SetProgress( double ) ITK_OVERRIDE;
+ void SetProgress( double ) override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -166,9 +166,9 @@ private:
//
// AbstractWorker oveloads.
- QObject * virtual_Do() ITK_OVERRIDE;
+ QObject * virtual_Do() override;
- QString virtual_GetFirstProgressText() const ITK_OVERRIDE;
+ QString virtual_GetFirstProgressText() const override;
//
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h b/Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h
index b4468924cd1f00ca42bee7fbccec523d9bc94c77..207cec9d226ee3fc6d910eb47130cc55dde14be8 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdProcessObjectObserver.h
@@ -101,7 +101,7 @@ public:
public:
/** \brief Destructor. */
- ~ProcessObjectObserver() ITK_OVERRIDE;
+ ~ProcessObjectObserver() override;
const ProgressInterface * GetProgressInterface() const;
ProgressInterface * GetProgressInterface();
@@ -112,10 +112,10 @@ public:
// itk::Command overloads.
void Execute( itk::Object * caller,
- const itk::EventObject & event ) ITK_OVERRIDE;
+ const itk::EventObject & event ) override;
void Execute( const itk::Object * caller,
- const itk::EventObject & event ) ITK_OVERRIDE;
+ const itk::EventObject & event ) override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h b/Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h
index e34adf8a50e8e1bdf71b3b22bb567d5c89daf0dd..1930cb73d9e92b52124eef72029f1f47cb9fc668 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdQuicklookModel.h
@@ -100,7 +100,7 @@ public:
QuicklookModel( QObject* p =NULL );
/** Destructor */
- ~QuicklookModel() ITK_OVERRIDE;
+ ~QuicklookModel() override;
/**
* \brief Get the parent image-model of this quicklook image as an
@@ -161,7 +161,7 @@ signals:
protected:
/** */
- void virtual_BuildModel( void* context =NULL ) ITK_OVERRIDE;
+ void virtual_BuildModel( void* context =NULL ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h b/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
index 035914cb210f692825e2bf440373f924f7062282..8291038e1582a193cf7bc3534ec0834c145a1c59 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdStackedLayerModel.h
@@ -116,7 +116,7 @@ public:
StackedLayerModel( QObject* p =NULL );
/** \brief Destructor. */
- ~StackedLayerModel() ITK_OVERRIDE;
+ ~StackedLayerModel() override;
inline const AbstractLayerModel * operator[]( SizeType ) const;
inline AbstractLayerModel * operator[]( SizeType );
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdSystemError.h b/Modules/Visualization/MonteverdiCore/include/mvdSystemError.h
index b14a1207f4bc2bea19213e37ac5039ca9dcb7f4b..6fe4b0329d584e331cbcf84cd57b964b7c4f2bb6 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdSystemError.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdSystemError.h
@@ -96,7 +96,7 @@ public:
+ ": " + message) {};
/** \brief Destructor. */
- ~SystemError() throw() ITK_OVERRIDE {};
+ ~SystemError() throw() override {};
/*-[ PROTECTED SECTION ]---------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h b/Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h
index 29e9aba7e3b3bad315916646aeba67998793d79d..a54dfa0fe6f00f2cb5ec9fef447b86867c7acb2f 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdVectorImageModel.h
@@ -118,7 +118,7 @@ public:
VectorImageModel( QObject* p =NULL );
/** Destructor */
- ~VectorImageModel() ITK_OVERRIDE;
+ ~VectorImageModel() override;
/** */
static void EnsureValidImage( const QString& filename );
@@ -166,17 +166,17 @@ public:
/**
* Get the number of available LOD.
*/
- CountType GetNbLod() const ITK_OVERRIDE;
+ CountType GetNbLod() const override;
/**
* Get a smart-pointer to the current LOD image-base.
*/
- ImageBaseType::ConstPointer ToImageBase() const ITK_OVERRIDE;
+ ImageBaseType::ConstPointer ToImageBase() const override;
/**
* Get a smart-pointer to the current LOD image-base.
*/
- ImageBaseType::Pointer ToImageBase() ITK_OVERRIDE;
+ ImageBaseType::Pointer ToImageBase() override;
/**
* Get the placename from the center pixel
@@ -186,9 +186,9 @@ public:
//
// AbstractModel methods.
- bool IsModified() const ITK_OVERRIDE;
+ bool IsModified() const override;
- void ClearModified() ITK_OVERRIDE;
+ void ClearModified() override;
// get image size in byte
std::streamoff GetImageSizeInBytes()
@@ -242,7 +242,7 @@ protected:
//
// AbstractModel methods.
- void virtual_BuildModel( void* context =NULL ) ITK_OVERRIDE;
+ void virtual_BuildModel( void* context =NULL ) override;
//
// AbstractImageModel methods.
@@ -292,18 +292,18 @@ private:
//
// AbstractLayerModel methods.
- std::string virtual_GetWkt() const ITK_OVERRIDE;
- bool virtual_HasKwl() const ITK_OVERRIDE;
+ std::string virtual_GetWkt() const override;
+ bool virtual_HasKwl() const override;
void virtual_ToWgs84( const PointType &,
PointType &,
- double & alt ) const ITK_OVERRIDE;
+ double & alt ) const override;
//
// AbstractImageModel methods.
- void virtual_SetCurrentLod( CountType lod ) ITK_OVERRIDE;
+ void virtual_SetCurrentLod( CountType lod ) override;
- void virtual_RefreshHistogram() ITK_OVERRIDE;
+ void virtual_RefreshHistogram() override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h b/Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h
index 441ffdca5fe42a31fac08f3327b8e786f7bcfd43..01c78d04f660ef58d2b6eb997079099c99106f77 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdVectorImageSettings.h
@@ -110,7 +110,7 @@ public:
/**
* \brief Destructor.
*/
- ~VectorImageSettings() ITK_OVERRIDE;
+ ~VectorImageSettings() override;
/**
* \brief Assignment operator.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
index b8ee19010e23026e9bef46ed1727ad33a3bca39f..10be3b5e7d011dc3ab09a9625010115c50a334e8 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdAboutDialog.h
@@ -77,7 +77,7 @@ public:
AboutDialog( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
- ~AboutDialog() ITK_OVERRIDE;
+ ~AboutDialog() override;
//
// SIGNALS.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h b/Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
index babdc181454a67b26ec94d82dc34ff8ece513aeb..8b9169530ee074f9f3e0099687bd7ac18e3098dc 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdAbstractDragAndDropEventFilter.h
@@ -90,7 +90,7 @@ class OTBMonteverdiGUI_EXPORT AbstractDragAndDropEventFilter :
public:
/** \brief Destructor. */
- ~AbstractDragAndDropEventFilter() ITK_OVERRIDE;
+ ~AbstractDragAndDropEventFilter() override;
//
// QObject overloads.
@@ -98,7 +98,7 @@ public:
/**
* \see http://qt-project.org/doc/qt-4.8/qobject.html#eventFilter
*/
- bool eventFilter( QObject* watched, QEvent* event ) ITK_OVERRIDE;
+ bool eventFilter( QObject* watched, QEvent* event ) override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h b/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
index 3d34198cef3ab73d4cae145d8306fc8e8f0b4088..28b2038b25ada931ea0bc6f0340301fefe77afae 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewManipulator.h
@@ -90,7 +90,7 @@ class OTBMonteverdiGUI_EXPORT AbstractImageViewManipulator :
public:
/** \brief Destructor. */
- ~AbstractImageViewManipulator() ITK_OVERRIDE {};
+ ~AbstractImageViewManipulator() override {};
//
// Accessors
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h b/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
index 28a6891f2c18a6dbc008fdecc744d21cf5b4feb4..eb0a0f26ba69922005cdcd7d3e1f12f04a9b20e9 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdAbstractImageViewRenderer.h
@@ -122,7 +122,7 @@ public:
/**
* Destructor.
*/
- ~AbstractImageViewRenderer() ITK_OVERRIDE{};
+ ~AbstractImageViewRenderer() override{};
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h b/Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
index fbefaee85832cb6a5c732f0dcee7f724145cfeb3..01c38d272583ae697d335695c581b969bef47f33 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdAbstractModelController.h
@@ -90,7 +90,7 @@ public:
public:
/** Destructor */
- ~AbstractModelController() ITK_OVERRIDE;
+ ~AbstractModelController() override;
/** */
void SetModel( AbstractModel* );
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h b/Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
index 8e5e155b3aa74571f6b6b38b7a23ec00c5954f2c..47ae4d2c8cf46dcc90970f52cbb7d1a639957b33 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdApplicationLauncher.h
@@ -96,7 +96,7 @@ public:
ApplicationLauncher( QObject* p =NULL );
/** \brief Destructor. */
- ~ApplicationLauncher() ITK_OVERRIDE;
+ ~ApplicationLauncher() override;
/**
* \return A new instance of the automatically-generated widget of
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h b/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
index 2cc6cc13e53d56e98a2d8d8d30d7b5763672fe77..64b9939b0fe909238a929e1bc87dcf18bd11828d 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBox.h
@@ -99,7 +99,7 @@ public:
ApplicationsToolBox( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~ApplicationsToolBox() ITK_OVERRIDE;
+ ~ApplicationsToolBox() override;
/** Get TreeWidget */
// QTreeWidget * GetAlgorithmsTree();
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h b/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
index b8f36d5db6eb99c9448f3d742b8ebb3f0c7f2042..2c9c3209c8e068c1be989f800350ac5ed5dbbb37 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdApplicationsToolBoxController.h
@@ -105,7 +105,7 @@ public:
/**
* \brief Destructor.
*/
- ~ApplicationsToolBoxController() ITK_OVERRIDE;
+ ~ApplicationsToolBoxController() override;
/** Get the seleceted application Gui */
// QWidget * GetSelectedApplicationWidget(const QString& appName);
@@ -126,13 +126,13 @@ protected:
//
// AbstractModelController methods.
- void Connect( AbstractModel* ) ITK_OVERRIDE;
+ void Connect( AbstractModel* ) override;
- void ClearWidget() ITK_OVERRIDE;
+ void ClearWidget() override;
- void virtual_ResetWidget( bool ) ITK_OVERRIDE;
+ void virtual_ResetWidget( bool ) override;
- void Disconnect( AbstractModel* ) ITK_OVERRIDE;
+ void Disconnect( AbstractModel* ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
index 1130f1b10636f7e8e73042bd321e9b707673bef6..57695a905113674db7684112ba27d27cacf89fa9 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdColorBandDynamicsWidget.h
@@ -142,7 +142,7 @@ public:
ColorBandDynamicsWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
- ~ColorBandDynamicsWidget() ITK_OVERRIDE;
+ ~ColorBandDynamicsWidget() override;
/** */
RgbwChannel GetChannelLabel() const;
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
index 4acdf66eb8087d82e2fd82091825d27b76b6b116..2fe26daa7934a870e5b7e6ce6d729e5ab02322ba 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsController.h
@@ -98,7 +98,7 @@ public:
ColorDynamicsController( ColorDynamicsWidget* widget, QObject* p =NULL );
/** \brief Destructor. */
- ~ColorDynamicsController() ITK_OVERRIDE;
+ ~ColorDynamicsController() override;
/*-[ PUBLIC SLOTS SECTION ]-----------------------------------------------**/
@@ -168,13 +168,13 @@ private:
//
// AbstractModelController methods.
- void Connect( AbstractModel* ) ITK_OVERRIDE;
+ void Connect( AbstractModel* ) override;
- void ClearWidget() ITK_OVERRIDE;
+ void ClearWidget() override;
- void virtual_ResetWidget( bool ) ITK_OVERRIDE;
+ void virtual_ResetWidget( bool ) override;
- void Disconnect( AbstractModel* ) ITK_OVERRIDE;
+ void Disconnect( AbstractModel* ) override;
/**
* \brief Reset intensity ranges to default values for given RGB
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
index 4866fc70d570b662b1a77150361f20d44c0e50e4..288005ce892a7a83dcc6f4403f81aa6e246a7776 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdColorDynamicsWidget.h
@@ -122,7 +122,7 @@ public:
ColorDynamicsWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor. */
- ~ColorDynamicsWidget() ITK_OVERRIDE;
+ ~ColorDynamicsWidget() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h b/Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
index d9f6ff02d0c1a0486d04ec8fc969bf9ff4e4ca08..aadf7f39208e8e7d4be80814d22c567119fbcd2a 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdColorSetupController.h
@@ -100,7 +100,7 @@ public:
/**
* \brief Destructor.
*/
- ~ColorSetupController() ITK_OVERRIDE;
+ ~ColorSetupController() override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
@@ -168,13 +168,13 @@ private:
//
// AbstractModelController methods.
- void Connect( AbstractModel* ) ITK_OVERRIDE;
+ void Connect( AbstractModel* ) override;
- void ClearWidget() ITK_OVERRIDE;
+ void ClearWidget() override;
- void virtual_ResetWidget( bool ) ITK_OVERRIDE;
+ void virtual_ResetWidget( bool ) override;
- void Disconnect( AbstractModel* ) ITK_OVERRIDE;
+ void Disconnect( AbstractModel* ) override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
index 1a09ed3c101605927fb30f8d7bee5d27410732a4..ae1cd0331c7556f55c859ffed1f3af9cc533e238 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdColorSetupWidget.h
@@ -89,7 +89,7 @@ public:
ColorSetupWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~ColorSetupWidget() ITK_OVERRIDE;
+ ~ColorSetupWidget() override;
/**
* \brief Set the component-name list.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h b/Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
index 8872a4ce906f3fc511a9fcad2a3741cb353952a8..bb17e54a054bfc4a519e83cc5857b11e09aef4ce 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdDoubleValidator.h
@@ -99,12 +99,12 @@ public:
QObject *p = 0 );
/** \brief Destructor. */
- ~DoubleValidator() ITK_OVERRIDE;
+ ~DoubleValidator() override;
//
// QDoubleValidator overloads.
- void fixup( QString& input ) const ITK_OVERRIDE;
+ void fixup( QString& input ) const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h b/Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
index 4c2a83be2519bfafe76214a69ba55f9f31e0a505..837b28795e3f7fc79845a0bb4b47d111f98184c0 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdDropLineEdit.h
@@ -100,7 +100,7 @@ public:
DropLineEdit( const QString& contents, QWidget* p =0 );
/** \brief Destructor. */
- ~DropLineEdit() ITK_OVERRIDE;
+ ~DropLineEdit() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -120,9 +120,9 @@ signals:
// Protected methods.
protected:
- void dragEnterEvent( QDragEnterEvent* event ) ITK_OVERRIDE;
- void dragMoveEvent( QDragMoveEvent* event ) ITK_OVERRIDE;
- void dropEvent( QDropEvent* event ) ITK_OVERRIDE;
+ void dragEnterEvent( QDragEnterEvent* event ) override;
+ void dragMoveEvent( QDragMoveEvent* event ) override;
+ void dropEvent( QDropEvent* event ) override;
/*-[ PRIVATE SECTION ]-----------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h b/Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
index 9595df1c0c33ffcfef2575246986778404580f6d..003d313a560ef23dbf2e780624d96ec4cf96ee2c 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdFilenameDragAndDropEventFilter.h
@@ -93,7 +93,7 @@ public:
FilenameDragAndDropEventFilter( QObject* p =NULL );
/** \brief Destructor. */
- ~FilenameDragAndDropEventFilter() ITK_OVERRIDE;
+ ~FilenameDragAndDropEventFilter() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -125,22 +125,22 @@ protected:
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragEnterEvent
*/
- bool DragEnterEvent( QObject* object, QDragEnterEvent* event ) ITK_OVERRIDE;
+ bool DragEnterEvent( QObject* object, QDragEnterEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragLeaveEvent
*/
- bool DragLeaveEvent( QObject* object, QDragLeaveEvent* event ) ITK_OVERRIDE;
+ bool DragLeaveEvent( QObject* object, QDragLeaveEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragMoveEvent
*/
- bool DragMoveEvent( QObject* object, QDragMoveEvent* event ) ITK_OVERRIDE;
+ bool DragMoveEvent( QObject* object, QDragMoveEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dropEvent
*/
- bool DropEvent( QObject* object, QDropEvent* event ) ITK_OVERRIDE;
+ bool DropEvent( QObject* object, QDropEvent* event ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h b/Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
index a28ba38fe7410cd420588bb240c4dcd825bc0fdd..2416c58ddd464df74557969a61b880d086c0c5d2 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdHistogramController.h
@@ -101,7 +101,7 @@ public:
/**
* \brief Destructor.
*/
- ~HistogramController() ITK_OVERRIDE;
+ ~HistogramController() override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
@@ -134,13 +134,13 @@ private:
//
// AbstractModelController methods.
- void Connect( AbstractModel* ) ITK_OVERRIDE;
+ void Connect( AbstractModel* ) override;
- void ClearWidget() ITK_OVERRIDE;
+ void ClearWidget() override;
- void virtual_ResetWidget( bool = false ) ITK_OVERRIDE;
+ void virtual_ResetWidget( bool = false ) override;
- void Disconnect( AbstractModel* ) ITK_OVERRIDE;
+ void Disconnect( AbstractModel* ) override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h b/Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
index 0e58a1f5d8ee6f56b1477259b2276744685b0203..d7a3690c12a604ea6b6924f5fa2b97f55717881c 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdHistogramPlotPicker.h
@@ -123,7 +123,7 @@ public:
QwtPlotCanvas* canvas );
/** \brief Destructor. */
- ~HistogramPlotPicker() ITK_OVERRIDE;
+ ~HistogramPlotPicker() override;
/**
*/
@@ -136,7 +136,7 @@ public:
//
// QwtPlotPicker methods.
- void drawRubberBand( QPainter* painter ) const ITK_OVERRIDE;
+ void drawRubberBand( QPainter* painter ) const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -161,7 +161,7 @@ protected:
using QwtPlotPicker::trackerText;
- QwtText trackerTextF( const QPointF & ) const ITK_OVERRIDE;
+ QwtText trackerTextF( const QPointF & ) const override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
index cbda62ba086fe927f73952018657d3474de0c7f3..91f9d90f44fcc49d094f803b258f876cd1dcbe9a 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdHistogramWidget.h
@@ -113,7 +113,7 @@ public:
HistogramWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~HistogramWidget() ITK_OVERRIDE;
+ ~HistogramWidget() override;
/**
* \brief
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h b/Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
index 39e9b08f976f9ffe3bea5d319e7521d5c034c2a8..8fdcb9e94164f7062441c58e1bcb13eec30bca1b 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdI18nApplication.h
@@ -105,7 +105,7 @@ public:
I18nApplication( QApplication* qtApp );
/** \brief Destructor. */
- ~I18nApplication() ITK_OVERRIDE;
+ ~I18nApplication() override;
//
// APPLICATION SINGLETON.
@@ -147,7 +147,7 @@ signals:
// Protected methods.
protected:
- void virtual_InitializeCore() ITK_OVERRIDE;
+ void virtual_InitializeCore() override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h b/Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
index e4414dfac52d3022268c66c0fb7b281e8e9d016a..15af81cc8250594c354df15d364a36b2a405d2ce 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdI18nMainWindow.h
@@ -103,7 +103,7 @@ public:
// Public methods.
public:
/** \brief Destructor. */
- ~I18nMainWindow() ITK_OVERRIDE;
+ ~I18nMainWindow() override;
/**
*/
@@ -194,7 +194,7 @@ protected:
//
// QMainWindow methods.
- void closeEvent( QCloseEvent* event ) ITK_OVERRIDE;
+ void closeEvent( QCloseEvent* event ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h b/Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
index 477e50206e5750a3b45e8182c0fc4b8f35e2e4ca..ed63a785f3d38cab1fb1101fee90a351ad10f722 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImageViewManipulator.h
@@ -123,7 +123,7 @@ public:
#endif // USE_VIEW_SETTINGS_SIDE_EFFECT
/** \brief Destructor. */
- ~ImageViewManipulator() ITK_OVERRIDE;
+ ~ImageViewManipulator() override;
//
// AbstractImageViewManipulator overloads.
@@ -132,29 +132,29 @@ public:
//
// Accessors.
- void SetViewportSize( int width, int height ) ITK_OVERRIDE;
+ void SetViewportSize( int width, int height ) override;
- SizeType GetViewportSize() const ITK_OVERRIDE;
+ SizeType GetViewportSize() const override;
- void SetOrigin( const PointType& origin ) ITK_OVERRIDE;
+ void SetOrigin( const PointType& origin ) override;
- PointType GetOrigin() const ITK_OVERRIDE;
+ PointType GetOrigin() const override;
- void SetSpacing( const SpacingType& spacing ) ITK_OVERRIDE;
+ void SetSpacing( const SpacingType& spacing ) override;
- SpacingType GetSpacing() const ITK_OVERRIDE;
+ SpacingType GetSpacing() const override;
- void SetNativeSpacing( const SpacingType& ) ITK_OVERRIDE;
+ void SetNativeSpacing( const SpacingType& ) override;
- void SetWkt( const std::string& wkt ) ITK_OVERRIDE;
+ void SetWkt( const std::string& wkt ) override;
void SetKeywordList(
const DefaultImageType::ImageKeywordlistType& kwl
- ) ITK_OVERRIDE;
+ ) override;
- PointType GetCenter() const ITK_OVERRIDE;
+ PointType GetCenter() const override;
- ZoomType GetFixedZoomType() const ITK_OVERRIDE;
+ ZoomType GetFixedZoomType() const override;
//
// Controls.
@@ -162,34 +162,34 @@ public:
void
SetupRenderingContext(
- AbstractImageViewRenderer::RenderingContext * const ) const ITK_OVERRIDE;
+ AbstractImageViewRenderer::RenderingContext * const ) const override;
- void ZoomIn() ITK_OVERRIDE;
+ void ZoomIn() override;
- void ZoomOut() ITK_OVERRIDE;
+ void ZoomOut() override;
- const PointType& Transform( PointType&, const QPoint& ) const ITK_OVERRIDE;
+ const PointType& Transform( PointType&, const QPoint& ) const override;
- void ResetViewport() ITK_OVERRIDE;
+ void ResetViewport() override;
//
// Events.
- void MouseMoveEvent( QMouseEvent* event ) ITK_OVERRIDE;
+ void MouseMoveEvent( QMouseEvent* event ) override;
- void MousePressEvent( QMouseEvent* event ) ITK_OVERRIDE;
+ void MousePressEvent( QMouseEvent* event ) override;
- void MouseReleaseEvent( QMouseEvent* event ) ITK_OVERRIDE;
+ void MouseReleaseEvent( QMouseEvent* event ) override;
- void MouseDoubleClickEvent( QMouseEvent * ) ITK_OVERRIDE;
+ void MouseDoubleClickEvent( QMouseEvent * ) override;
- void WheelEvent( QWheelEvent* event) ITK_OVERRIDE;
+ void WheelEvent( QWheelEvent* event) override;
- void ResizeEvent( QResizeEvent* event ) ITK_OVERRIDE;
+ void ResizeEvent( QResizeEvent* event ) override;
- void KeyPressEvent( QKeyEvent* event ) ITK_OVERRIDE;
+ void KeyPressEvent( QKeyEvent* event ) override;
- void KeyReleaseEvent( QKeyEvent* event ) ITK_OVERRIDE;
+ void KeyReleaseEvent( QKeyEvent* event ) override;
/*-[ PUBLIC SLOTS SECTION ]-----------------------------------------------**/
@@ -200,9 +200,9 @@ public slots:
//
// AbstractImageViewManipulator overloads.
- void CenterOn( const PointType& point ) ITK_OVERRIDE;
+ void CenterOn( const PointType& point ) override;
- void ZoomTo( double scale ) ITK_OVERRIDE;
+ void ZoomTo( double scale ) override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h b/Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
index c1d68cc82e4a6be1c2b94d16257d2ee48d744ca4..e8c3599d33591fe5074ea5cb35e12700e4104784 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImageViewRenderer.h
@@ -111,7 +111,7 @@ public:
/**
*/
- ~RenderingContext() ITK_OVERRIDE;
+ ~RenderingContext() override;
/**
*/
@@ -136,11 +136,11 @@ public:
ImageViewRenderer( QObject* p = NULL );
/** Destructor */
- ~ImageViewRenderer() ITK_OVERRIDE;
+ ~ImageViewRenderer() override;
/**
*/
- bool CheckGLCapabilities( int * ) ITK_OVERRIDE;
+ bool CheckGLCapabilities( int * ) override;
/**
*/
@@ -154,43 +154,43 @@ public:
bool GetLayerDynamics( const StackedLayerModel::KeyType & key,
ParametersType & params,
- bool isGlobal ) const ITK_OVERRIDE;
+ bool isGlobal ) const override;
- const AbstractLayerModel* GetReferenceModel() const ITK_OVERRIDE;
+ const AbstractLayerModel* GetReferenceModel() const override;
- AbstractLayerModel * GetReferenceModel() ITK_OVERRIDE;
+ AbstractLayerModel * GetReferenceModel() override;
void GetLayerExtent( const StackedLayerModel::KeyType & key,
PointType& origin,
- PointType& extent ) const ITK_OVERRIDE;
+ PointType& extent ) const override;
void GetReferenceExtent( PointType& origin,
- PointType& extent ) const ITK_OVERRIDE;
+ PointType& extent ) const override;
void GetViewExtent( PointType& origin,
- PointType& extent ) const ITK_OVERRIDE;
+ PointType& extent ) const override;
- AbstractImageViewRenderer::RenderingContext* NewRenderingContext() const ITK_OVERRIDE;
+ AbstractImageViewRenderer::RenderingContext* NewRenderingContext() const override;
- void InitializeGL() ITK_OVERRIDE;
+ void InitializeGL() override;
- void ResizeGL( int width, int height ) ITK_OVERRIDE;
+ void ResizeGL( int width, int height ) override;
- void PaintGL( const AbstractImageViewRenderer::RenderingContext* context ) ITK_OVERRIDE;
+ void PaintGL( const AbstractImageViewRenderer::RenderingContext* context ) override;
void Pick( const PointType & view,
- PixelInfo::Vector & pixels ) const ITK_OVERRIDE;
+ PixelInfo::Vector & pixels ) const override;
- void GetResolutions( PixelInfo::Vector & pixels ) const ITK_OVERRIDE;
+ void GetResolutions( PixelInfo::Vector & pixels ) const override;
bool TransformToView( PointType & point,
const StackedLayerModel::KeyType &,
const IndexType &,
- bool isPhysical ) const ITK_OVERRIDE;
+ bool isPhysical ) const override;
- void SaveScreenshot( const QString & ) const ITK_OVERRIDE;
+ void SaveScreenshot( const QString & ) const override;
bool
Reproject( PointType & center,
@@ -198,7 +198,7 @@ public:
const PointType & vcenter,
const SpacingType & vspacing ) const;
- bool IsEffectsEnabled() const ITK_OVERRIDE;
+ bool IsEffectsEnabled() const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -206,7 +206,7 @@ public:
public slots:
void UpdatePixelInfo( const QPoint & screen,
const PointType & view,
- const PixelInfo::Vector & pixels ) ITK_OVERRIDE;
+ const PixelInfo::Vector & pixels ) override;
/*-[ SIGNALS SECTION ]-----------------------------------------------------*/
@@ -271,24 +271,24 @@ private:
//
// AbstractImageViewRenderer overloads.
- void virtual_ClearScene( bool ) ITK_OVERRIDE;
- void virtual_UpdateScene() ITK_OVERRIDE;
- void virtual_RefreshScene() ITK_OVERRIDE;
+ void virtual_ClearScene( bool ) override;
+ void virtual_UpdateScene() override;
+ void virtual_RefreshScene() override;
bool virtual_ZoomToRegion( const PointType & origin,
const PointType & extent,
PointType & center,
- SpacingType & spacing ) const ITK_OVERRIDE;
+ SpacingType & spacing ) const override;
- bool virtual_ZoomToExtent( PointType & center, SpacingType & spacing ) const ITK_OVERRIDE;
+ bool virtual_ZoomToExtent( PointType & center, SpacingType & spacing ) const override;
bool virtual_ZoomToLayer( const StackedLayerModel::KeyType & key,
PointType & center,
- SpacingType & spacing ) const ITK_OVERRIDE;
+ SpacingType & spacing ) const override;
bool virtual_ZoomToFull( const StackedLayerModel::KeyType & key,
PointType & center,
- SpacingType & spacing ) const ITK_OVERRIDE;
+ SpacingType & spacing ) const override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
index c32699f712f9c97cfe2af01fbb7fc1f47452002f..9c917ec68f728590fb0cf5466b0b8c4926365d5c 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h
@@ -117,7 +117,7 @@ public:
Qt::WindowFlags f =0 );
/** \brief Destructor. */
- ~ImageViewWidget() ITK_OVERRIDE;
+ ~ImageViewWidget() override;
/**
*/
@@ -255,21 +255,21 @@ protected:
//
// Qt overloads.
- void initializeGL() ITK_OVERRIDE;
- void resizeGL( int widgth, int height ) ITK_OVERRIDE;
- void paintGL() ITK_OVERRIDE;
+ void initializeGL() override;
+ void resizeGL( int widgth, int height ) override;
+ void paintGL() override;
- void mouseMoveEvent( QMouseEvent* event ) ITK_OVERRIDE;
- void mouseReleaseEvent( QMouseEvent* event ) ITK_OVERRIDE;
- void mousePressEvent( QMouseEvent* event ) ITK_OVERRIDE;
- void mouseDoubleClickEvent( QMouseEvent * event ) ITK_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent* event ) override;
+ void mouseReleaseEvent( QMouseEvent* event ) override;
+ void mousePressEvent( QMouseEvent* event ) override;
+ void mouseDoubleClickEvent( QMouseEvent * event ) override;
- void wheelEvent( QWheelEvent* event) ITK_OVERRIDE;
+ void wheelEvent( QWheelEvent* event) override;
- void keyPressEvent( QKeyEvent* event ) ITK_OVERRIDE;
- void keyReleaseEvent( QKeyEvent* event ) ITK_OVERRIDE;
+ void keyPressEvent( QKeyEvent* event ) override;
+ void keyReleaseEvent( QKeyEvent* event ) override;
- void resizeEvent( QResizeEvent* event ) ITK_OVERRIDE;
+ void resizeEvent( QResizeEvent* event ) override;
//
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
index 0441b49919e3de16614f9b25cb92f1f43e84d4ca..bee62872915c20f49e0341ec592697e3eeac56e0 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
@@ -105,7 +105,7 @@ public:
Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~ImportImagesDialog() ITK_OVERRIDE;
+ ~ImportImagesDialog() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
index e1fe0659cf7bbc08e39702e70e7dbe8c2ca4f27b..09b2b1314987d9fa1044e531fd2dc230edbb760d 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImportSubDatasetDialog.h
@@ -104,7 +104,7 @@ public:
Qt::WindowFlags flags = 0 );
/** \brief Destructor. */
- ~ImportSubDatasetDialog() ITK_OVERRIDE;
+ ~ImportSubDatasetDialog() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
index 3d8400db1d29a6c9539bdf86d6312b6539845c14..3abb2722f56266091ba9241c56c13de18b7f308d 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdKeymapDialog.h
@@ -77,7 +77,7 @@ public:
KeymapDialog( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** Destructor */
- ~KeymapDialog() ITK_OVERRIDE;
+ ~KeymapDialog() override;
//
// SIGNALS.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h
index 084945ebe44e4ed0f0dfba19ef226bf340aeda72..80af1a4f8ea1bb1a51c94e07c09cd2e10073f578 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackController.h
@@ -93,7 +93,7 @@ public:
LayerStackController( LayerStackWidget * widget, QObject * p =NULL );
/** \brief Destructor. */
- ~LayerStackController() ITK_OVERRIDE;
+ ~LayerStackController() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -135,19 +135,19 @@ private:
/**
*/
- void Connect( AbstractModel * ) ITK_OVERRIDE;
+ void Connect( AbstractModel * ) override;
/**
*/
- void Disconnect( AbstractModel * ) ITK_OVERRIDE;
+ void Disconnect( AbstractModel * ) override;
/**
*/
- void ClearWidget() ITK_OVERRIDE;
+ void ClearWidget() override;
/**
*/
- void virtual_ResetWidget( bool ) ITK_OVERRIDE;
+ void virtual_ResetWidget( bool ) override;
//
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h
index 97f096ad9f43ff41d8f2e26a77a0980dce7af9b8..44b557b5cd080058c59b5dc707935a6317fca577 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackItemModel.h
@@ -136,7 +136,7 @@ public:
LayerStackItemModel( QObject* p =NULL );
/** \brief Destructor. */
- ~LayerStackItemModel() ITK_OVERRIDE;
+ ~LayerStackItemModel() override;
/**
*/
@@ -152,13 +152,13 @@ public:
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#columnCount
*/
- int columnCount( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ int columnCount( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#data
*/
QVariant
- data( const QModelIndex & index, int role = Qt::DisplayRole ) const ITK_OVERRIDE;
+ data( const QModelIndex & index, int role = Qt::DisplayRole ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#dropMimeData
@@ -168,24 +168,24 @@ public:
Qt::DropAction action,
int row,
int column,
- const QModelIndex & p ) ITK_OVERRIDE;
+ const QModelIndex & p ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#flags
*/
- Qt::ItemFlags flags( const QModelIndex & index ) const ITK_OVERRIDE;
+ Qt::ItemFlags flags( const QModelIndex & index ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#hasChildren
*/
- bool hasChildren( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ bool hasChildren( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#headerData
*/
QVariant headerData( int section,
Qt::Orientation orientation,
- int role = Qt::DisplayRole ) const ITK_OVERRIDE;
+ int role = Qt::DisplayRole ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#index
@@ -193,7 +193,7 @@ public:
QModelIndex
index( int row,
int column,
- const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#insertRows
@@ -201,22 +201,22 @@ public:
bool
insertRows( int row,
int count,
- const QModelIndex & p = QModelIndex() ) ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) override;
/**
* \see http://doc.qt.io/qt-4.8/qabstractitemmodel.html#mimeData
*/
- QMimeData * mimeData( const QModelIndexList & indexes ) const ITK_OVERRIDE;
+ QMimeData * mimeData( const QModelIndexList & indexes ) const override;
/**
* \see http://doc.qt.io/qt-4.8/qabstractitemmodel.html#mimeTypes
*/
- QStringList mimeTypes() const ITK_OVERRIDE;
+ QStringList mimeTypes() const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#parent
*/
- QModelIndex parent( const QModelIndex & index ) const ITK_OVERRIDE;
+ QModelIndex parent( const QModelIndex & index ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#removeRows
@@ -224,12 +224,12 @@ public:
bool
removeRows( int row,
int count,
- const QModelIndex & p = QModelIndex() ) ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#rowCount
*/
- int rowCount( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ int rowCount( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#setData
@@ -237,12 +237,12 @@ public:
bool
setData( const QModelIndex & index,
const QVariant & value,
- int role = Qt::EditRole ) ITK_OVERRIDE;
+ int role = Qt::EditRole ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#supportedDropActions
*/
- Qt::DropActions supportedDropActions() const ITK_OVERRIDE;
+ Qt::DropActions supportedDropActions() const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
index 25b402072c6c69b4b7b2142b15e11096b64bafc7..0eb357d2f2cb7860f3eb2b4bd953636f8e1dd79c 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdLayerStackWidget.h
@@ -99,7 +99,7 @@ public:
LayerStackWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~LayerStackWidget() ITK_OVERRIDE;
+ ~LayerStackWidget() override;
/**
*/
@@ -146,7 +146,7 @@ public:
/**
* \see http://qt-project.org/doc/qt-4.8/qobject.html#eventFilter
*/
- bool eventFilter( QObject * watched, QEvent * event ) ITK_OVERRIDE;
+ bool eventFilter( QObject * watched, QEvent * event ) override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
index 0ff225da38427e27d100a8c1c1ff5fe9ef644974..52e499581424686dc79fd4798c44a039f3bf20fb 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdMultiResolutionPyramidWidget.h
@@ -100,7 +100,7 @@ public:
Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~MultiResolutionPyramidWidget() ITK_OVERRIDE;
+ ~MultiResolutionPyramidWidget() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h b/Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h
index 25c96da09a3bc1242f8ec0c7eb1549d481142b19..89a0a785032b2385c25499b7f7d36744521417b9 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdOTBApplicationsModel.h
@@ -99,7 +99,7 @@ public:
OTBApplicationsModel( QObject* p =NULL );
/** \brief Destructor. */
- ~OTBApplicationsModel() ITK_OVERRIDE;
+ ~OTBApplicationsModel() override;
/** \brief Fill Widget Tree */
void FillTree();
@@ -135,7 +135,7 @@ protected:
//
// AbstractModel methods.
- void virtual_BuildModel( void* context =NULL ) ITK_OVERRIDE;
+ void virtual_BuildModel( void* context =NULL ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
index 615ba575e1bed83d29c4eb352f95874150c002e5..94addba237ee4d9cb33282bc995a506c6715540a 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdPixelDescriptionWidget.h
@@ -95,7 +95,7 @@ public:
PixelDescriptionWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~PixelDescriptionWidget() ITK_OVERRIDE;
+ ~PixelDescriptionWidget() override;
/** Get TreeWidget */
QTreeWidget * GetDescriptionTree();
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h
index be92647e6135ad430e80e4c61f7d30de4f2070ee..c934d84dad63c20e9003e16668cb9d97000dd4c2 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h
@@ -82,7 +82,7 @@ public:
explicit ProjectionBarWidget(QWidget *p = NULL, Qt::WindowFlags flags = Qt::Widget );
/** \brief Destructor. */
- ~ProjectionBarWidget() ITK_OVERRIDE;
+ ~ProjectionBarWidget() override;
public slots:
void SetProjectionScale(double scale_x, double scale_y);
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h b/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
index 9aba72c53accbe28e01941eeb81872f56f9a8633..c55664e2dcbf8871e6510a930f564b1372afd8e9 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdQtWidgetView.h
@@ -110,7 +110,7 @@ public:
Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~QtWidgetView() ITK_OVERRIDE;
+ ~QtWidgetView() override;
/** \brief Gui Creation. */
void CreateGui();
@@ -163,7 +163,7 @@ protected:
//
// QWidget overloads.
- void closeEvent( QCloseEvent * event ) ITK_OVERRIDE;
+ void closeEvent( QCloseEvent * event ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h b/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h
index 052a39a470d9d1fe380f0390c8ad84004ed88abf..a3ef9066d0299baf47058821a75837cfaf543bf4 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewManipulator.h
@@ -98,36 +98,36 @@ public:
#endif // USE_VIEW_SETTINGS_SIDE_EFFECT
/** \brief Destructor. */
- ~QuicklookViewManipulator() ITK_OVERRIDE;
+ ~QuicklookViewManipulator() override;
//
// ImageViewManipulator overloads.
- ZoomType GetFixedZoomType() const ITK_OVERRIDE;
+ ZoomType GetFixedZoomType() const override;
void
SetupRenderingContext(
- AbstractImageViewRenderer::RenderingContext * const ) const ITK_OVERRIDE;
+ AbstractImageViewRenderer::RenderingContext * const ) const override;
- void MousePressEvent( QMouseEvent* event ) ITK_OVERRIDE;
+ void MousePressEvent( QMouseEvent* event ) override;
- void MouseMoveEvent( QMouseEvent* event ) ITK_OVERRIDE;
+ void MouseMoveEvent( QMouseEvent* event ) override;
// virtual void MousePressEvent( QMouseEvent* event );
// virtual void MouseReleaseEvent( QMouseEvent* event );
- void MouseDoubleClickEvent( QMouseEvent * ) ITK_OVERRIDE {};
+ void MouseDoubleClickEvent( QMouseEvent * ) override {};
- void WheelEvent( QWheelEvent* event) ITK_OVERRIDE;
+ void WheelEvent( QWheelEvent* event) override;
- void ResizeEvent( QResizeEvent * event ) ITK_OVERRIDE;
+ void ResizeEvent( QResizeEvent * event ) override;
- void KeyPressEvent( QKeyEvent* event ) ITK_OVERRIDE;
+ void KeyPressEvent( QKeyEvent* event ) override;
- void KeyReleaseEvent( QKeyEvent* event ) ITK_OVERRIDE;
+ void KeyReleaseEvent( QKeyEvent* event ) override;
/*-[ PUBLIC SLOTS SECTION ]-----------------------------------------------**/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h b/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
index 5c86c1f943630f82124ae9af895ac780f36cb8d7..d0124848c2361cb59a1918b9c83a7a28ebb86b91 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdQuicklookViewRenderer.h
@@ -108,7 +108,7 @@ public:
m_RoiOrigin.Fill( 0 );
}
- ~RenderingContext() ITK_OVERRIDE {}
+ ~RenderingContext() override {}
PointType m_RoiOrigin;
PointType m_RoiExtent;
@@ -121,13 +121,13 @@ public:
QuicklookViewRenderer( QObject* p = NULL );
/** Destructor */
- ~QuicklookViewRenderer() ITK_OVERRIDE;
+ ~QuicklookViewRenderer() override;
//
// ImageViewRenderer overloads.
- AbstractImageViewRenderer::RenderingContext* NewRenderingContext() const ITK_OVERRIDE;
+ AbstractImageViewRenderer::RenderingContext* NewRenderingContext() const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -150,7 +150,7 @@ protected:
// ImageViewRenderer overloads.
- void UpdateActors( const AbstractImageViewRenderer::RenderingContext* c ) ITK_OVERRIDE;
+ void UpdateActors( const AbstractImageViewRenderer::RenderingContext* c ) override;
//
// Protected attributes.
@@ -170,13 +170,13 @@ private:
//
// ImageViewRenderer methods.
- void virtual_SetProjection() ITK_OVERRIDE;
- void virtual_UpdateProjection() ITK_OVERRIDE;
+ void virtual_SetProjection() override;
+ void virtual_UpdateProjection() override;
//
// AbstractImageViewRenderer overloads.
// TODO: Move virtual_*Scene() methods to protected section.
- void virtual_FinishScene() ITK_OVERRIDE;
+ void virtual_FinishScene() override;
//
// Private attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h
index cafadc9473d65ccc52de5cccfd713dbef3e61f22..a6d12edee243e509593d4fac73781ea69ddbc53b 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdSearchableTreeWidget.h
@@ -102,7 +102,7 @@ public:
SearchableTreeWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~SearchableTreeWidget() ITK_OVERRIDE;
+ ~SearchableTreeWidget() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h
index 4d1b55c63ca5c478c313f5f497fd3c67c37f77d9..22bae26ea027db54fc9f7871c95ae70ee462ee78 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdShaderWidget.h
@@ -101,7 +101,7 @@ public:
Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~ShaderWidget() ITK_OVERRIDE;
+ ~ShaderWidget() override;
/**
*/
@@ -144,7 +144,7 @@ private:
void SetEffectVisible(const Effect & effect, bool visible);
/** */
- void virtual_SetSettings( ImageSettings * ) ITK_OVERRIDE;
+ void virtual_SetSettings( ImageSettings * ) override;
/**
* Set the ComboBox effects item for the corresponding image settings.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
index 6ff51de45d94a3a60c3d4a89471e3d4d28f6ccd1..8377dcffd637ee2b16229e5e37c75ad4040a653d 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h
@@ -97,7 +97,7 @@ public:
StatusBarWidget( QWidget* p =NULL, Qt::WindowFlags flags =0 );
/** \brief Destructor. */
- ~StatusBarWidget() ITK_OVERRIDE;
+ ~StatusBarWidget() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h
index 700399768f61c80e0ebe2d27635936b6ef515072..8c4765d337d51505012ecc9dadab504da56d13bc 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdTaskProgressDialog.h
@@ -99,7 +99,7 @@ public:
/**
* \brief Destructor.
*/
- ~TaskProgressDialog() ITK_OVERRIDE;
+ ~TaskProgressDialog() override;
/**
*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
index 7f4d0f0c40796186d1430ca1f6a9027bf1523880..ba83567d72fb9850629d271635475a49ef1dbb3b 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidget.h
@@ -124,7 +124,7 @@ public:
TreeWidget( QWidget* p =NULL );
/** \brief Destructor. */
- ~TreeWidget() ITK_OVERRIDE;
+ ~TreeWidget() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -151,17 +151,17 @@ protected:
//
// QTreeWidget overloads.
- QStringList mimeTypes() const ITK_OVERRIDE;
+ QStringList mimeTypes() const override;
- QMimeData* mimeData( const QList< QTreeWidgetItem* > items ) const ITK_OVERRIDE;
+ QMimeData* mimeData( const QList< QTreeWidgetItem* > items ) const override;
- void dragEnterEvent( QDragEnterEvent* event ) ITK_OVERRIDE;
- void dragMoveEvent( QDragMoveEvent* event ) ITK_OVERRIDE;
- void dragLeaveEvent( QDragLeaveEvent* event ) ITK_OVERRIDE;
- void dropEvent( QDropEvent* event ) ITK_OVERRIDE;
+ void dragEnterEvent( QDragEnterEvent* event ) override;
+ void dragMoveEvent( QDragMoveEvent* event ) override;
+ void dragLeaveEvent( QDragLeaveEvent* event ) override;
+ void dropEvent( QDropEvent* event ) override;
- Qt::DropActions supportedDropActions() const ITK_OVERRIDE;
- void startDrag( Qt::DropActions supportedActions ) ITK_OVERRIDE;
+ Qt::DropActions supportedDropActions() const override;
+ void startDrag( Qt::DropActions supportedActions ) override;
//
// Protected attributes.
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
index 248c8314831ce0563703bb71d32e61c47764eb9d..a1950223da81158a450b1a052921e5f87bcfde30 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItem.h
@@ -120,7 +120,7 @@ public:
/**
* \brief Destructor.
*/
- ~TreeWidgetItem() ITK_OVERRIDE;
+ ~TreeWidgetItem() override;
/**
*/
@@ -145,7 +145,7 @@ public:
/**
* \see http://qt-project.org/doc/qt-4.8/qtreewidgetitem.html#clone
*/
- QTreeWidgetItem* clone() const ITK_OVERRIDE;
+ QTreeWidgetItem* clone() const override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
index b66b4e991ef224424936fc5eef3d00123fa0a4b9..c09a9ff1b13548248e620e7eb75a6fc1da5d7ed4 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdTreeWidgetItemDragAndDropEventFilter.h
@@ -93,7 +93,7 @@ public:
TreeWidgetItemDragAndDropEventFilter( QObject* p =NULL );
/** \brief Destructor. */
- ~TreeWidgetItemDragAndDropEventFilter() ITK_OVERRIDE;
+ ~TreeWidgetItemDragAndDropEventFilter() override;
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
@@ -121,22 +121,22 @@ protected:
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragEnterEvent
*/
- bool DragEnterEvent( QObject* object, QDragEnterEvent* event ) ITK_OVERRIDE;
+ bool DragEnterEvent( QObject* object, QDragEnterEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragLeaveEvent
*/
- bool DragLeaveEvent( QObject* object, QDragLeaveEvent* event ) ITK_OVERRIDE;
+ bool DragLeaveEvent( QObject* object, QDragLeaveEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dragMoveEvent
*/
- bool DragMoveEvent( QObject* object, QDragMoveEvent* event ) ITK_OVERRIDE;
+ bool DragMoveEvent( QObject* object, QDragMoveEvent* event ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qwidget.html#dropEvent
*/
- bool DropEvent( QObject* object, QDropEvent* event ) ITK_OVERRIDE;
+ bool DropEvent( QObject* object, QDropEvent* event ) override;
//
// Protected attributes.
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
index 3cf9114c81a09c5c329913a69971acb59389bfce..9dec89465c76e56953a842882d45e3bade722415 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
@@ -46,7 +46,7 @@ public:
AddProcessToWatchEvent(){}
AddProcessToWatchEvent(const Self& s) :itk::EventObject(s){};
- ~AddProcessToWatchEvent() ITK_OVERRIDE {}
+ ~AddProcessToWatchEvent() override {}
/** Set/Get the process to watch */
virtual void SetProcess(itk::ProcessObject * process)
@@ -70,16 +70,16 @@ public:
}
/** Virtual pure method to implement */
- itk::EventObject* MakeObject() const ITK_OVERRIDE
+ itk::EventObject* MakeObject() const override
{
return new Self;
}
- const char* GetEventName() const ITK_OVERRIDE
+ const char* GetEventName() const override
{
return "AddProcess";
}
- bool CheckEvent(const itk::EventObject* e) const ITK_OVERRIDE
+ bool CheckEvent(const itk::EventObject* e) const override
{
return dynamic_cast<const Self*>(e);
}
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
index bbc610eeb91e77fff82d2635fda33d40dad34bdc..2686bb0e77c37c4a2ef3a756dfe9cfb95db81c47 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
@@ -852,7 +852,7 @@ protected:
Application();
/** Destructor */
- ~Application() ITK_OVERRIDE;
+ ~Application() override;
/* Register a ProcessObject as a new progress source */
void AddProcess(itk::ProcessObject* object, std::string description);
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
index 4b3119096c152a3d014bfbd01e5e98569943c0be..f0461e2982cb625f4c292201b3c077c533b596ab 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
@@ -40,12 +40,12 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
- const char* GetITKSourceVersion(void) const ITK_OVERRIDE
+ const char* GetITKSourceVersion(void) const override
{
return ITK_SOURCE_VERSION;
}
- const char* GetDescription(void) const ITK_OVERRIDE
+ const char* GetDescription(void) const override
{
return "ApplicationFactory";
}
@@ -74,7 +74,7 @@ protected:
}
- ~ApplicationFactory() ITK_OVERRIDE
+ ~ApplicationFactory() override
{
}
@@ -82,7 +82,7 @@ protected:
/** This method is provided by sub-classes of ObjectFactoryBase.
* It should create the named itk object or return 0 if that object
* is not supported by the factory implementation. */
- LightObject::Pointer CreateObject(const char* itkclassname ) ITK_OVERRIDE
+ LightObject::Pointer CreateObject(const char* itkclassname ) override
{
LightObject::Pointer ret;
if ( m_ClassName == itkclassname)
@@ -95,7 +95,7 @@ protected:
* itkclass name, which are provide by this object
*/
std::list<LightObject::Pointer>
- CreateAllObject(const char* itkclassname) ITK_OVERRIDE
+ CreateAllObject(const char* itkclassname) override
{
const std::string applicationClass("otbWrapperApplication");
std::list<LightObject::Pointer> list;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
index cafab0a14125e297801dd349ba5949aead2f8e24..2012736f81fb363ce896fcc0baaa3cefb4289ff7 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactoryBase.h
@@ -48,7 +48,7 @@ public:
protected:
ApplicationFactoryBase(){}
- ~ApplicationFactoryBase() ITK_OVERRIDE{}
+ ~ApplicationFactoryBase() override{}
private:
ApplicationFactoryBase(const Self &); //purposely not implemented
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
index 0bb290c71e68cca0aa1f87e61bc877b0b8a1715b..b31c8ed3b0744ad28a739152680c4774c08c4173 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
@@ -79,7 +79,7 @@ public:
protected:
ApplicationRegistry();
- ~ApplicationRegistry() ITK_OVERRIDE;
+ ~ApplicationRegistry() override;
private:
ApplicationRegistry(const Self&); //purposely not implemented
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
index b376323214a31e02f6846b80d2aed4c7b126e6e3..b2bd1d55f7097cb7d077c2e9f3920f640b70fcf1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
@@ -88,12 +88,12 @@ public:
/** Return any value */
virtual unsigned int GetValue();
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return !m_ChoiceList.empty();
}
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
// Same as constructor init value
// Note that this may be invalid if HasValue() == false
@@ -105,7 +105,7 @@ protected:
ChoiceParameter();
/** Destructor */
- ~ChoiceParameter() ITK_OVERRIDE;
+ ~ChoiceParameter() override;
struct Choice
{
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
index 264967e376a209e0bf36929e4f4960b2e8cc5490..0c9fdfe7e7fafb8a504ab04817ebea0e1948a508 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
@@ -106,9 +106,9 @@ the macro otbGetParameterImageMacro of otbWrapperApplication.h */
template <class TComplexInputImage, class TOutputImage>
TOutputImage* CastImage();
- bool HasValue() const ITK_OVERRIDE;
+ bool HasValue() const override;
- void ClearValue() ITK_OVERRIDE;
+ void ClearValue() override;
protected:
@@ -116,7 +116,7 @@ protected:
ComplexInputImageParameter();
/** Destructor */
- ~ComplexInputImageParameter() ITK_OVERRIDE;
+ ~ComplexInputImageParameter() override;
ImageBaseType::Pointer m_Image;
std::string m_FileName;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
index 0613816b47f09f9c38ceafa4ad9fccbedea2582e..c43b21cdefeef818490ac822bc271540304af341 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
@@ -77,7 +77,7 @@ public:
itkGetMacro(RAMValue, unsigned int);
/** Implement the reset method (replace pixel type by default type) */
- void Reset() ITK_OVERRIDE
+ void Reset() override
{
m_ComplexPixelType = m_DefaultComplexPixelType;
}
@@ -90,7 +90,7 @@ public:
static bool ConvertStringToPixelType(const std::string &value, ComplexImagePixelType &type);
/** Return true if a filename is set */
- bool HasValue() const ITK_OVERRIDE;
+ bool HasValue() const override;
void SetFileName (const char* filename)
{
@@ -114,7 +114,7 @@ protected:
/** Constructor */
ComplexOutputImageParameter();
/** Destructor */
- ~ComplexOutputImageParameter() ITK_OVERRIDE;
+ ~ComplexOutputImageParameter() override;
template <class TInputImageType>
void SwitchImageWrite();
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h
index 601b9450a9bf51cc6340b7d969076e2204d3309b..49c46aef4018345d7ee1b3caac3dc3c7e056c81d 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h
@@ -72,7 +72,7 @@ protected:
CompositeApplication();
/** Destructor */
- ~CompositeApplication() ITK_OVERRIDE;
+ ~CompositeApplication() override;
/**
* Callback function to retrieve the process watchers on internal filters
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
index 252ea13f57a5a2571d2fc8c31bc49edd97579941..9e461109d9d850ed0f683040651ae174a7e54ffd 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
@@ -52,7 +52,7 @@ public:
/** RTTI support */
itkTypeMacro(DirectoryParameter, Parameter);
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return m_StringParam->HasValue();
}
@@ -62,13 +62,13 @@ public:
otbGetObjectMemberMacro(StringParam, Value , std::string);
// Clear Value
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_StringParam->ClearValue();
}
// Reimplement the SetActive method
- void SetActive( const bool value ) ITK_OVERRIDE
+ void SetActive( const bool value ) override
{
Superclass::SetActive( value );
m_StringParam->SetActive( value );
@@ -85,7 +85,7 @@ protected:
}
/** Destructor */
- ~DirectoryParameter() ITK_OVERRIDE
+ ~DirectoryParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
index b7ab6885a137292d0be640b4d679ab081a9eede6..c8bdf7a960be0c6ad078ec407b164d5c8c8af5b2 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
@@ -120,7 +120,7 @@ protected:
/** Constructor */
DocExampleStructure();
/** Destructor */
- ~DocExampleStructure() ITK_OVERRIDE;
+ ~DocExampleStructure() override;
private:
DocExampleStructure(const DocExampleStructure &); //purposely not implemented
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
index cb34ef1e3ffe9cc583d4f67c2b3a1db4ba1c534f..a6845b1dceadb8b9aa82a2e4e4ab2ce54dc3d729 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
@@ -52,12 +52,12 @@ public:
itkTypeMacro(EmptyParameter, Parameter);
/** HasValue */
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return false;
}
- bool HasUserValue() const ITK_OVERRIDE
+ bool HasUserValue() const override
{
return this->m_UserValue;
}
@@ -71,7 +71,7 @@ protected:
}
/** Destructor */
- ~EmptyParameter() ITK_OVERRIDE
+ ~EmptyParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
index 5186853f01b28ecb35f01fe1e89e4202a68afb25..2fafb3ecd5fb32f6b406e67a2c023a75e1529364 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
@@ -51,7 +51,7 @@ public:
itkTypeMacro(InputFilenameParameter, Parameter);
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return m_StringParam->HasValue();
}
@@ -69,7 +69,7 @@ public:
}
// Clear Value
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_StringParam->ClearValue();
}
@@ -85,7 +85,7 @@ protected:
}
/** Destructor */
- ~InputFilenameParameter() ITK_OVERRIDE
+ ~InputFilenameParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index 3f83839de104e5bb536c821d9efa2573d13e8890..a12dba6efe980c8ae35d31a66b02df2d13049d19 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -107,9 +107,9 @@ public:
template <class TInputImage, class TOutputImage>
TOutputImage* CastImage();
- bool HasValue() const ITK_OVERRIDE;
+ bool HasValue() const override;
- void ClearValue() ITK_OVERRIDE;
+ void ClearValue() override;
protected:
@@ -117,7 +117,7 @@ protected:
InputImageParameter();
/** Destructor */
- ~InputImageParameter() ITK_OVERRIDE;
+ ~InputImageParameter() override;
ImageBaseType::Pointer m_Image;
std::string m_FileName;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
index 889d79600d1b8a51d0fe7887d06784a2ff569ece..b896b7f23d74a1ece8695c72f5b65ba38abbfd69 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
@@ -52,7 +52,7 @@ public:
itkGetStringMacro(FileName);
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
if(m_FileName.empty())
return false;
@@ -86,7 +86,7 @@ protected:
InputProcessXMLParameter();
/** Destructor */
- ~InputProcessXMLParameter() ITK_OVERRIDE;
+ ~InputProcessXMLParameter() override;
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
index f84a3834ebb28767374455d8d48035ffac275dbf..9442815771d4ed60806c59dfe7b5595de3e304bd 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
@@ -62,16 +62,16 @@ public:
void SetVectorData(VectorDataType* vectorData);
- bool HasValue() const ITK_OVERRIDE;
+ bool HasValue() const override;
- void ClearValue() ITK_OVERRIDE;
+ void ClearValue() override;
protected:
/** Constructor */
InputVectorDataParameter();
/** Destructor */
- ~InputVectorDataParameter() ITK_OVERRIDE;
+ ~InputVectorDataParameter() override;
typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
VectorDataType::Pointer m_VectorData;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
index fb03f066f03a7359751672d7a88a3db4b41f5867..aa5e3feb57a67eee540080b9bfca979216fd1454 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
@@ -84,13 +84,13 @@ public:
/** Return any value */
virtual unsigned int GetValue();
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
// a choice parameter always has a value
return true;
}
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
// nothing to do : a choice parameter always has a value
}
@@ -155,7 +155,7 @@ protected:
ListViewParameter();
/** Destructor */
- ~ListViewParameter() ITK_OVERRIDE;
+ ~ListViewParameter() override;
struct ListViewChoice
{
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
index 6fc5d551ae49345a04d3e67ea0e0efcc2a189433..de97a3471b75a47f0a8cdcafa67b965b76e7d199 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
@@ -54,7 +54,7 @@ public:
typedef T ScalarType;
/** Implement the reset method (replace value by default value) */
- void Reset() ITK_OVERRIDE
+ void Reset() override
{
m_Value = m_DefaultValue;
}
@@ -88,12 +88,12 @@ public:
return boost::any_cast<ScalarType>(m_Value);
}
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return !m_Value.empty();
}
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_Value = boost::any();
}
@@ -125,7 +125,7 @@ protected:
{}
/** Destructor */
- ~NumericalParameter() ITK_OVERRIDE
+ ~NumericalParameter() override
{}
/** Value */
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
index c8b7437b552bce29a44d058c591886b56c54fffa..a528a399277bf1ea540525a10006eb4155ce0a80 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
@@ -51,7 +51,7 @@ public:
itkTypeMacro(OutputFilenameParameter, Parameter);
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return m_StringParam->HasValue();
}
@@ -69,7 +69,7 @@ public:
}
// Clear Value
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_StringParam->ClearValue();
}
@@ -85,7 +85,7 @@ protected:
}
/** Destructor */
- ~OutputFilenameParameter() ITK_OVERRIDE
+ ~OutputFilenameParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
index fd0c392b706d11977caa60031c601b046860210c..aab831aba8bc42d530fbcc114e810584803ef9e5 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
@@ -78,7 +78,7 @@ public:
itkGetMacro(RAMValue, unsigned int);
/** Implement the reset method (replace pixel type by default type) */
- void Reset() ITK_OVERRIDE
+ void Reset() override
{
m_PixelType = m_DefaultPixelType;
}
@@ -91,7 +91,7 @@ public:
static bool ConvertStringToPixelType(const std::string &value, ImagePixelType &type);
/** Return true if a filename is set */
- bool HasValue() const ITK_OVERRIDE;
+ bool HasValue() const override;
void SetFileName (const char* filename)
{
@@ -117,7 +117,7 @@ protected:
/** Constructor */
OutputImageParameter();
/** Destructor */
- ~OutputImageParameter() ITK_OVERRIDE;
+ ~OutputImageParameter() override;
template <class TInputVectorImageType>
void SwitchVectorImageWrite();
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
index 7f247f2baa62153d67958ca85ead26f40479430a..d870ee8023bc22e5d4b8f36740af7f299d2aa91c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
@@ -66,7 +66,7 @@ public:
this->Modified();
}
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
if(m_FileName.empty())
return false;
@@ -74,7 +74,7 @@ public:
return true;
}
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_FileName = "";
}
@@ -94,7 +94,7 @@ protected:
OutputProcessXMLParameter();
/** Destructor */
- ~OutputProcessXMLParameter() ITK_OVERRIDE;
+ ~OutputProcessXMLParameter() override;
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
index fb90702544a20191e1f5a474c0c7571cb48015aa..d1b9c31d37e9eff7e4d76eeaf4ac4c28b410d762 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
@@ -59,7 +59,7 @@ public:
itkGetObjectMacro(VectorData, VectorDataType);
/** Return true if a filename is set */
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
std::string filename(this->GetFileName());
return !filename.empty();
@@ -116,7 +116,7 @@ protected:
}
/** Destructor */
- ~OutputVectorDataParameter() ITK_OVERRIDE
+ ~OutputVectorDataParameter() override
{}
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
index 5776138606c07ad87371d00aa855f7864156be03..7b997afc586489cdf53d657b2495c830134953a8 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
@@ -203,7 +203,7 @@ protected:
{}
/** Destructor */
- ~Parameter() ITK_OVERRIDE {}
+ ~Parameter() override {}
/** Name of the parameter */
std::string m_Name;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
index f6d552c6d3beb88184ce3194f001a1aafb7bf929..36c8240990de3b805a00248f573fa8a6f2cb81c8 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
@@ -95,7 +95,7 @@ public:
std::vector<std::string> GetParametersKeys(bool recursive = true);
// Always has value
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return true;
}
@@ -106,7 +106,7 @@ public:
protected:
ParameterGroup();
- ~ParameterGroup() ITK_OVERRIDE;
+ ~ParameterGroup() override;
typedef std::vector<Parameter::Pointer> ParameterListType;
ParameterListType m_ParameterList;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
index 2c9c699fbe3c540a62d9cc4b39c39bfa052508b6..e54590e42f3e113a07f084b57bde4c1749906abd 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
@@ -91,7 +91,7 @@ public:
void SetNthFileName( std::size_t, const std::string & ) override;
/** */
- std::size_t SetStrings( const StringVector & );
+ std::size_t SetStrings( const StringVector & ) override;
/** */
std::size_t GetStrings( StringVector & ) const override;
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
index c7594f8c5dd625f96f144105513944e4c7fd39b1..1bc45bbd74c82432ed153eb420b8ce62358cf775 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
@@ -77,7 +77,7 @@ public:
protected:
ProxyParameter() {}
- ~ProxyParameter() ITK_OVERRIDE {}
+ ~ProxyParameter() override {}
private:
ProxyParameter(const Self &); //purposely not implemented
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
index 0d6b36c2299cce88f4e43bf9502f22287dcfcedb..e9c4fb97d537b8d54b1a0b83ca8365f11306ab98 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
@@ -52,7 +52,7 @@ public:
typedef NumericalParameter<unsigned int> UnsignedIntParameter;
typedef UnsignedIntParameter::ScalarType ScalarType;
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return m_UnsignedIntParam->HasValue();
}
@@ -71,19 +71,19 @@ public:
otbGetObjectMemberMacro(UnsignedIntParam, MaximumValue, ScalarType);
// Clear Value
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_UnsignedIntParam->ClearValue();
}
// Reset
- void Reset() ITK_OVERRIDE
+ void Reset() override
{
m_UnsignedIntParam->Reset();
}
// Reimplement the SetActive method
- void SetActive( const bool value ) ITK_OVERRIDE
+ void SetActive( const bool value ) override
{
Superclass::SetActive( value );
m_UnsignedIntParam->SetActive( value );
@@ -107,7 +107,7 @@ protected:
}
/** Destructor */
- ~RAMParameter() ITK_OVERRIDE
+ ~RAMParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
index 27e9e726fe445f4bab8aadf0cf7c39800a8cc922..020e647bbf89e2cff943ae98c1b83929557fa746 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
@@ -49,7 +49,7 @@ public:
/** RTTI support */
itkTypeMacro(RadiusParameter, Parameter);
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return true;
}
@@ -64,7 +64,7 @@ protected:
}
/** Destructor */
- ~RadiusParameter() ITK_OVERRIDE
+ ~RadiusParameter() override
{}
private:
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
index 9c8b1e88a976707a3da0d29842775f138777cd2b..861e0b428c38cb6d6e4579261740c0949c390a8c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
@@ -63,12 +63,12 @@ public:
return m_Value;
}
- bool HasValue() const ITK_OVERRIDE
+ bool HasValue() const override
{
return !m_Value.empty();
}
- void ClearValue() ITK_OVERRIDE
+ void ClearValue() override
{
m_Value = "";
}
@@ -79,7 +79,7 @@ protected:
{}
/** Destructor */
- ~StringParameter() ITK_OVERRIDE
+ ~StringParameter() override
{}
std::string m_Value;
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
index c54d4a9fed22c2358c08f4589a08077ba5881443..51b76e9b0b49e69e44aad8fbdf280f89624d59be 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
@@ -122,7 +122,7 @@ protected:
CommandLineLauncher();
/** Destructor */
- ~CommandLineLauncher() ITK_OVERRIDE;
+ ~CommandLineLauncher() override;
/** Load the executable path. It looks for the key --modulePath,
* extract and interpret as path the following strings.
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
index 42c449f18c386d45091cb2a6f0533e4164b82ed9..9f35a7b8920633f9c80299551528fd766cce27f6 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
@@ -90,7 +90,7 @@ protected:
CommandLineParser();
/** Destructor */
- ~CommandLineParser() ITK_OVERRIDE;
+ ~CommandLineParser() override;
private:
CommandLineParser(const CommandLineParser &); //purposely not implemented
diff --git a/Modules/Wrappers/QtWidget/include/itkQtProgressBar.h b/Modules/Wrappers/QtWidget/include/itkQtProgressBar.h
index 5dd5b1b48203dfd471be3baf5800d76e657dbb0c..c158f64d110616c3a700e4009c76e9f74c6a4328 100644
--- a/Modules/Wrappers/QtWidget/include/itkQtProgressBar.h
+++ b/Modules/Wrappers/QtWidget/include/itkQtProgressBar.h
@@ -42,7 +42,7 @@ public:
QtProgressBar( QWidget *parent );
/** Destructor */
- ~QtProgressBar() ITK_OVERRIDE;
+ ~QtProgressBar() override;
/** Get Command */
RedrawCommandType * GetRedrawCommand( void ) const;
diff --git a/Modules/Wrappers/QtWidget/include/otbQtApplication.h b/Modules/Wrappers/QtWidget/include/otbQtApplication.h
index 3950aaf3a57aeb3967dabf60a5911b4aa44078f2..24b10bdceb71bb04f30f8cf422bfec25992fdc98 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtApplication.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtApplication.h
@@ -40,7 +40,7 @@ class OTBQtWidget_EXPORT QtApplication : public QApplication
public:
QtApplication(int& argc, char** argv);
- bool notify(QObject *object, QEvent* event) ITK_OVERRIDE;
+ bool notify(QObject *object, QEvent* event) override;
signals:
diff --git a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
index ec1977b33a45fb3cfaf3c5f6f77bd80e135a3545..ad51f5af1d348e432e201a3889e66f4f1da796b9 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
@@ -51,7 +51,7 @@ public:
};
QtFileSelectionWidget();
- ~QtFileSelectionWidget() ITK_OVERRIDE;
+ ~QtFileSelectionWidget() override;
bool IsChecked()
{
diff --git a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
index b4ca74de997643e8800d1e160d3a25b4b47cd57b..cdf9a6e806252b9edac7935c5a9a7e5c2b9ab568 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
@@ -55,16 +55,16 @@ public:
itkNewMacro(QtLogOutput);
/** flush a buffer */
- void Flush() ITK_OVERRIDE;
+ void Flush() override;
/** Write to multiple outputs */
- void Write(double timestamp) ITK_OVERRIDE;
+ void Write(double timestamp) override;
/** Write to a buffer */
- void Write(std::string const &content) ITK_OVERRIDE;
+ void Write(std::string const &content) override;
/** Write to a buffer */
- void Write(std::string const &content, double timestamp) ITK_OVERRIDE;
+ void Write(std::string const &content, double timestamp) override;
signals:
void NewContentLog(QString);
@@ -74,9 +74,9 @@ protected:
QtLogOutput();
/** Destructor */
- ~QtLogOutput() ITK_OVERRIDE;
+ ~QtLogOutput() override;
- void PrintSelf(std::ostream &os, itk::Indent indent) const ITK_OVERRIDE;
+ void PrintSelf(std::ostream &os, itk::Indent indent) const override;
};
}
diff --git a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
index 1b65bb6d2e0cf142e53c5d30e50412141e21fcbc..90db3a01cb02725d75810d2c0793e3317cc15126 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
@@ -49,7 +49,7 @@ signals:
public:
QtStringSelectionWidget();
- ~QtStringSelectionWidget() ITK_OVERRIDE;
+ ~QtStringSelectionWidget() override;
bool IsChecked()
{
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
index 855a26e9c82831dbcbb02c86e92524d9d1916adf..0d6067c68ffe0f89a3265d91bbdab498b96b78c8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
@@ -42,7 +42,7 @@ class OTBQtWidget_EXPORT QtWidgetChoiceParameter : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetChoiceParameter(ChoiceParameter*, QtWidgetModel*);
- ~QtWidgetChoiceParameter() ITK_OVERRIDE;
+ ~QtWidgetChoiceParameter() override;
protected slots:
void SetValue( int value );
@@ -51,9 +51,9 @@ private:
QtWidgetChoiceParameter(const QtWidgetChoiceParameter&); //purposely not implemented
void operator=(const QtWidgetChoiceParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
ChoiceParameter::Pointer m_ChoiceParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
index 249283011ea5b85fbe7f85aeb32ac1ece4c19691..ec2a3c4a6e19ec23d600e2d316b7c7fdff7725af 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetComplexInputImageParameter : public QtWidgetPar
Q_OBJECT
public:
QtWidgetComplexInputImageParameter(ComplexInputImageParameter*, QtWidgetModel*);
- ~QtWidgetComplexInputImageParameter() ITK_OVERRIDE;
+ ~QtWidgetComplexInputImageParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -56,9 +56,9 @@ private:
QtWidgetComplexInputImageParameter(const QtWidgetComplexInputImageParameter&); //purposely not implemented
void operator=(const QtWidgetComplexInputImageParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
ComplexInputImageParameter::Pointer m_ComplexInputImageParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
index 1ec7b3f3250570a5dcb66887de841a40606cd039..0dbda46016426004032fdcd5fbca4e0bb0d66c7a 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetComplexOutputImageParameter : public QtWidgetPa
Q_OBJECT
public:
QtWidgetComplexOutputImageParameter(ComplexOutputImageParameter*, QtWidgetModel*);
- ~QtWidgetComplexOutputImageParameter() ITK_OVERRIDE;
+ ~QtWidgetComplexOutputImageParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -62,9 +62,9 @@ private:
QtWidgetComplexOutputImageParameter(const QtWidgetComplexOutputImageParameter&); //purposely not implemented
void operator=(const QtWidgetComplexOutputImageParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
std::string m_FileName;
ComplexOutputImageParameter::Pointer m_OutputImageParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
index 8a9a4951bbc58c8672c5f1b6fc569e2e638b0f32..e7d051f72d4cd48fe6ade361587d3ee6bf23fa50 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetDirectoryParameter : public QtWidgetParameterBa
Q_OBJECT
public:
QtWidgetDirectoryParameter(DirectoryParameter*, QtWidgetModel*);
- ~QtWidgetDirectoryParameter() ITK_OVERRIDE;
+ ~QtWidgetDirectoryParameter() override;
protected slots:
void SetFileName( const QString& value );
@@ -53,9 +53,9 @@ private:
QtWidgetDirectoryParameter(const QtWidgetDirectoryParameter&); //purposely not implemented
void operator=(const QtWidgetDirectoryParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
DirectoryParameter::Pointer m_DirectoryParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
index c5c9f6a7bdb12da3dfc546552b97c281980c10c1..44f0625cebe11f5b3732d427328e9d848c358866 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
@@ -43,15 +43,15 @@ class OTBQtWidget_EXPORT QtWidgetEmptyParameter : public QtWidgetParameterBase
public:
QtWidgetEmptyParameter(EmptyParameter*, QtWidgetModel*);
- ~QtWidgetEmptyParameter() ITK_OVERRIDE;
+ ~QtWidgetEmptyParameter() override;
private:
QtWidgetEmptyParameter(const QtWidgetEmptyParameter&); //purposely not implemented
void operator=(const QtWidgetEmptyParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
};
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
index 47275ef86c56021d0c99aa0ad07441d2690ec4d6..3eb2b238903cc03db95e8c987035a726e0be42a5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
@@ -42,7 +42,7 @@ class OTBQtWidget_EXPORT QtWidgetFloatParameter : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetFloatParameter(FloatParameter*, QtWidgetModel*);
- ~QtWidgetFloatParameter() ITK_OVERRIDE;
+ ~QtWidgetFloatParameter() override;
protected slots:
void SetValue( double value );
@@ -51,9 +51,9 @@ private:
QtWidgetFloatParameter(const QtWidgetFloatParameter&); //purposely not implemented
void operator=(const QtWidgetFloatParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
QHBoxLayout * m_QHBoxLayout;
QDoubleSpinBox * m_QDoubleSpinBox;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
index 110c18a292d63d5f7d50dd01e94da8c5b3c2cd78..9069ccabc30158fb2965b43d698e9e008e949489 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetInputFilenameParameter : public QtWidgetParamet
Q_OBJECT
public:
QtWidgetInputFilenameParameter(InputFilenameParameter*, QtWidgetModel*);
- ~QtWidgetInputFilenameParameter() ITK_OVERRIDE;
+ ~QtWidgetInputFilenameParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -56,9 +56,9 @@ private:
QtWidgetInputFilenameParameter(const QtWidgetInputFilenameParameter&); //purposely not implemented
void operator=(const QtWidgetInputFilenameParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
InputFilenameParameter::Pointer m_FilenameParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
index 5c970fc5c7b6e41a5c57eed44931d5e3172e1f0d..a335ee5e066681b32a3ed1e7f3fa891898c9d7d8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetInputImageParameter : public QtWidgetParameterB
Q_OBJECT
public:
QtWidgetInputImageParameter(InputImageParameter*, QtWidgetModel*);
- ~QtWidgetInputImageParameter() ITK_OVERRIDE;
+ ~QtWidgetInputImageParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -62,9 +62,9 @@ private:
QtWidgetInputImageParameter(const QtWidgetInputImageParameter&); //purposely not implemented
void operator=(const QtWidgetInputImageParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
InputImageParameter::Pointer m_InputImageParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
index 407d76c3ad10e4ee77f0324291d9024a877b23fc..0c78193d4d5b037cf8d73455a7278f0cc6bf8aaf 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetInputProcessXMLParameter : public QtWidgetParam
Q_OBJECT
public:
QtWidgetInputProcessXMLParameter(InputProcessXMLParameter*, QtWidgetModel*);
- ~QtWidgetInputProcessXMLParameter() ITK_OVERRIDE;
+ ~QtWidgetInputProcessXMLParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -56,9 +56,9 @@ private:
QtWidgetInputProcessXMLParameter(const QtWidgetInputProcessXMLParameter&); //purposely not implemented
void operator=(const QtWidgetInputProcessXMLParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
InputProcessXMLParameter::Pointer m_XMLParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
index 8b7a6d785cf82c9a812967e39cbb1a3c79e568d3..9106b9855067846ab9a9d53f62a2cfe0b88db40f 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetInputVectorDataParameter : public QtWidgetParam
Q_OBJECT
public:
QtWidgetInputVectorDataParameter(InputVectorDataParameter*, QtWidgetModel*);
- ~QtWidgetInputVectorDataParameter() ITK_OVERRIDE;
+ ~QtWidgetInputVectorDataParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -56,9 +56,9 @@ private:
QtWidgetInputVectorDataParameter(const QtWidgetInputVectorDataParameter&); //purposely not implemented
void operator=(const QtWidgetInputVectorDataParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
InputVectorDataParameter::Pointer m_InputVectorDataParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
index aa39992d98f8ddc88ebfb860663cc9fcf48583d4..1acab2f590ae9a7e6d559ec6bdd7315bd1dda4f2 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetIntParameter : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetIntParameter(IntParameter*, QtWidgetModel*);
- ~QtWidgetIntParameter() ITK_OVERRIDE;
+ ~QtWidgetIntParameter() override;
protected slots:
void SetValue( int value );
@@ -52,9 +52,9 @@ private:
QtWidgetIntParameter(const QtWidgetIntParameter&); //purposely not implemented
void operator=(const QtWidgetIntParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
QHBoxLayout * m_QHBoxLayout;
QSpinBox * m_QSpinBox;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListEditItemModel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListEditItemModel.h
index 34000ebc980150843eabbbebc0b58302b0de3027..4c879607445b438c779ed51a71bc33710e8aecc0 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListEditItemModel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListEditItemModel.h
@@ -122,7 +122,7 @@ public:
QObject * p = nullptr );
/** \brief Destructor. */
- ~ListEditItemModel() ITK_OVERRIDE;
+ ~ListEditItemModel() override;
//
// QAbstractItemModel overloads.
@@ -130,31 +130,31 @@ public:
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#columnCount
*/
- int columnCount( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ int columnCount( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#data
*/
QVariant
data( const QModelIndex & index,
- int role = Qt::DisplayRole ) const ITK_OVERRIDE;
+ int role = Qt::DisplayRole ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#flags
*/
- Qt::ItemFlags flags( const QModelIndex & index ) const ITK_OVERRIDE;
+ Qt::ItemFlags flags( const QModelIndex & index ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#hasChildren
*/
- bool hasChildren( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ bool hasChildren( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#headerData
*/
QVariant headerData( int section,
Qt::Orientation orientation,
- int role = Qt::DisplayRole ) const ITK_OVERRIDE;
+ int role = Qt::DisplayRole ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#index
@@ -162,7 +162,7 @@ public:
QModelIndex
index( int row,
int column,
- const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://doc.qt.io/qt-4.8/qabstractitemmodel.html#insertRow
@@ -176,12 +176,12 @@ public:
bool
insertRows( int row,
int count,
- const QModelIndex & p = QModelIndex() ) ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#parent
*/
- QModelIndex parent( const QModelIndex & index ) const ITK_OVERRIDE;
+ QModelIndex parent( const QModelIndex & index ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#removeRows
@@ -189,12 +189,12 @@ public:
bool
removeRows( int row,
int count,
- const QModelIndex & p = QModelIndex() ) ITK_OVERRIDE;
+ const QModelIndex & p = QModelIndex() ) override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#rowCount
*/
- int rowCount( const QModelIndex & p = QModelIndex() ) const ITK_OVERRIDE;
+ int rowCount( const QModelIndex & p = QModelIndex() ) const override;
/**
* \see http://qt-project.org/doc/qt-4.8/qabstractitemmodel.html#setData
@@ -202,7 +202,7 @@ public:
bool
setData( const QModelIndex & index,
const QVariant & value,
- int role = Qt::EditRole ) ITK_OVERRIDE;
+ int role = Qt::EditRole ) override;
/** */
virtual bool Swap( int, int );
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
index 3f8685810f20fd377825d1f8b1021d32f2be43bb..afef1c44d4626493a49479ee87ed105f1612fed1 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
@@ -42,7 +42,7 @@ class OTBQtWidget_EXPORT QtWidgetListViewParameter : public QtWidgetParameterBas
Q_OBJECT
public:
QtWidgetListViewParameter(ListViewParameter*, QtWidgetModel*);
- ~QtWidgetListViewParameter() ITK_OVERRIDE;
+ ~QtWidgetListViewParameter() override;
std::vector<int> GetSelectedItems()
{
@@ -56,9 +56,9 @@ private:
QtWidgetListViewParameter(const QtWidgetListViewParameter&); //purposely not implemented
void operator=(const QtWidgetListViewParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
ListViewParameter::Pointer m_ListViewParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
index 92c135dd6e049c4e697e7058a8e783bd52a99daa..2fefeda56e012736bd3f0d13ca782ddf39aa5b38 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
@@ -44,7 +44,7 @@ class OTBQtWidget_EXPORT AppliThread : public QThread
m_Application = app;
}
- ~AppliThread() ITK_OVERRIDE;
+ ~AppliThread() override;
inline void Execute()
{
@@ -69,7 +69,7 @@ signals:
void ExceptionRaised( QString what );
protected:
- void run() ITK_OVERRIDE;
+ void run() override;
private:
AppliThread(const AppliThread&); //purposely not implemented
@@ -90,7 +90,7 @@ class OTBQtWidget_EXPORT QtWidgetModel : public QObject
public:
QtWidgetModel(Application* app);
- ~QtWidgetModel() ITK_OVERRIDE;
+ ~QtWidgetModel() override;
Application* GetApplication()
{
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
index fc39587360685386f1017b966b7d7d01f1d8afaa..4a8d089f5218786800afd4335fc79100a28d919c 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetOutputFilenameParameter : public QtWidgetParame
Q_OBJECT
public:
QtWidgetOutputFilenameParameter(OutputFilenameParameter*, QtWidgetModel*);
- ~QtWidgetOutputFilenameParameter() ITK_OVERRIDE;
+ ~QtWidgetOutputFilenameParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -58,9 +58,9 @@ private:
QtWidgetOutputFilenameParameter(const QtWidgetOutputFilenameParameter&); //purposely not implemented
void operator=(const QtWidgetOutputFilenameParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
OutputFilenameParameter::Pointer m_FilenameParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
index 878f7ee56f61dbd40f27a04c5f5853cc5c3802fc..8ae053cf1b26bd038ac97e085a9ce570ffd105d3 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetOutputImageParameter : public QtWidgetParameter
Q_OBJECT
public:
QtWidgetOutputImageParameter(OutputImageParameter*, QtWidgetModel*);
- ~QtWidgetOutputImageParameter() ITK_OVERRIDE;
+ ~QtWidgetOutputImageParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -62,9 +62,9 @@ private:
QtWidgetOutputImageParameter(const QtWidgetOutputImageParameter&); //purposely not implemented
void operator=(const QtWidgetOutputImageParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
std::string m_FileName;
OutputImageParameter::Pointer m_OutputImageParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
index 10cd6481e7b7609ec8012602ff10d95da13ad036..9b8d519f7318f7a4144c9bb5d8a477d1c6977aad 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetOutputProcessXMLParameter : public QtWidgetPara
Q_OBJECT
public:
QtWidgetOutputProcessXMLParameter(OutputProcessXMLParameter*, QtWidgetModel*);
- ~QtWidgetOutputProcessXMLParameter() ITK_OVERRIDE;
+ ~QtWidgetOutputProcessXMLParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -58,9 +58,9 @@ private:
QtWidgetOutputProcessXMLParameter(const QtWidgetOutputProcessXMLParameter&); //purposely not implemented
void operator=(const QtWidgetOutputProcessXMLParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
OutputProcessXMLParameter::Pointer m_XMLParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
index 2e9fcae1eea43bd348d2f126e01760bf61a7bddd..f859b8a60eed8638c53df14c59ac2194aed0ea7b 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetOutputVectorDataParameter : public QtWidgetPara
Q_OBJECT
public:
QtWidgetOutputVectorDataParameter(OutputVectorDataParameter*, QtWidgetModel*);
- ~QtWidgetOutputVectorDataParameter() ITK_OVERRIDE;
+ ~QtWidgetOutputVectorDataParameter() override;
inline const QLineEdit* GetInput() const;
inline QLineEdit* GetInput();
@@ -61,9 +61,9 @@ private:
QtWidgetOutputVectorDataParameter(const QtWidgetOutputVectorDataParameter&); //purposely not implemented
void operator=(const QtWidgetOutputVectorDataParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
std::string m_FileName;
OutputVectorDataParameter::Pointer m_OutputVectorDataParam;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
index 86b0eeed42228ed64efe2be8a3e8f9c2af5e6ae9..1fe559da6919966e0c71c0d561f1499fe6333420 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
@@ -46,7 +46,7 @@ class OTBQtWidget_EXPORT QtWidgetParameterBase : public QWidget
friend class QtWidgetParameterGroup;
public:
QtWidgetParameterBase( Parameter *, QtWidgetModel * );
- ~QtWidgetParameterBase() ITK_OVERRIDE;
+ ~QtWidgetParameterBase() override;
void CreateWidget();
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
index d5ae3f2a4805ef648dc2cb23b26e70639ac6fcb4..6fd1f14f41724cbef01bc1589998037f5b219236 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
@@ -64,7 +64,7 @@ public:
protected:
QtWidgetParameterFactory();
- ~QtWidgetParameterFactory() ITK_OVERRIDE;
+ ~QtWidgetParameterFactory() override;
private:
QtWidgetParameterFactory(const Self&); //purposely not implemented
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
index da70434fbf7684fe17fd05c781a9f54bcf50f0ad..28aebf2066cbf5ba28080d61934d80a9cffb29cc 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
@@ -46,18 +46,18 @@ class OTBQtWidget_EXPORT QtWidgetParameterGroup : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetParameterGroup(ParameterGroup::Pointer, QtWidgetModel*);
- ~QtWidgetParameterGroup() ITK_OVERRIDE;
+ ~QtWidgetParameterGroup() override;
public slots:
- void SetActivationState( bool value ) ITK_OVERRIDE;
+ void SetActivationState( bool value ) override;
private:
QtWidgetParameterGroup(const QtWidgetParameterGroup&); //purposely not implemented
void operator=(const QtWidgetParameterGroup&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
virtual void ProcessChild(QObject* currentNode, bool status);
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
index bbe31014cb7c9d7d337683bfd58c6d6a79d79783..1bb699dfffc0a9c36843eb0b3bdad398f81682e7 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetParameterLabel : public QWidget
Q_OBJECT
public:
QtWidgetParameterLabel(Parameter*);
- ~QtWidgetParameterLabel() ITK_OVERRIDE;
+ ~QtWidgetParameterLabel() override;
private:
QtWidgetParameterLabel(const QtWidgetParameterLabel&); //purposely not implemented
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
index 521a109acb13cc041df3acaeab103f1890a8f514..3c3f017aa4200daf89a90f563c20645fb2be6ac8 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
@@ -45,7 +45,7 @@ class OTBQtWidget_EXPORT QtWidgetProgressReport : public QWidget
Q_OBJECT
public:
QtWidgetProgressReport(QtWidgetModel * model);
- ~QtWidgetProgressReport() ITK_OVERRIDE;
+ ~QtWidgetProgressReport() override;
void SetApplication(Application::Pointer app);
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
index eabf78f1e91209cf540e2ef74fc4e3c708059193..c8fcc31011e1f1daed0cccf10ecf1f836bfd42bc 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetRAMParameter : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetRAMParameter(RAMParameter*, QtWidgetModel*);
- ~QtWidgetRAMParameter() ITK_OVERRIDE;
+ ~QtWidgetRAMParameter() override;
protected slots:
void SetValue( int value );
@@ -52,9 +52,9 @@ private:
QtWidgetRAMParameter(const QtWidgetRAMParameter&); //purposely not implemented
void operator=(const QtWidgetRAMParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
QHBoxLayout * m_QHBoxLayout;
QSpinBox * m_QSpinBox;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
index 3f5c4605bf77da04611aa403ed553d6a121015a5..df13944c65fd4dfc673b528092e02d4c9862a7e5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
@@ -45,7 +45,7 @@ class OTBQtWidget_EXPORT QtWidgetSimpleProgressReport : public QWidget
Q_OBJECT
public:
QtWidgetSimpleProgressReport(QtWidgetModel * model);
- ~QtWidgetSimpleProgressReport() ITK_OVERRIDE;
+ ~QtWidgetSimpleProgressReport() override;
void SetApplication(Application::Pointer app);
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
index b639cf379712c9b03566fe832a3b409f535dfd8d..bf3bb78275d5f397759da6348721432b839951c0 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
@@ -42,7 +42,7 @@ class OTBQtWidget_EXPORT QtWidgetStringParameter : public QtWidgetParameterBase
Q_OBJECT
public:
QtWidgetStringParameter(StringParameter*, QtWidgetModel*);
- ~QtWidgetStringParameter() ITK_OVERRIDE;
+ ~QtWidgetStringParameter() override;
protected slots:
void SetValue( const QString& value );
@@ -51,9 +51,9 @@ private:
QtWidgetStringParameter(const QtWidgetStringParameter&); //purposely not implemented
void operator=(const QtWidgetStringParameter&); //purposely not implemented
- void DoCreateWidget() ITK_OVERRIDE;
+ void DoCreateWidget() override;
- void DoUpdateGUI() ITK_OVERRIDE;
+ void DoUpdateGUI() override;
StringParameter::Pointer m_StringParam;
QHBoxLayout * m_HLayout;
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
index 08857a242016ffb592d3005b209d6b2ffbb874fb..5a004af2dc56df5e5a94d8510df22b60d7e822a2 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
@@ -43,7 +43,7 @@ class OTBQtWidget_EXPORT QtWidgetView : public QWidget
Q_OBJECT
public:
QtWidgetView(Application* app);
- ~QtWidgetView() ITK_OVERRIDE;
+ ~QtWidgetView() override;
void CreateGui();
diff --git a/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx b/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx
index 9ff2a0eea24d0fd3e4311cbf79ad482d67c124fa..e830bd13244a2de97a1a78603eab13247ae38c9f 100644
--- a/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx
+++ b/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx
@@ -54,19 +54,19 @@ protected:
{
}
- ~StubApplication() ITK_OVERRIDE
+ ~StubApplication() override
{
}
- void DoInit() ITK_OVERRIDE
+ void DoInit() override
{
}
- void DoUpdateParameters() ITK_OVERRIDE
+ void DoUpdateParameters() override
{
}
- void DoExecute() ITK_OVERRIDE
+ void DoExecute() override
{
}
};
diff --git a/Modules/Wrappers/SWIG/src/python/itkPyCommand.h b/Modules/Wrappers/SWIG/src/python/itkPyCommand.h
index d65c4eea7bf23a3cabdca32d58978110f4522f96..5537bd56c3794bef6f809a588b9936ee1c27baa7 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&) override;
+ void Execute(const Object *, const EventObject&) override;
protected:
PyCommand();