From ca84f7cb876f4b93c7040d92fbba5b752e5db40b Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Mon, 12 Mar 2012 17:50:51 +0100
Subject: [PATCH] COMP: Error in complex merge
---
.../otbPixelWiseBlockMatchingImageFilter.h | 30 -------------------
1 file changed, 30 deletions(-)
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
index 68eded701a..4fc9c9d115 100644
--- a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
@@ -275,30 +275,6 @@ public:
return m_Functor;
}
- /** Get the functor for parameters setting */
- BlockMatchingFunctorType & GetFunctor()
- {
- return m_Functor;
- }
-
- /** Get the functor (const version) */
- const BlockMatchingFunctorType & GetFunctor() const
- {
- return m_Functor;
- }
-
- /** Get the functor for parameters setting */
- BlockMatchingFunctorType & GetFunctor()
- {
- return m_Functor;
- }
-
- /** Get the functor (const version) */
- const BlockMatchingFunctorType & GetFunctor() const
- {
- return m_Functor;
- }
-
/** Set initial horizontal disparity field (optional, override m_InitHorizontalDisparity) */
void SetHorizontalDisparityInput( const TOutputDisparityImage * hfield);
@@ -350,12 +326,6 @@ private:
/** The exploration radius for disparities (used if non null) */
SizeType m_ExplorationRadius;
- /** Block-matching functor */
- BlockMatchingFunctorType m_Functor;
-
- /** Block-matching functor */
- BlockMatchingFunctorType m_Functor;
-
/** Block-matching functor */
BlockMatchingFunctorType m_Functor;
--
GitLab