From f6fbaba9fe7e4e3ba33e19d259f695b9dbb84fe9 Mon Sep 17 00:00:00 2001 From: Raffaele Gaetano <raffaele.gaetano@cirad.fr> Date: Tue, 15 Dec 2020 21:26:53 +0100 Subject: [PATCH] Changed several long unsigned int into size_t; Updated otb-module.cmake --- include/otbNDVITimeSeriesFunctor.h | 12 ++++++------ otb-module.cmake | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/otbNDVITimeSeriesFunctor.h b/include/otbNDVITimeSeriesFunctor.h index 5066d1f..903c67c 100644 --- a/include/otbNDVITimeSeriesFunctor.h +++ b/include/otbNDVITimeSeriesFunctor.h @@ -93,7 +93,7 @@ public: inline unsigned int GetOutputSize() const { return nbOfYears; } - constexpr std::size_t OutputSize(std::array<long unsigned int, 1ul>&) const + constexpr std::size_t OutputSize(std::array<size_t, 1ul>&) const { return nbOfYears; } @@ -369,7 +369,7 @@ public: static constexpr std::size_t outputPixelSize{1}; - std::size_t OutputSize(std::array<long unsigned int, 1ul>&) const + std::size_t OutputSize(std::array<size_t, 1ul>&) const { return numberOfComponentsPerPixel; } @@ -523,7 +523,7 @@ public: static constexpr std::size_t outputPixelSize{1}; - std::size_t OutputSize(std::array<long unsigned int, 1ul>&) const + std::size_t OutputSize(std::array<size_t, 1ul>&) const { return numberOfComponentsPerPixel; } @@ -609,7 +609,7 @@ public: } ~RainfallEstimatedNDVIResiduesFunctor(){} - std::size_t OutputSize(std::array<long unsigned int, 2ul> Inputs) const + std::size_t OutputSize(std::array<size_t, 2ul> Inputs) const { unsigned int nbComp = std::accumulate(Inputs.begin(),Inputs.end(),0)/2; return nbComp; @@ -800,7 +800,7 @@ public: static constexpr std::size_t outputPixelSize{1}; - std::size_t OutputSize(std::array<long unsigned int, 3ul>&) const + std::size_t OutputSize(std::array<size_t, 3ul>&) const { return numberOfComponentsPerPixel; } @@ -925,7 +925,7 @@ public: static constexpr std::size_t outputPixelSize{1}; - std::size_t OutputSize(std::array<long unsigned int, 2ul>&) const + std::size_t OutputSize(std::array<size_t, 2ul>&) const { return numberOfComponentsPerPixel; } diff --git a/otb-module.cmake b/otb-module.cmake index 8e0113e..53d2f8c 100644 --- a/otb-module.cmake +++ b/otb-module.cmake @@ -6,7 +6,6 @@ otb_module(NDVITimeSeries OTBCommon OTBApplicationEngine TimeSeriesUtils - OTBTemporalGapFilling LSGRM TEST_DEPENDS -- GitLab