diff --git a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerFunctor.h b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerFunctor.h
index 8a58cd100ced04c75198c4d1d1164f188741d0ad..01abfc2e99e95b3e662365d0473fdcef8c8f727f 100644
--- a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerFunctor.h
@@ -170,11 +170,6 @@ public:
result[3] = l_PolarisationDegreeMax;
}
- unsigned int GetOutputSize()
- {
- return m_NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the result
@@ -182,13 +177,12 @@ public:
}
/** Constructor */
- MuellerToPolarisationDegreeAndPowerFunctor() : m_NumberOfComponentsPerPixel(4), m_Epsilon(1e-6), m_PI_90(2*CONST_PI_180) {}
+ MuellerToPolarisationDegreeAndPowerFunctor() : m_Epsilon(1e-6), m_PI_90(2*CONST_PI_180) {}
/** Destructor */
virtual ~MuellerToPolarisationDegreeAndPowerFunctor() {}
private:
- unsigned int m_NumberOfComponentsPerPixel;
const double m_Epsilon;
const double m_PI_90;
};
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompFunctor.h b/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompFunctor.h
index c0cc0e3b403932c7e3d40757d9da67fb1972f737..ecf39c1de648fcfeef249f54ea3d93e0dceb1929 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalBarnesDecompFunctor.h
@@ -19,10 +19,9 @@
*/
-#ifndef otbReciprocalBarnesDecompImageFilter_h
-#define otbReciprocalBarnesDecompImageFilter_h
+#ifndef otbReciprocalBarnesDecompFunctor_h
+#define otbReciprocalBarnesDecompFunctor_h
-#include "otbUnaryFunctorImageFilter.h"
#include "otbMath.h"
#include "vnl/algo/vnl_complex_eigensystem.h"
#include <algorithm>
@@ -97,11 +96,6 @@ public:
result[8] = static_cast<OutputValueType>(ki[2][0]);
}
- unsigned int GetOutputSize()
- {
- return m_NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the result
@@ -115,7 +109,6 @@ public:
virtual ~ReciprocalBarnesDecompFunctor() {}
private:
- itkStaticConstMacro(m_NumberOfComponentsPerPixel, unsigned int, 9);
const double m_Epsilon;
};
} // end namespace functor
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFunctor.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFunctor.h
index 8a146f43246526e314678e798bbf363886f3f91c..58fcdf379b32cb646568fbaf0a2b588c828190db 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFunctor.h
@@ -19,10 +19,9 @@
*/
-#ifndef otbReciprocalHAlphaImageFilter_h
-#define otbReciprocalHAlphaImageFilter_h
+#ifndef otbReciprocalHAlphaFunctor_h
+#define otbReciprocalHAlphaFunctor_h
-#include "otbUnaryFunctorImageFilter.h"
#include "otbMath.h"
#include "vnl/algo/vnl_complex_eigensystem.h"
#include <algorithm>
@@ -177,7 +176,6 @@ public:
virtual ~ReciprocalHAlphaFunctor() {}
private:
- itkStaticConstMacro(m_NumberOfComponentsPerPixel, unsigned int, 3);
static constexpr double m_Epsilon = 1e-6;
};
} // end namespace functor
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompFunctor.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompFunctor.h
index 4ab534e4512fca80f658983e2eb28df5200b7e3d..3d019b201ba244a23835e127f6f787b723cded9c 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalHuynenDecompFunctor.h
@@ -19,8 +19,8 @@
*/
-#ifndef otbReciprocalHuynenDecompImageFilter_h
-#define otbReciprocalHuynenDecompImageFilter_h
+#ifndef otbReciprocalHuynenDecompFunctor_h
+#define otbReciprocalHuynenDecompFunctor_h
namespace otb
{
@@ -64,11 +64,6 @@ public:
result[8] = H;
}
- unsigned int GetOutputSize()
- {
- return m_NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the result
@@ -82,7 +77,6 @@ public:
virtual ~ReciprocalHuynenDecompFunctor() {}
private:
- itkStaticConstMacro(m_NumberOfComponentsPerPixel, unsigned int, 9);
const double m_Epsilon;
};
} // end namespace functor
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompFunctor.h b/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompFunctor.h
index ce7019fb1729cf4c3be4a4a68bdbadc0eac6d88b..6162fca9a0ca11f90f6976c1ea60f3af354df381 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalPauliDecompFunctor.h
@@ -19,8 +19,8 @@
*/
-#ifndef otbReciprocalPauliDecompImageFilter_h
-#define otbReciprocalPauliDecompImageFilter_h
+#ifndef otbReciprocalPauliDecompFunctor_h
+#define otbReciprocalPauliDecompFunctor_h
namespace otb
{
@@ -55,11 +55,6 @@ public:
result[2] = sqrt2*Shv;
}
- unsigned int GetOutputSize()
- {
- return m_NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the result
@@ -67,14 +62,13 @@ public:
}
/** Constructor */
- ReciprocalPauliDecompFunctor() : m_Epsilon(1e-6) {}
+ ReciprocalPauliDecompFunctor() : {}
/** Destructor */
virtual ~ReciprocalPauliDecompFunctor() {}
private:
- itkStaticConstMacro(m_NumberOfComponentsPerPixel, unsigned int, 3);
- const double m_Epsilon;
+ static constexpr double m_Epsilon = 1e-6;
};
} // end namespace functor
} // end namespace otb
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
index 85e33689c068b14ebcd416eaae315ac00e73a5c7..7a517f9be0c2643e445acec4779d8d5a0022e25e 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
@@ -91,11 +91,6 @@ public:
funct(result, Sll, Slr, Srr);
}
- unsigned int GetNumberOfComponentsPerPixel()
- {
- return m_NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the matrix
@@ -103,16 +98,10 @@ public:
}
/** Constructor */
- SinclairToReciprocalCircularCovarianceMatrixFunctor() : m_NumberOfComponentsPerPixel(6) {}
+ SinclairToReciprocalCircularCovarianceMatrixFunctor() : {}
/** Destructor */
virtual ~SinclairToReciprocalCircularCovarianceMatrixFunctor() {}
-
-protected:
-
-
-private:
- unsigned int m_NumberOfComponentsPerPixel;
};
} // namespace Functor
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
index dd61ee5c4b4d8b92146a9e9fc8bbe17a3a702bc9..6aafde67d7df96d9ef07b52c7130bfbd9c22ece4 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
@@ -70,8 +70,6 @@ public:
typedef vnl_matrix<ComplexType> VNLMatrixType;
typedef typename TOutput::ValueType OutputValueType;
- itkStaticConstMacro(NumberOfComponentsPerPixel, unsigned int, 6);
-
inline void operator ()(TOutput & result, const TInput1& Shh, const TInput2& Shv, const TInput3& Svv)
{
const ComplexType S_hh = static_cast<ComplexType>(Shh);
@@ -95,11 +93,6 @@ public:
result[5] = static_cast<OutputValueType>( res[2][2] );
}
- unsigned int GetNumberOfComponentsPerPixel()
- {
- return NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the matrix
@@ -111,11 +104,6 @@ public:
/** Destructor */
virtual ~SinclairToReciprocalCoherencyMatrixFunctor() {}
-
-protected:
-
-private:
-
};
} // namespace Functor
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
index 2e7275a5f51a5fad3e0839fac2b3892889103e19..d78e5158a3c4548a1b1afccbb5177311c5cb5ab4 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
@@ -89,11 +89,6 @@ public:
result[5] = static_cast<OutputValueType>( res[2][2] );
}
- unsigned int GetNumberOfComponentsPerPixel()
- {
- return NumberOfComponentsPerPixel;
- }
-
constexpr size_t OutputSize(...) const
{
// Size of the matrix
@@ -105,14 +100,6 @@ public:
/** Destructor */
virtual ~SinclairToReciprocalCovarianceMatrixFunctor() {}
-
-protected:
-
-
-private:
- //itkStaticConstMacro(NumberOfComponentsPerPixel, unsigned int, 6);
- static const unsigned int NumberOfComponentsPerPixel = 6;
-
};
} // namespace Functor