From 42a55848863243fabfcb9c0501235d6deff190d8 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Tue, 8 Jan 2019 14:17:39 +0000
Subject: [PATCH] COMP: Missing patches for MorphologicalProfiles module
refactoring using FunctorImageFilter
---
.../app/otbMorphologicalProfilesAnalysis.cxx | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx b/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
index a7bc15c56b..ceb6033014 100644
--- a/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
+++ b/Modules/Applications/AppMorphology/app/otbMorphologicalProfilesAnalysis.cxx
@@ -269,12 +269,13 @@ private:
}
classificationFilter = MultiScaleClassificationFilterType::New();
- classificationFilter->SetOpeningProfileDerivativeMaxima( omsCharFilter->GetOutput() );
- classificationFilter->SetOpeningProfileCharacteristics( omsCharFilter->GetOutputCharacteristics() );
- classificationFilter->SetClosingProfileDerivativeMaxima( cmsCharFilter->GetOutput() );
- classificationFilter->SetClosingProfileCharacteristics( cmsCharFilter->GetOutputCharacteristics() );
- classificationFilter->SetSigma( sigma );
- classificationFilter->SetLabelSeparator( static_cast<unsigned short>(initValue + profileSize * step) );
+ using namespace Functor::MultiScaleConvexOrConcaveDecisionRule_tags;
+ classificationFilter->SetVariadicNamedInput<max_opening_profile_derivative>( omsCharFilter->GetOutput() );
+ classificationFilter->SetVariadicNamedInput<opening_profile_characteristics>( omsCharFilter->GetOutputCharacteristics() );
+ classificationFilter->SetVariadicNamedInput<max_closing_profile_derivative>( cmsCharFilter->GetOutput() );
+ classificationFilter->SetVariadicNamedInput<opening_profile_characteristics>( cmsCharFilter->GetOutputCharacteristics() );
+ classificationFilter->GetModifiableFunctor().SetSigma( sigma );
+ classificationFilter->GetModifiableFunctor().SetLabelSeparator( static_cast<unsigned short>(initValue + profileSize * step) );
AddProcess(classificationFilter, "Classification");
classificationFilter->Update();
SetParameterOutputImage( "out", classificationFilter->GetOutput() );
--
GitLab