Skip to content
Snippets Groups Projects
Commit 783423e9 authored by Julien Michel's avatar Julien Michel
Browse files

BUG: Fixing order of inputs in ternary functor filter so that number of bands...

BUG: Fixing order of inputs in ternary functor filter so that number of bands from first input is correctly reported to output
parent 907ecfa9
Branches
Tags
No related merge requests found
...@@ -127,9 +127,10 @@ private: ...@@ -127,9 +127,10 @@ private:
{ {
public: public:
// Implement the fusion as a six arguments operator // Implement the fusion as a six arguments operator
typename TOutputImageType::PixelType operator()(const TInternalPrecision& smoothPanchroPixel, typename TOutputImageType::PixelType operator()(
const typename InternalVectorImageType::PixelType& stdXsPixel, const typename InternalVectorImageType::PixelType& stdXsPixel,
const typename TPanImageType::PixelType& sharpPanchroPixel) const const TInternalPrecision& smoothPanchroPixel,
const typename TPanImageType::PixelType& sharpPanchroPixel) const
{ {
// Build output pixel // Build output pixel
typename TOutputImageType::PixelType output(stdXsPixel.Size()); typename TOutputImageType::PixelType output(stdXsPixel.Size());
...@@ -178,9 +179,9 @@ private: ...@@ -178,9 +179,9 @@ private:
* Typedef of the TernaryFunctorImageFilter applying the fusion functor to * Typedef of the TernaryFunctorImageFilter applying the fusion functor to
* p, p_smooth, p_std, xs_smooth, xs_std and xs. * p, p_smooth, p_std, xs_smooth, xs_std and xs.
*/ */
typedef itk::TernaryFunctorImageFilter<InternalImageType, typedef itk::TernaryFunctorImageFilter<InternalVectorImageType,
InternalVectorImageType, InternalImageType,
TPanImageType, TPanImageType,
TOutputImageType, TOutputImageType,
FusionFunctor1> FusionStep1FilterType; FusionFunctor1> FusionStep1FilterType;
......
...@@ -153,8 +153,8 @@ LmvmPanSharpeningFusionImageFilter ...@@ -153,8 +153,8 @@ LmvmPanSharpeningFusionImageFilter
m_XsVectorNoiseFilter->SetFilter(m_XsNoiseFilter); m_XsVectorNoiseFilter->SetFilter(m_XsNoiseFilter);
m_FusionStep1Filter->SetInput2(m_XsVectorNoiseFilter->GetOutput()); m_FusionStep1Filter->SetInput1(m_XsVectorNoiseFilter->GetOutput());
m_FusionStep1Filter->SetInput1(m_PanConvolutionFilter->GetOutput()); m_FusionStep1Filter->SetInput2(m_PanConvolutionFilter->GetOutput());
m_FusionStep1Filter->SetInput3(this->GetPanInput()); m_FusionStep1Filter->SetInput3(this->GetPanInput());
m_FusionStep2Filter->SetInput1(m_FusionStep1Filter->GetOutput()); m_FusionStep2Filter->SetInput1(m_FusionStep1Filter->GetOutput());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment