From 3ed59ca602d52de50a31a3c3d6aae2523a75024d Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Tue, 11 Dec 2007 17:13:04 +0000
Subject: [PATCH] correction
---
...bSimpleRcsPanSharpeningFusionImageFilter.h | 2 +-
...impleRcsPanSharpeningFusionImageFilter.txx | 21 ++++++++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 7e004da77a..b98b24f757 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -83,7 +83,7 @@ class ITK_EXPORT SimpleRcsPanSharpeningFusionImageFilter :
typedef itk::MeanImageFilter
<TPanImageType, InternalImageType> MeanFilterType;
typedef itk::DivideImageFilter
- <InternalVectorImageType,InternalImageType,
+ <TXsImageType,InternalImageType,
InternalVectorImageType> DivideFilterType;
typedef itk::MultiplyImageFilter
<InternalVectorImageType,TPanImageType,TOutputImageType> MultiplyFilterType;
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
index 71a91519aa..394f1ae42e 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
@@ -27,7 +27,8 @@
namespace otb
{
template <class TPanImageType, class TXsImageType, class TOutputImageType>
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::SimpleRcsPanSharpeningFusionImageFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -46,7 +47,8 @@ namespace otb
template <class TPanImageType, class TXsImageType, class TOutputImageType>
void
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::SetPanInput(const TPanImageType *image)
{
// We have 2 inputs: an image and a vector image
@@ -59,7 +61,8 @@ namespace otb
template <class TPanImageType, class TXsImageType, class TOutputImageType>
const TPanImageType *
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::GetPanInput(void)
{
if (this->GetNumberOfInputs() < 2)
@@ -73,7 +76,8 @@ namespace otb
template <class TPanImageType, class TXsImageType, class TOutputImageType>
void
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::SetXsInput(const TXsImageType *image)
{
// We have 2 inputs: an image and a vector image
@@ -86,7 +90,8 @@ namespace otb
template <class TPanImageType, class TXsImageType, class TOutputImageType>
const TXsImageType *
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::GetXsInput(void)
{
if (this->GetNumberOfInputs() < 1)
@@ -101,7 +106,8 @@ namespace otb
template <class TPanImageType,class TXsImageType,class TOutputImageType>
void
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::GenerateData()
{
m_MeanFilter->SetInput( this->GetPanInput() );
@@ -116,7 +122,8 @@ namespace otb
template <class TPanImageType,class TXsImageType,class TOutputImageType>
void
- SimpleRcsPanSharpeningFusionImageFilter<TPanImageType, TXsImageType, TOutputImageType>
+ SimpleRcsPanSharpeningFusionImageFilter
+ <TPanImageType, TXsImageType, TOutputImageType>
::PrintSelf( std::ostream& os, itk::Indent indent ) const
{
Superclass::PrintSelf(os,indent);
--
GitLab