From bd511aec950d6226e68df18acd0d59390d0ab35c Mon Sep 17 00:00:00 2001 From: Guillaume Pasero <guillaume.pasero@c-s.fr> Date: Wed, 18 Dec 2019 14:54:31 +0100 Subject: [PATCH] WRG: missing override --- .../include/otbVectorPrediction.hxx | 2 +- .../Filtering/MathParserX/src/otbParserXPlugins.cxx | 2 +- .../Mosaic/include/otbStreamingFeatherMosaicFilter.h | 2 +- .../include/otbStreamingLargeFeatherMosaicFilter.h | 2 +- .../Mosaic/include/otbStreamingMosaicFilterBase.h | 8 ++++---- .../otbStreamingMosaicFilterWithBlendingBase.h | 6 +++--- .../Mosaic/include/otbStreamingSimpleMosaicFilter.h | 2 +- .../include/otbStreamingStatisticsMosaicFilter.h | 12 ++++++------ 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Modules/Applications/AppClassification/include/otbVectorPrediction.hxx b/Modules/Applications/AppClassification/include/otbVectorPrediction.hxx index b90b50f476..30067a6362 100644 --- a/Modules/Applications/AppClassification/include/otbVectorPrediction.hxx +++ b/Modules/Applications/AppClassification/include/otbVectorPrediction.hxx @@ -164,7 +164,7 @@ otb::ogr::DataSource::Pointer VectorPrediction<RegressionMode>::ReopenDataSource } template <bool RegressionMode> -otb::ogr::DataSource::Pointer VectorPrediction<RegressionMode>::CreateOutputDataSource(ogr::DataSource::Pointer source, ogr::Layer& layer) +otb::ogr::DataSource::Pointer VectorPrediction<RegressionMode>::CreateOutputDataSource(ogr::DataSource::Pointer /*source*/, ogr::Layer& layer) { ogr::DataSource::Pointer output; // Create new OGRDataSource diff --git a/Modules/Filtering/MathParserX/src/otbParserXPlugins.cxx b/Modules/Filtering/MathParserX/src/otbParserXPlugins.cxx index 203f34b18d..7570ba3d30 100644 --- a/Modules/Filtering/MathParserX/src/otbParserXPlugins.cxx +++ b/Modules/Filtering/MathParserX/src/otbParserXPlugins.cxx @@ -31,7 +31,7 @@ namespace otb { -void bands::Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* a_pArg, int a_iArgc) +void bands::Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* a_pArg, int otbUseInDebug(a_iArgc) ) { assert (a_iArgc == 2); diff --git a/Modules/Filtering/Mosaic/include/otbStreamingFeatherMosaicFilter.h b/Modules/Filtering/Mosaic/include/otbStreamingFeatherMosaicFilter.h index 8c345d2964..7dcf43dd92 100644 --- a/Modules/Filtering/Mosaic/include/otbStreamingFeatherMosaicFilter.h +++ b/Modules/Filtering/Mosaic/include/otbStreamingFeatherMosaicFilter.h @@ -127,7 +127,7 @@ protected: } /** Overrided methods */ - virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId); + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override; private: InternalValueType m_FeatheringTransitionDistance; // feathering transition diff --git a/Modules/Filtering/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h b/Modules/Filtering/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h index c6f1fa75c3..b8e85d66c2 100644 --- a/Modules/Filtering/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h +++ b/Modules/Filtering/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h @@ -116,7 +116,7 @@ protected: } /** Overrided method */ - virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId); + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override; }; // end of class diff --git a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.h b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.h index 82903b5e05..2c9f3e5a6d 100644 --- a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.h +++ b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.h @@ -167,13 +167,13 @@ protected: /** * Methods */ - virtual void GenerateOutputInformation(void); + void GenerateOutputInformation(void) override; - virtual void GenerateInputRequestedRegion(void); + void GenerateInputRequestedRegion(void) override; - virtual void AfterThreadedGenerateData(); + void AfterThreadedGenerateData() override; - virtual void BeforeThreadedGenerateData(); + void BeforeThreadedGenerateData() override; /** Image extent computing */ virtual void ImageToExtent(InputImageType* image, InputImagePointType& extentInf, InputImagePointType& extentSup); diff --git a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterWithBlendingBase.h b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterWithBlendingBase.h index 5f78bc120b..3a3474d6f6 100644 --- a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterWithBlendingBase.h +++ b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterWithBlendingBase.h @@ -100,11 +100,11 @@ protected: } /* Overrided methods */ - virtual void AddUsedInputImageIndex(unsigned int inputImageIndex); + void AddUsedInputImageIndex(unsigned int inputImageIndex) override; - virtual unsigned int GetNumberOfInputImages(); + unsigned int GetNumberOfInputImages() override; - virtual unsigned int GetUsedInputImageIndice(unsigned int i) + unsigned int GetUsedInputImageIndice(unsigned int i) override { return 0.5 * Superclass::GetUsedInputImageIndice(i); } diff --git a/Modules/Filtering/Mosaic/include/otbStreamingSimpleMosaicFilter.h b/Modules/Filtering/Mosaic/include/otbStreamingSimpleMosaicFilter.h index 0d8e042c64..450146859d 100644 --- a/Modules/Filtering/Mosaic/include/otbStreamingSimpleMosaicFilter.h +++ b/Modules/Filtering/Mosaic/include/otbStreamingSimpleMosaicFilter.h @@ -84,7 +84,7 @@ protected: } /** Overrided methods */ - virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId); + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override; private: StreamingSimpleMosaicFilter(const Self&); // purposely not implemented diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMosaicFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMosaicFilter.h index e7afba352e..835eb9e485 100644 --- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMosaicFilter.h +++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMosaicFilter.h @@ -96,13 +96,13 @@ public: typedef itk::ProcessObject::DataObjectPointerArraySizeType DataObjectPointerArraySizeType; /** Overrided methods */ - virtual void AllocateOutputs(); - virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId); - virtual void Reset(); - virtual void Synthetize(); + void AllocateOutputs() override; + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override; + void Reset() override; + void Synthetize() override; /** 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; /** Return the computed Mean. */ @@ -432,7 +432,7 @@ protected: /** Constructor */ StreamingStatisticsMosaicFilter(){}; /** Destructor */ - ~StreamingStatisticsMosaicFilter() ITK_OVERRIDE + ~StreamingStatisticsMosaicFilter() override { } -- GitLab