Skip to content
Snippets Groups Projects
Commit bef05bec authored by Gaëlle USSEGLIO's avatar Gaëlle USSEGLIO
Browse files

Merge branch 'some_warning_fixes' of...

Merge branch 'some_warning_fixes' of https://gitlab.orfeo-toolbox.org/remote_modules/diapotb into cosmo
parents 3cffedfe 4d262d0c
No related branches found
No related tags found
No related merge requests found
...@@ -31,11 +31,20 @@ ...@@ -31,11 +31,20 @@
#include <cmath> #include <cmath>
// include ossim // include ossim
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include "ossim/ossimTimeUtilities.h" #include "ossim/ossimTimeUtilities.h"
#include "ossim/base/ossimKeywordlist.h" #include "ossim/base/ossimKeywordlist.h"
#include "ossim/base/ossimString.h" #include "ossim/base/ossimString.h"
#include "ossim/base/ossimDate.h" #include "ossim/base/ossimDate.h"
#pragma GCC diagnostic pop
#else
#include "ossim/ossimTimeUtilities.h"
#include "ossim/base/ossimKeywordlist.h"
#include "ossim/base/ossimString.h"
#include "ossim/base/ossimDate.h"
#endif
namespace otb namespace otb
{ {
......
...@@ -29,8 +29,16 @@ ...@@ -29,8 +29,16 @@
#include "itkProgressReporter.h" #include "itkProgressReporter.h"
#include "itkNumericTraitsPointPixel.h" #include "itkNumericTraitsPointPixel.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include "ossim/base/ossimFilename.h" #include "ossim/base/ossimFilename.h"
#include "ossim/base/ossimGpt.h" #include "ossim/base/ossimGpt.h"
#pragma GCC diagnostic pop
#else
#include "ossim/base/ossimFilename.h"
#include "ossim/base/ossimGpt.h"
#endif
#include <cmath> #include <cmath>
......
...@@ -90,7 +90,7 @@ namespace otb ...@@ -90,7 +90,7 @@ namespace otb
for (std::size_t listId=0; listId!= nbLists ; ++listId) for (std::size_t listId=0; listId!= nbLists ; ++listId)
{ {
const int pos = sprintf(fmRatePrefix_, "%s%d.", FM_PREFIX.c_str(), (listId+1)); const int pos = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), (listId+1));
assert(pos > 0 && pos < sizeof(fmRatePrefix_)); assert(pos > 0 && pos < sizeof(fmRatePrefix_));
const std::string FMPrefix(fmRatePrefix_, pos); const std::string FMPrefix(fmRatePrefix_, pos);
...@@ -120,7 +120,7 @@ namespace otb ...@@ -120,7 +120,7 @@ namespace otb
for (std::size_t listId=0; listId!= nbLists ; ++listId) for (std::size_t listId=0; listId!= nbLists ; ++listId)
{ {
const int pos = sprintf(dcfPrefix_, "%s%d.", DCF_PREFIX.c_str(), (listId+1)); const int pos = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), (listId+1));
assert(pos > 0 && pos < sizeof(dcfPrefix_)); assert(pos > 0 && pos < sizeof(dcfPrefix_));
const std::string DCFPrefix(dcfPrefix_, pos); const std::string DCFPrefix(dcfPrefix_, pos);
......
...@@ -184,9 +184,6 @@ namespace otb ...@@ -184,9 +184,6 @@ namespace otb
// For each colunm // For each colunm
while (!OutIt.IsAtEndOfLine() && !In1It.IsAtEndOfLine() && !In2It.IsAtEndOfLine()) while (!OutIt.IsAtEndOfLine() && !In1It.IsAtEndOfLine() && !In2It.IsAtEndOfLine())
{ {
// Output index
ImageIndexType index = OutIt.GetIndex();
double diff_DopCentroid = In1It.Get() - In2It.Get(); double diff_DopCentroid = In1It.Get() - In2It.Get();
// Shift for azimut dimension // Shift for azimut dimension
......
...@@ -190,7 +190,7 @@ protected: ...@@ -190,7 +190,7 @@ protected:
first tile */ first tile */
virtual void ThreadedGenerateData(unsigned int startTileId, unsigned int stopTileId, virtual void ThreadedGenerateData(unsigned int startTileId, unsigned int stopTileId,
unsigned int firstTileIndexL, unsigned int firstTileIndexC, unsigned int firstTileIndexL, unsigned int firstTileIndexC,
itk::ThreadIdType threadId); itk::ThreadIdType threadId) ITK_OVERRIDE;
/** Static function used as a "callback" by the MultiThreader. The threading /** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the * library will call this routine for each thread, which will delegate the
......
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
// Process // Process
void Process(ImageInPointer inputPtr, ImageOutRegionType outputRegion, ImageOutPixelType * TilesResult, void Process(ImageInPointer inputPtr, ImageOutRegionType outputRegion, ImageOutPixelType * TilesResult,
int threadId=0) int /*threadId=0*/)
{ {
// Transpose outputRegion (current tile) into input image // Transpose outputRegion (current tile) into input image
// Input (= output now) // Input (= output now)
......
...@@ -39,8 +39,7 @@ int otbSARDopplerCentroidFreqFilterTest(int argc, char * argv[]) ...@@ -39,8 +39,7 @@ int otbSARDopplerCentroidFreqFilterTest(int argc, char * argv[])
// Image type // Image type
const unsigned int Dimension = 2; const unsigned int Dimension = 2;
typedef otb::Image <std::complex<float>, 2> ImageSARInType ; typedef otb::Image <float, Dimension> FloatImageType;
typedef otb::Image <float, 2> FloatImageType;
typedef otb::VectorImage<float> FloatVectorImageType; typedef otb::VectorImage<float> FloatVectorImageType;
// Reader // Reader
......
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