From 3691409acf494c420c45566e7ee10c0f6909fe03 Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Tue, 5 Aug 2008 15:37:03 +0000
Subject: [PATCH] Correction Warning et ajout test
ContinuousMiminimmaximumImageCalculator
---
.../otbContinuousMinimumMaximumImageCalculator.h | 1 +
.../otbContinuousMinimumMaximumImageCalculator.txx | 8 ++++----
Testing/Code/BasicFilters/CMakeLists.txt | 12 +++++-------
...tbContinuousMinimumMaximumImageCalculatorTest.cxx | 4 +++-
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
index 1830d906d7..75f99727a4 100644
--- a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
@@ -20,6 +20,7 @@
#include "itkObject.h"
#include "itkObjectFactory.h"
+#include "itkNumericTraits.h"
namespace otb
{
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
index 1b53ca27e8..42dd0ef38a 100644
--- a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
+++ b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
@@ -161,9 +161,9 @@ namespace otb
while( !it.IsAtEnd() )
{
const RealPixelType value = it.Get();
- if (value < m_Minimum)
+ if (value < static_cast<RealPixelType>(m_Minimum))
{
- m_Minimum = value;
+ m_Minimum = static_cast<PixelType>(value);
m_IndexOfMinimum = it.GetIndex();
}
++it;
@@ -223,9 +223,9 @@ namespace otb
while( !it.IsAtEnd() )
{
const RealPixelType value = it.Get();
- if (value > m_Maximum)
+ if (value > static_cast<RealPixelType>(m_Maximum) )
{
- m_Maximum = value;
+ m_Maximum = static_cast<PixelType>(value);
m_IndexOfMaximum = it.GetIndex();
}
++it;
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index 66642ed3c5..8738151c74 100755
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -852,24 +852,22 @@ ADD_TEST(bfTvEuclideanDistanceWithMissingValue ${BASICFILTERS_TESTS8}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests9 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ADD_TEST(bfTuChangeLabelImageFilterNew ${BASICFILTERS_TESTS9}
+ADD_TEST(bfTuChangeLabelImageFilterNew ${BASICFILTERS_TESTS9}
otbChangeLabelImageFilterNew
)
- ADD_TEST(bfTuChangeLabelImageFilter ${BASICFILTERS_TESTS9}
+ADD_TEST(bfTuChangeLabelImageFilter ${BASICFILTERS_TESTS9}
otbChangeLabelImageFilterTest
)
- ADD_TEST(bfTuContinuousMinimumMaximumImageCalculatorNew ${BASICFILTERS_TESTS9}
+ADD_TEST(bfTuContinuousMinimumMaximumImageCalculatorNew ${BASICFILTERS_TESTS9}
otbContinuousMinimumMaximumImageCalculatorNew
)
- ADD_TEST(bfTvContinuousMinimumMaximumImageCalculator ${BASICFILTERS_TESTS9}
+ADD_TEST(bfTvContinuousMinimumMaximumImageCalculatorTest ${BASICFILTERS_TESTS9}
otbContinuousMinimumMaximumImageCalculatorTest
- ${INPUTDATA}/QB_Suburb.png
-
-)
+ ${INPUTDATA}/QB_Suburb.png )
# A enrichir
SET(BasicFilters_SRCS1
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
index 3ba868bad7..903c48f2e8 100644
--- a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
@@ -40,7 +40,9 @@ int otbContinuousMinimumMaximumImageCalculatorTest( int argc, char * argv[])
ContinuousMinimumMaximumImageCalculatorType::Pointer continuous = ContinuousMinimumMaximumImageCalculatorType::New();
continuous->SetImage(reader->GetOutput());
//Compute values
-// continuous->ComputeMinimum();
+ continuous->ComputeMinimum();
+ continuous->ComputeMaximum();
+ continuous->Compute();
// PB Timeout. Test provisoirement en FAILURE
// std::cout << continuous->GetMinimum() <<std::endl;
--
GitLab