From 43664267671341061c125c59d91cf1780b9da0cc Mon Sep 17 00:00:00 2001
From: Aurelien Bricier <aurelien.bricier@c-s.fr>
Date: Fri, 6 May 2011 15:00:29 +0200
Subject: [PATCH] ENH: corrected template parameters in
VectorDataToRoadDescriptionFilter
---
.../otbVectorDataToRoadDescriptionFilter.h | 2 +-
.../otbVectorDataToRoadDescriptionFilter.txx | 22 +++++++++----------
.../otbVectorDataToRoadDescriptionFilter.cxx | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
index a286c89b64..1805e69d1d 100644
--- a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
+++ b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
@@ -45,7 +45,7 @@ namespace otb
* \sa VectorDataToBuildingDescriptionFilter
*/
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
+template <class TVectorData, class TOpticalImage>
class ITK_EXPORT VectorDataToRoadDescriptionFilter :
public otb::VectorDataToSpecificDescriptionFilterBase<TVectorData>
{
diff --git a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx
index 6f0010e72d..303c723e8b 100644
--- a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx
+++ b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx
@@ -24,8 +24,8 @@ namespace otb
{
// Constructor
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
-VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+template <class TVectorData, class TOpticalImage>
+VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::VectorDataToRoadDescriptionFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -33,27 +33,27 @@ VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
m_SpectralAngleFeatureFunction = SpectralAngleFeatureFunctionType::New();
}
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
+template <class TVectorData, class TOpticalImage>
void
-VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::AddOpticalImage(const OpticalImageType * support)
{
this->AddSupport(const_cast<OpticalImageType *>(support), 0);
}
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
-const typename VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+template <class TVectorData, class TOpticalImage>
+const typename VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::OpticalImageType *
-VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::GetOpticalImage()
{
return static_cast<const OpticalImageType *>
(this->GetSupport(0));
}
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
+template <class TVectorData, class TOpticalImage>
void
-VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::GenerateData()
{
m_NDVIFeatureFunction->SetInputImage(const_cast<OpticalImageType *>(this->GetOpticalImage()));
@@ -92,9 +92,9 @@ VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
}
// PrintSelf Method
-template <class TVectorData, class TOpticalImage, class TNDVIImage>
+template <class TVectorData, class TOpticalImage>
void
-VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage, TNDVIImage>
+VectorDataToRoadDescriptionFilter<TVectorData, TOpticalImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
index 99cb06e508..09bc88f432 100644
--- a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
+++ b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
@@ -42,7 +42,7 @@ int otbVectorDataToRoadDescriptionFilterNew(int argc, char* argv[])
typedef otb::VectorData<PrecisionType> VectorDataType;
typedef otb::VectorImage<PrecisionType> ImageType;
- typedef otb::VectorDataToRoadDescriptionFilter<VectorDataType, ImageType, ImageType>
+ typedef otb::VectorDataToRoadDescriptionFilter<VectorDataType, ImageType>
VectorDataToRoadDescriptionFilterType;
VectorDataToRoadDescriptionFilterType::Pointer filter =
@@ -65,7 +65,7 @@ int otbVectorDataToRoadDescriptionFilter(int argc, char* argv[])
typedef otb::VectorData<PrecisionType, 2> VectorDataType;
typedef otb::VectorImage<PrecisionType> ImageType;
- typedef otb::VectorDataToRoadDescriptionFilter<VectorDataType, ImageType, ImageType>
+ typedef otb::VectorDataToRoadDescriptionFilter<VectorDataType, ImageType>
VectorDataToRoadDescriptionFilterType;
typedef otb::ImageFileReader<ImageType> ImageReaderType;
--
GitLab