Merge branch 'refactor_compleximage_using_FunctorImageFilter' into 'develop'

Replace use of TernaryFunctorImageFilter by use of FunctorImageFilter in ComplexImage

See merge request !326

Modules/Core/ComplexImage/otb-module.cmake

@@ -27,6 +27,7 @@ otb_module(OTBComplexImage
 
   TEST_DEPENDS
     OTBITK
+    OTBFunctor
     OTBImageBase
     OTBImageIO
     OTBTestKernel

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());