From 7128d2e5c1b6eb97eca27308401e1203c3cf1b0d Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 19 Feb 2015 23:24:29 +0100
Subject: [PATCH] COMP: fix a bunch of overloaded-virtual warning
---
.../GdalAdapters/include/otbGeometriesToGeometriesFilter.h | 1 +
Modules/Core/Common/include/otbFunctionToImageFilter.h | 3 ---
.../Common/include/otbImageAndVectorImageOperationFilter.h | 1 +
Modules/Core/ObjectList/include/otbImageListToImageFilter.h | 1 +
.../Core/ObjectList/include/otbImageListToImageListFilter.h | 1 +
.../Core/ObjectList/include/otbObjectListToObjectListFilter.h | 1 +
Modules/Core/PointSet/include/otbImageToPointSetFilter.h | 1 +
Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h | 1 +
Modules/Core/SpatialObjects/include/otbFillGapsFilter.h | 1 +
.../include/otbImageToLineSpatialObjectListFilter.h | 1 +
.../include/otbLineSpatialObjectListToPointSetFilter.h | 1 +
.../include/otbSpatialObjectToImageDrawingFilter.h | 1 +
Modules/Core/Transform/include/otbTransform.h | 4 ++++
.../include/otbModulusAndDirectionImageToImageFilter.h | 1 +
Modules/Feature/Edge/include/otbLineSegmentDetector.h | 1 +
.../Moments/include/otbImageToLabelMapWithAttributesFilter.h | 1 +
.../ImageManipulation/include/otbImageToImageListFilter.h | 1 +
.../include/otbStreamingInnerProductVectorImageFilter.h | 1 +
.../ImageManipulation/include/otbStreamingShrinkImageFilter.h | 1 +
.../include/otbMorphologicalPyramidMRToMSConverter.h | 1 +
Modules/Filtering/Path/include/otbImageToPathFilter.h | 1 +
Modules/Filtering/Path/include/otbImageToPathListFilter.h | 1 +
.../Filtering/Path/include/otbPathListToHistogramGenerator.h | 1 +
.../Filtering/Path/include/otbVectorizationPathListFilter.h | 1 +
.../Projection/include/otbImageToEnvelopeVectorDataFilter.h | 1 +
Modules/Filtering/Statistics/include/otbListSampleGenerator.h | 1 +
.../Statistics/include/otbListSampleToListSampleFilter.h | 1 +
.../include/otbStreamingHistogramVectorImageFilter.h | 1 +
.../Statistics/include/otbStreamingMinMaxImageFilter.h | 1 +
.../Statistics/include/otbStreamingMinMaxVectorImageFilter.h | 1 +
.../Statistics/include/otbStreamingStatisticsImageFilter.h | 1 +
.../include/otbStreamingStatisticsMapFromLabelImageFilter.h | 1 +
.../include/otbStreamingStatisticsVectorImageFilter.h | 1 +
.../Statistics/include/otbVectorImageToMatrixImageFilter.h | 1 +
.../include/otbGISTableToGISTableFilter.h | 1 +
.../include/otbVectorDataToRandomLineGenerator.h | 1 +
.../include/otbVectorDataToVectorDataFilter.h | 1 +
.../VectorDataRendering/include/otbVectorDataToImageFilter.h | 1 +
.../VectorDataRendering/include/otbVectorDataToMapFilter.h | 1 +
Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h | 1 +
Modules/IO/Carto/include/otbMapFileProductWriter.h | 1 +
Modules/IO/ImageIO/include/otbImageFileWriter.h | 1 +
Modules/IO/KMZWriter/include/otbKmzProductWriter.h | 1 +
Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h | 1 +
Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h | 1 +
Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h | 1 +
Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h | 2 ++
.../Conversion/include/otbGISTableToLabelMapFilter.h | 1 +
.../Conversion/include/otbGISTableToVectorDataFilter.h | 1 +
.../Conversion/include/otbLabelImageToOGRDataSourceFilter.h | 1 +
.../Conversion/include/otbLabelImageToVectorDataFilter.h | 1 +
.../Conversion/include/otbLabelMapToGISTableFilter.h | 1 +
.../Conversion/include/otbLabelMapToVectorDataFilter.h | 1 +
.../Conversion/include/otbVectorDataToGISTableFilter.h | 1 +
.../Conversion/include/otbVectorDataToLabelMapFilter.h | 1 +
.../include/otbVectorDataToLabelMapWithAttributesFilter.h | 1 +
.../include/otbConvexOrConcaveClassificationFilter.h | 1 +
.../include/otbGeodesicMorphologyLevelingFilter.h | 1 +
.../OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h | 1 +
.../include/otbStreamingImageToOGRLayerSegmentationFilter.h | 1 +
60 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index 2b36e9c32e..3e61efceec 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -73,6 +73,7 @@ public:
/**\name Single input GeometriesSet property */
//@{
+ using Superclass::SetInput;
virtual void SetInput(const InputGeometriesType *input);
const InputGeometriesType * GetInput(void);
//@}
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index 9edb416f67..b01099fc25 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -83,9 +83,6 @@ public:
typedef typename FunctionType::OutputType FunctionValueType;
typedef typename FunctionType::InputType FunctionPositionType;
- /** Connect one of the operands for pixel-wise addition. */
- //void SetInput( const TInputImage *image);
-
/** Set the internal spatial function. */
void SetFunction(FunctionType* PixelFunction)
{
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index f0f192dc0a..8689065323 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -159,6 +159,7 @@ public:
typedef typename FunctorType::OperatorType OperatorType;
/** Set the input images of this process object. */
+ using Superclass::SetInput;
void SetInput(const InputImageType *input);
void SetVectorInput(const VectorInputImageType *input);
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index 84b836d8bd..a43ee7437a 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -64,6 +64,7 @@ public:
/** InputImage dimension constant */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageListType * image);
InputImageListType * GetInput(void);
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index 7db9fc83f3..54d940b4f1 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -62,6 +62,7 @@ public:
/** InputImage dimension constant */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageListType * imageList);
virtual InputImageListType * GetInput(void);
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index 9ed6cb632e..5956404d7d 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -66,6 +66,7 @@ public:
typedef itk::DataObject::Pointer DataObjectPointer;
+ using Superclass::SetInput;
virtual void SetInput(const InputListType *input);
const InputListType * GetInput(void);
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index e4650e8a3c..bbea940233 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -65,6 +65,7 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/** Set the input image of this process object. */
+ using Superclass::SetInput;
void SetInput(unsigned int idx, const InputImageType *input);
void SetInput(const InputImageType *input);
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index 3564772755..de123b11c9 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -60,6 +60,7 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/** Set the input image of this process object. */
+ using Superclass::SetInput;
void SetInput(unsigned int idx, const InputPointSetType *input);
void SetInput(const InputPointSetType *input);
diff --git a/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h b/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
index 98e23e6cb5..64c6641cf2 100644
--- a/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
@@ -54,6 +54,7 @@ public:
typedef itk::ProcessObject ProcessObjectType;
+ using Superclass::SetInput;
void SetInput(const LineSpatialObjectListType * input);
const LineSpatialObjectListType * GetInput();
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index 714ae00355..7afb602e6d 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -71,6 +71,7 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/** Set/Get the input image */
+ using Superclass::SetInput;
void SetInput(const InputImageType *image);
const InputImageType * GetInput(void);
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index 333ea8bdc1..2459d77b31 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -60,6 +60,7 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/** Set/Get the input image */
+ using Superclass::SetInput;
virtual void SetInput(const LinesListType *list);
virtual const LinesListType* GetInput(void);
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index 190e02d48a..8287affd5b 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -73,6 +73,7 @@ public:
TOutputImage::ImageDimension);
/** Set/Get the image input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputSpatialObjectType *object);
virtual void SetInput(unsigned int, const InputSpatialObjectType * object);
const InputSpatialObjectType * GetInput(void);
diff --git a/Modules/Core/Transform/include/otbTransform.h b/Modules/Core/Transform/include/otbTransform.h
index 688179fe46..d8aab6be47 100644
--- a/Modules/Core/Transform/include/otbTransform.h
+++ b/Modules/Core/Transform/include/otbTransform.h
@@ -97,6 +97,8 @@ public:
virtual OutputPointType TransformPoint(const InputPointType & ) const
{ return OutputPointType(); }
+ using Superclass::TransformVector;
+
/** Method to transform a vector. */
virtual OutputVectorType TransformVector(const InputVectorType &) const
{ return OutputVectorType(); }
@@ -105,6 +107,8 @@ public:
virtual OutputVnlVectorType TransformVector(const InputVnlVectorType &) const
{ return OutputVnlVectorType(); }
+ using Superclass::TransformCovariantVector;
+
/** Method to transform a CovariantVector. */
virtual OutputCovariantVectorType TransformCovariantVector(
const InputCovariantVectorType &) const
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index c5b9917dab..532bf5559d 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -66,6 +66,7 @@ public:
typedef typename Superclass::OutputImageType OutputImageType;
/** Set/Get the image input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
virtual void SetInputDirection(const InputImageDirectionType *direction);
const InputImageType * GetInput(void);
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index a6151f6785..3e4b2822b3 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -169,6 +169,7 @@ public:
typedef typename RectangleListType::iterator RectangleListTypeIterator;
/** Set/Get the input image of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
virtual const InputImageType * GetInput(void);
diff --git a/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
index 79f02b79aa..92d31c8a5e 100644
--- a/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
@@ -71,6 +71,7 @@ public:
typedef ShapeAttributesLabelMapFilter<LabelMapType> ShapeLabelMapFilterType;
typedef BandsStatisticsAttributesLabelMapFilter<LabelMapType, InputImageType> BandStatisticsLabelMapFilterType;
+ using Superclass::SetInput;
virtual void SetInput( const InputImageType *image);
virtual void SetLabeledImage( const LabeledImageType * image);
const InputImageType * GetInput(void);
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
index 246ea4e5e1..c41e8af04b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
@@ -60,6 +60,7 @@ public:
/** InputImage dimension constant */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType * image);
InputImageType * GetInput(void);
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index 64ac35e8cf..0e3cade57a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -180,6 +180,7 @@ public:
/** Type of DataObjects used for scalar outputs */
typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
+ using Superclass::SetInput;
void SetInput(TInputImage * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index c985e4447f..a31571fed7 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -281,6 +281,7 @@ public:
typedef StreamingShrinkStreamingManager<InputImageType> StreamingShrinkStreamingManagerType;
typedef typename StreamingShrinkStreamingManagerType::Pointer StreamingShrinkStreamingManagerPointerType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 369d46cd04..3c8bb76d2d 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -67,6 +67,7 @@ public:
* Set The input list.
* \param imageList The analysed image at each level of the pyramid.
*/
+ using Superclass::SetInput;
void SetInput(InputImageListType * imageList);
/**
* Set The SupFilter details
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index cb8f74a17f..436856831a 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -52,6 +52,7 @@ public:
/// Input image dimension
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/// Input image Setters and getters
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType * Image);
const InputImageType * GetInput(void);
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index 9c26ba8358..535362cd81 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -67,6 +67,7 @@ public:
TInputImage::ImageDimension);
/** Set/Get the image input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType * image);
const InputImageType * GetInput(void);
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index 366c866d80..0118e8cb84 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -95,6 +95,7 @@ public:
public:
/** Connects the input PathList for which the histogram is going to be computed */
+ using Superclass::SetInput;
void SetInput(const PathListType* path);
const PathListType* GetInput() const;
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 0bab24269f..9d22d95841 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -74,6 +74,7 @@ public:
typedef typename Superclass::OutputPathListPointerType OutputPathListPointerType;
/** Set/get the input modulus */
+ using Superclass::SetInput;
void SetInput(InputModulusType * inputModulus);
const InputModulusType * GetInput(void);
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index bc3e7649db..512922dbb3 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -72,6 +72,7 @@ public:
typedef typename OutputDataNodeType::PolygonType PolygonType;
/** Set input image */
+ using Superclass::SetInput;
void SetInput(const InputImageType *input);
/** Get input image */
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index 95906d2d56..3d64bd8328 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -82,6 +82,7 @@ public:
typedef typename ListLabelType::Pointer ListLabelPointerType;
/** Connects the input image for which the sample list is going to be extracted */
+ using Superclass::SetInput;
void SetInput(const ImageType *);
const ImageType * GetInput() const;
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index 985be709d6..3e21f1939b 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -72,6 +72,7 @@ public:
//typedef typename Superclass::OutputSampleListObjectType OutputSampleListObjectType;
/** Method to set/get the input list sample */
+ using Superclass::SetInput;
void SetInput( const InputSampleListType * inputPtr );
//void SetInput( const InputSampleListObjectType * inputPtr );
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index 727d97e41e..22c319bbc7 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -247,6 +247,7 @@ public:
typedef typename InternalFilterType::HistogramType HistogramType;
typedef typename InternalFilterType::HistogramListType HistogramListType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index 5c8826008e..c43ea5b66d 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -210,6 +210,7 @@ public:
typedef typename StatFilterType::IndexObjectType IndexObjectType;
typedef TInputImage InputImageType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index 37dab623ae..72b2b0d608 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -226,6 +226,7 @@ public:
typedef typename StatFilterType::PixelObjectType PixelObjectType;
typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index d1540a62ef..f21a668085 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -250,6 +250,7 @@ public:
typedef itk::SimpleDataObjectDecorator<RealType> RealObjectType;
typedef itk::SimpleDataObjectDecorator<PixelType> PixelObjectType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index b29faf1f82..cb982de396 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -215,6 +215,7 @@ public:
typedef typename Superclass::FilterType::LabelPopulationMapType LabelPopulationMapType;
/** Set input multispectral image */
+ using Superclass::SetInput;
void SetInput(const VectorImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index 739c19e553..a0b711d650 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -301,6 +301,7 @@ public:
typedef typename StatFilterType::InternalPixelType InternalPixelType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index 07d90ba700..11de2dabb0 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -166,6 +166,7 @@ public:
typedef typename PersistentFilterType::MatrixType MatrixType;
typedef typename PersistentFilterType::MatrixObjectType MatrixObjectType;
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
index 0c63765be7..6ba1adfe34 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
@@ -60,6 +60,7 @@ public:
typedef itk::DataObject::Pointer DataObjectPointer;
+ using Superclass::SetInput;
virtual void SetInput(const InputGISTableType *input);
const InputGISTableType * GetInput(void);
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index 274e470780..8eb160a7b2 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -72,6 +72,7 @@ public:
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
/** Connects the VectorData from which the extend will be extracted. */
+ using Superclass::SetInput;
void SetInput(const VectorDataType *);
const VectorDataType * GetInput() const;
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 324ac52ee4..f0f0b31573 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -83,6 +83,7 @@ public:
typedef itk::DataObject::Pointer DataObjectPointer;
+ using Superclass::SetInput;
virtual void SetInput(const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
index bcd6549588..f0e5503251 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
@@ -96,6 +96,7 @@ public:
} RenderingStyleType;
/** Set/Get the vector data input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const VectorDataType *input);
virtual void SetInput(unsigned int idx, const VectorDataType *input);
const VectorDataType * GetInput(void);
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index 4f505878d0..b6cc09f374 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -118,6 +118,7 @@ public:
} RenderingStyleType;
/** Set/Get the vector data input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const VectorDataType *input);
virtual void SetInput(unsigned int idx, const VectorDataType *input);
const VectorDataType * GetInput(void);
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index c3fecc7a66..f57b27435a 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -71,6 +71,7 @@ public:
};
/** Method to set/get the input image */
+ using Superclass::SetInput;
void SetInput( const ImageType * input);
/** Returns the input image */
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index bd979a2e80..74c1c37810 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -126,6 +126,7 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int,
InputImageType::ImageDimension);
+ using Superclass::SetInput;
virtual void SetInput( const InputImageType *image);
virtual void SetInput( unsigned int, const TInputImage * image);
const InputImageType * GetInput(void);
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index b4bb28fb5a..c9251becb1 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -157,6 +157,7 @@ public:
void SetAutomaticAdaptativeStreaming(unsigned int availableRAM = 0, double bias = 1.0);
/** Set the only input of the writer */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
/** Get writer only input */
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 7f7c6ed32d..74c1246f68 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -122,6 +122,7 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int,
InputImageType::ImageDimension);
+ using Superclass::SetInput;
virtual void SetInput( const InputImageType *image);
virtual void SetInput( unsigned int, const TInputImage * image);
const InputImageType * GetInput(void);
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index 598fcc3f8b..8faca223c7 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -82,6 +82,7 @@ public:
typedef VectorDataIOBase VectorDataIOBaseType;
/** Set/Get the image input of this writer. */
+ using Superclass::SetInput;
void SetInput(const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
const InputVectorDataType * GetInput(unsigned int idx);
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index b5d7690740..ebd510fba5 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -62,6 +62,7 @@ public:
/** InputImage dimension constant */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageListType * imageList);
virtual InputImageListType * GetInput(void);
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index e176bd0a34..e8a919c6ef 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -109,6 +109,7 @@ public:
*/
unsigned int GetNumberOfRelations(void);
+ using Superclass::SetInput;
/** Set the input of the filter */
virtual void SetInput(const PolygonListType *input);
/** Get the input of the filter */
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index cecf668da2..fc3c1c9c1a 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -89,6 +89,8 @@ public:
itkSetStringMacro(FileName);
/** Get the filename */
itkGetStringMacro(FileName);
+
+ using Superclass::SetInput;
/**
* Set the input graph.
* \param inputGraph The graph to write.
diff --git a/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
index f86d63c0d5..33a9f89487 100644
--- a/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
@@ -93,6 +93,7 @@ public:
itkSetMacro(StartIndex, IndexType);
/** Set/Get the GISTable input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputGISTableType *input);
virtual void SetInput(unsigned int idx, const InputGISTableType *input);
const InputGISTableType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
index 575ef344c0..ed459b4029 100644
--- a/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
@@ -76,6 +76,7 @@ public:
VectorDataSource);
/** Set/Get the GISTable input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputGISTableType *input);
virtual void SetInput(unsigned int idx, const InputGISTableType *input);
const InputGISTableType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index 170d25c0c3..909cb982d6 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -73,6 +73,7 @@ public:
typedef ogr::Layer OGRLayerType;
/** Set/Get the input image of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
virtual const InputImageType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index 9efce6f18f..d21636a1b3 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -82,6 +82,7 @@ public:
/** Set/Get the input image of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
virtual const InputImageType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
index e3fc46d40e..c8a537f3cd 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
@@ -110,6 +110,7 @@ public:
//void setConnection
/** Set/Get the LabelMap input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputLabelMapType *input);
virtual void SetInput(unsigned int idx, const InputLabelMapType *input);
const InputLabelMapType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index d9004f4aa8..81eb0b9e5e 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -91,6 +91,7 @@ public:
VectorDataSource);
/** Set/Get the LabelMap input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputLabelMapType *input);
virtual void SetInput(unsigned int idx, const InputLabelMapType *input);
const InputLabelMapType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
index bea98a7862..1a158964d8 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
@@ -99,6 +99,7 @@ public:
//void setConnection
/** Set/Get the VectorData input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputVectorDataType *input);
virtual void SetInput(unsigned int idx, const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 776463cfba..14dd953410 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -152,6 +152,7 @@ public:
itkGetConstReferenceMacro(Spacing, SpacingType);
/** Set/Get the Vector data input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputVectorDataType *input);
virtual void SetInput(unsigned int idx, const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index 3f7015a6ec..bc4c943258 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -168,6 +168,7 @@ public:
;
/** Set/Get the Vector data input of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputVectorDataType *input);
virtual void SetInput(unsigned int idx, const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
index 835d2c83dc..0db26672c6 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
@@ -211,6 +211,7 @@ public:
* \param image the input image
*
*/
+ using Superclass::SetInput;
void SetInput(const TInputImage * image)
{
this->SetInput1(image);
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
index 7f210c9ce4..2c2a999fb9 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
@@ -113,6 +113,7 @@ public:
/**
* Set the original input image
*/
+ using Superclass::SetInput;
void SetInput(const TInputImage * input)
{
this->SetInput1(input);
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index 2c7f05b0fa..f44db8f526 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -78,6 +78,7 @@ public:
typedef ogr::Feature OGRFeatureType;
/** Set the input image of this process object. */
+ using Superclass::SetInput;
virtual void SetInput(const InputImageType *input);
/** Get the input image. */
virtual const InputImageType * GetInput(void);
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index 8771421fd5..f3cbdd3128 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -269,6 +269,7 @@ public:
typedef typename InputImageType::SizeType SizeType;
/** Set the input image. */
+ using Superclass::SetInput;
void SetInput(InputImageType * input)
{
this->GetFilter()->SetInput(input);
--
GitLab