From 2a1cd985c9b95c3dbeb7bdcb87ebdb1463fa6aeb Mon Sep 17 00:00:00 2001
From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Date: Fri, 17 Mar 2017 13:42:51 +0100
Subject: [PATCH] BUILD: Correct missing headers and remove ITK_OVERRIDE.
---
.../AppClassification/app/otbComputeConfusionMatrix.cxx | 2 +-
Modules/Learning/Unsupervised/include/otbContingencyTable.h | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
index c951104771..4da55086ea 100644
--- a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
@@ -376,7 +376,7 @@ private:
writeContingencyTable(contingencyTable);
}
- void DoExecuteConfusionMatrix(const StreamingInitializationData& sid) ITK_OVERRIDE
+ void DoExecuteConfusionMatrix(const StreamingInitializationData& sid)
{
// Extraction of the Class Labels from the Reference image/rasterized vector data + filling of m_Matrix
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTable.h b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
index fac85011fd..f41e33725b 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTable.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTable.h
@@ -24,6 +24,7 @@
#include <vector>
#include <iostream>
#include <iomanip>
+#include <itkVariableSizeMatrix.h>
namespace otb
{
@@ -34,6 +35,8 @@ public:
typedef itk::VariableSizeMatrix<unsigned long> MatrixType;
typedef std::vector<TClassLabel> LabelList;
+ MatrixType matrix;
+
ContingencyTable(LabelList referenceLabels, LabelList producedLabels) : refLabels( referenceLabels ),
prodLabels( producedLabels )
{
@@ -43,8 +46,6 @@ public:
matrix.Fill( 0 );
}
- MatrixType matrix;
-
friend std::ostream &operator<<(std::ostream &o, const ContingencyTable<TClassLabel> &contingencyTable)
{
--
GitLab