diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h index 1830d906d7f4001d21354d72195899a864d3ba40..75f99727a411e05538e35f39ce2ab48e5a487c04 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 1b53ca27e8d7a476412c9a393fae3a93ebfc7ebb..42dd0ef38afef939c461fb3b3c192ced33237caa 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 66642ed3c541fa8e774e07826eb30d9aedc27dc0..8738151c7436f67cf5ec1585192adaa3aa7d6c1b 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 3ba868bad768e818ecb23010446e983e72f7709a..903c48f2e89c45f29bc5fa9d47b21df1b2b5f09c 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;