Skip to content
Snippets Groups Projects
Commit 04628a9c authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

WRG: various warning fix

parent f6e6d39e
No related branches found
No related tags found
No related merge requests found
...@@ -909,7 +909,7 @@ namespace otb ...@@ -909,7 +909,7 @@ namespace otb
{ {
OutIt.GoToBeginOfLine(); OutIt.GoToBeginOfLine();
// indice of current line (into output Geometry) // indice of current line (into output Geometry)
int ind_Line = OutIt.GetIndex()[1] + int(this->GetOutput()->GetOrigin()[1]); //~ int ind_Line = OutIt.GetIndex()[1] + int(this->GetOutput()->GetOrigin()[1]);
// The Projeted DEM Pixel/Bands is always into SAR geometry => must be adapted for mlRan and mlAzi != 1 // The Projeted DEM Pixel/Bands is always into SAR geometry => must be adapted for mlRan and mlAzi != 1
// If mlRan and mlAzi == 1 same as SAR geometry (loop on ind_Line_start=ind_Line only) // If mlRan and mlAzi == 1 same as SAR geometry (loop on ind_Line_start=ind_Line only)
......
...@@ -28,7 +28,21 @@ ...@@ -28,7 +28,21 @@
#include "otbSarSensorModelAdapter.h" #include "otbSarSensorModelAdapter.h"
#include "otbImageKeywordlist.h" #include "otbImageKeywordlist.h"
#include "ossim/base/ossimGeoidEgm96.h" #if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
#if defined(__GNUC__) && (__GNUC__ > 5)
#pragma GCC diagnostic ignored "-Wnonnull-compare"
#endif
# include "ossim/base/ossimGeoidEgm96.h"
# pragma GCC diagnostic pop
#else
# include "ossim/base/ossimGeoidEgm96.h"
#endif
namespace otb namespace otb
{ {
......
...@@ -154,7 +154,7 @@ namespace otb ...@@ -154,7 +154,7 @@ namespace otb
this->getAllCoefs(inputKWL, FMRateRecords); this->getAllCoefs(inputKWL, FMRateRecords);
DurationType diffAziTimeMin; DurationType diffAziTimeMin(0);
unsigned int polySelected = 0; unsigned int polySelected = 0;
// Select one polynomial (with m_MidAziTime) // Select one polynomial (with m_MidAziTime)
......
...@@ -156,17 +156,17 @@ protected: ...@@ -156,17 +156,17 @@ protected:
TilesAnalysisImageFilter(); TilesAnalysisImageFilter();
// Destructor // Destructor
virtual ~TilesAnalysisImageFilter() ITK_OVERRIDE; ~TilesAnalysisImageFilter() override;
// Print // Print
void PrintSelf(std::ostream & os, itk::Indent indent) const ITK_OVERRIDE; void PrintSelf(std::ostream & os, itk::Indent indent) const override;
/** TilesAnalysisImageFilter produces an image which are into output geometry. The differences between /** TilesAnalysisImageFilter produces an image which are into output geometry. The differences between
* output and input images can be the size of images and the dimensions. * output and input images can be the size of images and the dimensions.
* As such, TilesAnalysisImageFilter needs to provide an implementation for * As such, TilesAnalysisImageFilter needs to provide an implementation for
* GenerateOutputInformation() in order to inform the pipeline execution model. * GenerateOutputInformation() in order to inform the pipeline execution model.
*/ */
virtual void GenerateOutputInformation() ITK_OVERRIDE; void GenerateOutputInformation() override;
/** TilesAnalysisImageFilter needs a input requested region that corresponds to the margin and shifts /** TilesAnalysisImageFilter needs a input requested region that corresponds to the margin and shifts
* into the requested region of our output requested region. The output requested region needs to be modified * into the requested region of our output requested region. The output requested region needs to be modified
...@@ -174,7 +174,7 @@ protected: ...@@ -174,7 +174,7 @@ protected:
* As such, TilesAnalysesImageFilter needs to provide an implementation for * As such, TilesAnalysesImageFilter needs to provide an implementation for
* GenerateInputRequestedRegion() in order to inform the pipeline execution model. * GenerateInputRequestedRegion() in order to inform the pipeline execution model.
* \sa ProcessObject::GenerateInputRequestedRegion() */ * \sa ProcessObject::GenerateInputRequestedRegion() */
virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; void GenerateInputRequestedRegion() override;
/** /**
* OutputRegionToInputRegion returns the input region * OutputRegionToInputRegion returns the input region
...@@ -186,6 +186,7 @@ protected: ...@@ -186,6 +186,7 @@ protected:
*/ */
GridRegionType OutputRegionToInputGridRegion(const ImageOutRegionType& outputRegion) const; GridRegionType OutputRegionToInputGridRegion(const ImageOutRegionType& outputRegion) const;
using Superclass::ThreadedGenerateData;
/** startIndex and stopIndex represent the indices of tiles to process in thread threadId and index for the /** startIndex and stopIndex represent the indices of tiles to process in thread threadId and index for the
first tile */ first tile */
void ThreadedGenerateData(unsigned int startTileId, unsigned int stopTileId, void ThreadedGenerateData(unsigned int startTileId, unsigned int stopTileId,
...@@ -206,7 +207,7 @@ protected: ...@@ -206,7 +207,7 @@ protected:
/** /**
* \sa ImageToImageFilter::ThreadedGenerateData(), * \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */ * ImageToImageFilter::GenerateData() */
virtual void GenerateData() ITK_OVERRIDE; void GenerateData() override;
private: private:
TilesAnalysisImageFilter(const Self&); // purposely not implemented TilesAnalysisImageFilter(const Self&); // purposely not implemented
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment