Commit a0f2bdc1 authored by Julien Michel's avatar Julien Michel
Browse files

Merge branch 'release-5.4' into develop

No related merge requests found
Showing with 11 additions and 2 deletions
+11 -2
...@@ -247,6 +247,10 @@ private: ...@@ -247,6 +247,10 @@ private:
m_GridResampler->SetOutputSize(recomputedSize); m_GridResampler->SetOutputSize(recomputedSize);
otbAppLogINFO( << "Output image size : " << recomputedSize ); otbAppLogINFO( << "Output image size : " << recomputedSize );
// Output Image
SetParameterOutputImage("out", m_GridResampler->GetOutput());
} }
break; break;
...@@ -290,6 +294,8 @@ private: ...@@ -290,6 +294,8 @@ private:
otbAppLogINFO( << "Output image size : " << recomputedSize ); otbAppLogINFO( << "Output image size : " << recomputedSize );
m_Resampler->SetTransform(transform); m_Resampler->SetTransform(transform);
// Output Image
SetParameterOutputImage("out", m_Resampler->GetOutput());
} }
break; break;
...@@ -420,6 +426,9 @@ private: ...@@ -420,6 +426,9 @@ private:
recomputedSize[1] = static_cast<unsigned int>(vcl_floor(vcl_abs(size[1]/OutputSpacing[1]))); recomputedSize[1] = static_cast<unsigned int>(vcl_floor(vcl_abs(size[1]/OutputSpacing[1])));
m_Resampler->SetOutputSize( recomputedSize ); m_Resampler->SetOutputSize( recomputedSize );
otbAppLogINFO( << "Output image size : " << recomputedSize ); otbAppLogINFO( << "Output image size : " << recomputedSize );
// Output Image
SetParameterOutputImage("out", m_Resampler->GetOutput());
} }
break; break;
} }
...@@ -427,10 +436,10 @@ private: ...@@ -427,10 +436,10 @@ private:
FloatVectorImageType::PixelType defaultValue; FloatVectorImageType::PixelType defaultValue;
itk::NumericTraits<FloatVectorImageType::PixelType>::SetLength(defaultValue, inputImage->GetNumberOfComponentsPerPixel()); itk::NumericTraits<FloatVectorImageType::PixelType>::SetLength(defaultValue, inputImage->GetNumberOfComponentsPerPixel());
m_Resampler->SetEdgePaddingValue(defaultValue); m_Resampler->SetEdgePaddingValue(defaultValue);
m_GridResampler->SetEdgePaddingValue(defaultValue);
m_Resampler->UpdateOutputInformation(); m_Resampler->UpdateOutputInformation();
// Output Image m_GridResampler->UpdateOutputInformation();
SetParameterOutputImage("out", m_Resampler->GetOutput());
} }
ResampleFilterType::Pointer m_Resampler; ResampleFilterType::Pointer m_Resampler;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment