From 99d6037bfbb84702e07ee656e454f496715ed1dd Mon Sep 17 00:00:00 2001
From: Sebastien Harasse <sebastien.harasse@c-s.fr>
Date: Mon, 21 May 2012 15:16:03 +0200
Subject: [PATCH] ENH: Mean shift: swapped spectral and spatial output order
---
.../BasicFilters/otbMeanShiftImageFilter2.txx | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter2.txx b/Code/BasicFilters/otbMeanShiftImageFilter2.txx
index 595e1934df..0b0071de8a 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter2.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter2.txx
@@ -41,8 +41,8 @@ MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputIteratio
m_ModeSearchOptimization = true;
this->SetNumberOfOutputs(4);
- this->SetNthOutput(0, OutputSpatialImageType::New());
- this->SetNthOutput(1, OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, OutputSpatialImageType::New());
this->SetNthOutput(2, OutputIterationImageType::New());
this->SetNthOutput(3, OutputLabelImageType::New());
}
@@ -60,11 +60,11 @@ const typename MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm,
MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputIterationImage>
::GetSpatialOutput() const
{
- if (this->GetNumberOfOutputs() < 1)
+ if (this->GetNumberOfOutputs() < 2)
{
return 0;
}
- return static_cast<const OutputSpatialImageType *>(this->itk::ProcessObject::GetOutput(0));
+ return static_cast<const OutputSpatialImageType *>(this->itk::ProcessObject::GetOutput(1));
}
template <class TInputImage, class TOutputImage, class TKernel, class TNorm, class TOutputIterationImage>
@@ -72,11 +72,11 @@ typename MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutpu
MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputIterationImage>
::GetSpatialOutput()
{
- if (this->GetNumberOfOutputs() < 1)
+ if (this->GetNumberOfOutputs() < 2)
{
return 0;
}
- return static_cast<OutputSpatialImageType *>(this->itk::ProcessObject::GetOutput(0));
+ return static_cast<OutputSpatialImageType *>(this->itk::ProcessObject::GetOutput(1));
}
@@ -85,11 +85,11 @@ const typename MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm,
MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputIterationImage>
::GetRangeOutput() const
{
- if (this->GetNumberOfOutputs() < 2)
+ if (this->GetNumberOfOutputs() < 1)
{
return 0;
}
- return static_cast<const OutputImageType *>(this->itk::ProcessObject::GetOutput(1));
+ return static_cast<const OutputImageType *>(this->itk::ProcessObject::GetOutput(0));
}
template <class TInputImage, class TOutputImage, class TKernel, class TNorm, class TOutputIterationImage>
@@ -97,11 +97,11 @@ typename MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutpu
MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputIterationImage>
::GetRangeOutput()
{
- if (this->GetNumberOfOutputs() < 2)
+ if (this->GetNumberOfOutputs() < 1)
{
return 0;
}
- return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(1));
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(0));
}
--
GitLab