From cbaa9829feaad6221e61e0f3b8bd3f97e255945b Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Tue, 18 Dec 2018 13:25:28 +0000
Subject: [PATCH] REFAC: Replace use of TernaryFunctorImageFilter by use of
FunctorImageFilter
---
Modules/Core/ComplexImage/otb-module.cmake | 1 +
.../test/otbAmplitudePhaseToRGBFunctor.cxx | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Modules/Core/ComplexImage/otb-module.cmake b/Modules/Core/ComplexImage/otb-module.cmake
index e80b019562..6b31ea5c69 100644
--- a/Modules/Core/ComplexImage/otb-module.cmake
+++ b/Modules/Core/ComplexImage/otb-module.cmake
@@ -27,6 +27,7 @@ otb_module(OTBComplexImage
TEST_DEPENDS
OTBITK
+ OTBFunctor
OTBImageBase
OTBImageIO
OTBTestKernel
diff --git a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
index 4861e5ec16..ddfe7bf1e7 100644
--- a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
+++ b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
@@ -24,9 +24,8 @@
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-#include "itkUnaryFunctorImageFilter.h"
-#include "itkTernaryFunctorImageFilter.h"
#include "otbAmplitudePhaseToRGBFunctor.h"
+#include "otbFunctorImageFilter.h"
#include "itkComplexToModulusImageFilter.h"
#include "itkComplexToPhaseImageFilter.h"
#include "itkShiftScaleImageFilter.h"
@@ -65,11 +64,10 @@ int otbAmplitudePhaseToRGBFunctor(int itkNotUsed(argc), char * argv[])
typedef otb::Functor::AmplitudePhaseToRGBFunctor
<PixelType, PixelType, PixelType, RGBPixelType> ColorMapFunctorType;
- typedef itk::TernaryFunctorImageFilter
- <ImageType, ImageType, ImageType, RGBImageType, ColorMapFunctorType> ColorMapFilterType;
+ typedef otb::FunctorImageFilter<ColorMapFunctorType> ColorMapFilterType;
ColorMapFilterType::Pointer colormapper = ColorMapFilterType::New();
- colormapper->GetFunctor().SetMaximum(4000);
- colormapper->GetFunctor().SetMinimum(0);
+ colormapper->GetModifiableFunctor().SetMaximum(4000);
+ colormapper->GetModifiableFunctor().SetMinimum(0);
colormapper->SetInput1(modulusFilter->GetOutput());
colormapper->SetInput2(constFilter->GetOutput());
--
GitLab