From bc097cc73bc1c9c8a22948decad3b3f528b97dfe Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 23 Sep 2010 10:47:17 +0200
Subject: [PATCH] BUG: fix bugs found thanks to compilation of wrappings
---
Code/BasicFilters/otbStreamingMinMaxImageFilter.h | 8 ++++++--
Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h | 4 ++--
Code/BasicFilters/otbStreamingStatisticsImageFilter.h | 4 ++++
.../otbStreamingStatisticsVectorImageFilter.h | 4 ++--
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxImageFilter.h
index 4cbe75c264..60120be192 100644
--- a/Code/BasicFilters/otbStreamingMinMaxImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMinMaxImageFilter.h
@@ -195,6 +195,10 @@ public:
{
this->GetFilter()->SetInput(input);
}
+ const InputImageType * GetInput()
+ {
+ return this->GetFilter()->GetInput();
+ }
/** Return the computed Minimum. */
PixelType GetMinimum() const
@@ -203,11 +207,11 @@ public:
}
PixelObjectType* GetMinimumOutput()
{
- return this->GetFilter()->MinimumOutput();
+ return this->GetFilter()->GetMinimumOutput();
}
const PixelObjectType* GetMinimumOutput() const
{
- return this->GetFilter()->MinimumOutput();
+ return this->GetFilter()->GetMinimumOutput();
}
/** Return the computed Maximum. */
PixelType GetMaximum() const
diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
index f684babd32..998a487093 100644
--- a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
@@ -195,11 +195,11 @@ public:
typedef typename StatFilterType::PixelObjectType PixelObjectType;
typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
- void SetInput(TInputImage * input)
+ void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
}
- TInputImage * GetInput()
+ const InputImageType * GetInput()
{
return this->GetFilter()->GetInput();
}
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
index 00b615460f..3c5dc61846 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
@@ -230,6 +230,10 @@ public:
{
this->GetFilter()->SetInput(input);
}
+ const InputImageType * GetInput()
+ {
+ return this->GetFilter()->GetInput();
+ }
/** Return the computed Minimum. */
PixelType GetMinimum() const
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
index db5e25eeaf..55bd5c87b0 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
@@ -223,11 +223,11 @@ public:
typedef typename StatFilterType::PixelObjectType PixelObjectType;
typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
- void SetInput(TInputImage * input)
+ void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
}
- TInputImage * GetInput()
+ const InputImageType * GetInput()
{
return this->GetFilter()->GetInput();
}
--
GitLab