[Git][debian-gis-team/otb][upstream] New upstream version 7.2.0~rc2+dfsg
Bas Couwenberg
gitlab at salsa.debian.org
Tue Sep 29 18:04:37 BST 2020
Bas Couwenberg pushed to branch upstream at Debian GIS Project / otb
Commits:
f3f9d61b by Bas Couwenberg at 2020-09-29T14:12:44+02:00
New upstream version 7.2.0~rc2+dfsg
- - - - -
3 changed files:
- Modules/Filtering/ImageManipulation/include/otbSpectralInformationDivergenceFunctor.h
- Modules/Remote/temporal-gapfilling.remote.cmake
- Modules/ThirdParty/OssimPlugins/src/ossim/AlosPalsar/AlosPalsarData.h
Changes:
=====================================
Modules/Filtering/ImageManipulation/include/otbSpectralInformationDivergenceFunctor.h
=====================================
@@ -25,6 +25,7 @@
#include <algorithm>
#include <vector>
#include <numeric>
+#include <stdexcept>
namespace otb
{
@@ -37,7 +38,7 @@ namespace Functor
* Du, Yingzi & Chang, Chein-I & Ren, Hsuan & Chang, Chein-Chi & Jensen, James & D'Amico, Francis. (2004). "
"New Hyperspectral Discrimination Measure for Spectral Characterization. Optical Engineering - OPT ENG. 43."
" 1777-1786. 10.1117/1.1766301.
- *
+ *
* \ingroup OTBImageManipulation
*/
template <class TInput, class TReference, class TOutput>
@@ -46,17 +47,17 @@ class SpectralInformationDivergenceFunctor
public:
SpectralInformationDivergenceFunctor() = default;
virtual ~SpectralInformationDivergenceFunctor() = default;
-
+
using OutputValueType = typename TOutput::ValueType;
-
+
// Binary operator
inline TOutput operator()(const TInput& input) const
{
TOutput res;
res.SetSize(m_ReferenceProbabilities.size());
-
+
auto inputProbability = ComputeProbabilityMassFunction(input);
-
+
for (unsigned int i = 0; i< m_ReferenceProbabilities.size(); i++)
{
res[i] = ComputeSpectralInformationDivergence(inputProbability, m_ReferenceProbabilities[i]);
@@ -80,19 +81,19 @@ public:
m_ReferenceProbabilities.push_back(ComputeProbabilityMassFunction(pixel));
}
}
-
+
private:
inline TInput ComputeProbabilityMassFunction(TInput const & input) const
{
for (unsigned int i = 0; i < input.Size(); i++)
{
// Input pixel should be non negative (e.g. reflectance, radiance)
- if (input[i] <= 0)
+ if (input[i] <= 0)
{
throw std::runtime_error("Input pixels of the spectral information divergence algorithm should be strictly positive.");
}
}
-
+
return input / std::accumulate(&input[0], &input[input.Size()], 0.0);
}
@@ -108,7 +109,7 @@ private:
return sid;
}
- /** Probability mass function associated with the reference pixel */
+ /** Probability mass function associated with the reference pixel */
std::vector<TReference> m_ReferenceProbabilities;
};
=====================================
Modules/Remote/temporal-gapfilling.remote.cmake
=====================================
@@ -25,6 +25,6 @@ otb_fetch_module(OTBTemporalGapFilling
A more detailed description can be found on the project website:
https://gitlab.orfeo-toolbox.org/jinglada/temporalgapfilling
"
- GIT_REPOSITORY https://gitlab.orfeo-toolbox.org/jinglada/temporalgapfilling.git
- GIT_TAG master
+ GIT_REPOSITORY https://gitlab.orfeo-toolbox.org/ctraizet/temporalgapfilling.git
+ GIT_TAG cd0aa8b18369140a270ec64659543a53167ef641
)
=====================================
Modules/ThirdParty/OssimPlugins/src/ossim/AlosPalsar/AlosPalsarData.h
=====================================
@@ -28,6 +28,7 @@
#define AlosPalsarData_h
#include <map>
+#include <iostream>
class ossimKeywordlist;
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/-/commit/f3f9d61b95d8bbc9da74f74613129732eeb043da
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/-/commit/f3f9d61b95d8bbc9da74f74613129732eeb043da
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200929/695efddf/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list