From 29522e41f999f46daf1657826ded3655f15a7ddf Mon Sep 17 00:00:00 2001 From: Manuel Grizonnet <manuel.grizonnet@cnes.fr> Date: Thu, 16 Jun 2016 09:55:05 +0200 Subject: [PATCH] ENH: Explicitly recognize virtual functions in applications clang-tidy tool can insert missing override keyword as a macro so that missing [optional] virtual identifiers can be easily added. build otb with clang 3.8 and use cmake option CMAKE_EXPORT_COMPILE_COMMANDS=ON. Most modules and third parties have been activated. #Run clang modernize check using utility script which allow to process the code in parallel (only on Applications directory) python run-clang-tidy.py -clang-tidy-binary ~/software/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang-tidy -checks=-*,modernize-use-override -header-filter=/home/grizonnetm/projets/otb/src/OTB/Modules/Modules/Applications/.*/include/.* -j8 -fix -p ~/projets/otb/bin/release/OTB-clang3.8/ ~/projets/otb/src/OTB/Modules/Applications/*/app/*.cxx > ~/temporary/run-clang-tidy-app-log.txt #Replace override by ITK macro (to maintain compat with c++98) in Modules/Applications find . -type f -print -name "*.cxx" |xargs perl -pi -e 's/\ override/\ ITK_OVERRIDE/g' --- .../app/otbMultivariateAlterationDetector.cxx | 6 +++--- .../app/otbClassificationMapRegularization.cxx | 6 +++--- .../app/otbComputeConfusionMatrix.cxx | 6 +++--- .../app/otbComputeImagesStatistics.cxx | 6 +++--- .../app/otbComputeOGRLayersFeaturesStatistics.cxx | 6 +++--- .../app/otbComputePolylineFeatureFromImage.cxx | 6 +++--- .../app/otbDSFuzzyModelEstimation.cxx | 10 +++++----- .../app/otbFusionOfClassifications.cxx | 6 +++--- .../AppClassification/app/otbImageClassifier.cxx | 6 +++--- .../AppClassification/app/otbKMeansClassification.cxx | 6 +++--- .../AppClassification/app/otbOGRLayerClassifier.cxx | 6 +++--- .../app/otbPolygonClassStatistics.cxx | 6 +++--- .../AppClassification/app/otbPredictRegression.cxx | 6 +++--- .../AppClassification/app/otbSOMClassification.cxx | 6 +++--- .../AppClassification/app/otbTrainImagesClassifier.cxx | 6 +++--- .../app/otbTrainOGRLayersClassifier.cxx | 6 +++--- .../AppClassification/app/otbTrainRegression.cxx | 6 +++--- .../app/otbVectorDataDSValidation.cxx | 6 +++--- .../app/otbHomologousPointsExtraction.cxx | 6 +++--- .../app/otbDimensionalityReduction.cxx | 6 +++--- Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx | 6 +++--- .../AppEdge/app/otbLineSegmentDetection.cxx | 6 +++--- Modules/Applications/AppFiltering/app/otbDespeckle.cxx | 6 +++--- Modules/Applications/AppFiltering/app/otbSmoothing.cxx | 6 +++--- .../AppFusion/app/otbBundleToPerfectSensor.cxx | 6 +++--- .../Applications/AppFusion/app/otbPansharpening.cxx | 6 +++--- .../AppHyperspectral/app/otbHyperspectralUnmixing.cxx | 6 +++--- .../app/otbVertexComponentAnalysis.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbColorMapping.cxx | 6 +++--- .../AppImageUtils/app/otbCompareImages.cxx | 6 +++--- .../AppImageUtils/app/otbConcatenateImages.cxx | 6 +++--- Modules/Applications/AppImageUtils/app/otbConvert.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbDEMConvert.cxx | 6 +++--- .../AppImageUtils/app/otbDownloadSRTMTiles.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbExtractROI.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbManageNoData.cxx | 6 +++--- .../AppImageUtils/app/otbMultiResolutionPyramid.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbPixelValue.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbQuicklook.cxx | 6 +++--- .../AppImageUtils/app/otbReadImageInfo.cxx | 6 +++--- Modules/Applications/AppImageUtils/app/otbRescale.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbSplitImage.cxx | 6 +++--- .../Applications/AppImageUtils/app/otbTileFusion.cxx | 6 +++--- .../AppIndices/app/otbRadiometricIndices.cxx | 6 +++--- Modules/Applications/AppKMZ/app/otbKmzExport.cxx | 6 +++--- Modules/Applications/AppMathParser/app/otbBandMath.cxx | 6 +++--- .../Applications/AppMathParserX/app/otbBandMathX.cxx | 6 +++--- .../AppMoments/app/otbLocalStatisticExtraction.cxx | 6 +++--- .../app/otbBinaryMorphologicalOperation.cxx | 6 +++--- .../app/otbGrayScaleMorphologicalOperation.cxx | 6 +++--- .../app/otbOpticalCalibration.cxx | 6 +++--- .../AppProjection/app/otbConvertCartoToGeoPoint.cxx | 6 +++--- .../AppProjection/app/otbConvertSensorToGeoPoint.cxx | 6 +++--- .../AppProjection/app/otbGenerateRPCSensorModel.cxx | 6 +++--- .../AppProjection/app/otbGridBasedImageResampling.cxx | 6 +++--- .../AppProjection/app/otbImageEnvelope.cxx | 6 +++--- .../AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx | 8 ++++---- .../AppProjection/app/otbOrthoRectification.cxx | 6 +++--- .../AppProjection/app/otbRefineSensorModel.cxx | 6 +++--- .../AppProjection/app/otbRigidTransformResample.cxx | 6 +++--- .../Applications/AppProjection/app/otbSuperimpose.cxx | 6 +++--- .../AppProjection/app/otbVectorDataReprojection.cxx | 6 +++--- .../AppSARCalibration/app/otbSARCalibration.cxx | 6 +++--- .../app/otbSarRadiometricCalibration.cxx | 6 +++--- .../AppSARDecompositions/app/otbSARDecompositions.cxx | 6 +++--- .../app/otbSARPolarMatrixConvert.cxx | 6 +++--- .../AppSARPolarSynth/app/otbSARPolarSynth.cxx | 6 +++--- .../app/otbConnectedComponentSegmentation.cxx | 6 +++--- .../app/otbHooverCompareSegmentation.cxx | 6 +++--- .../AppSegmentation/app/otbLSMSSegmentation.cxx | 10 +++++----- .../AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx | 6 +++--- .../AppSegmentation/app/otbLSMSVectorization.cxx | 6 +++--- .../AppSegmentation/app/otbMeanShiftSmoothing.cxx | 6 +++--- .../AppSegmentation/app/otbSegmentation.cxx | 6 +++--- .../Applications/AppStereo/app/otbBlockMatching.cxx | 6 +++--- .../AppStereo/app/otbDisparityMapToElevationMap.cxx | 6 +++--- .../Applications/AppStereo/app/otbFineRegistration.cxx | 6 +++--- .../Applications/AppStereo/app/otbGeneratePlyFile.cxx | 6 +++--- .../Applications/AppStereo/app/otbStereoFramework.cxx | 6 +++--- .../app/otbStereoRectificationGridGenerator.cxx | 6 +++--- .../Applications/AppTest/app/otbTestApplication.cxx | 6 +++--- .../AppTextures/app/otbHaralickTextureExtraction.cxx | 6 +++--- .../AppTextures/app/otbSFSTextureExtraction.cxx | 6 +++--- .../AppVectorDataTranslation/app/otbRasterization.cxx | 6 +++--- .../AppVectorUtils/app/otbConcatenateVectorData.cxx | 6 +++--- .../AppVectorUtils/app/otbOSMDownloader.cxx | 6 +++--- .../AppVectorUtils/app/otbVectorDataExtractROI.cxx | 6 +++--- .../AppVectorUtils/app/otbVectorDataSetField.cxx | 6 +++--- .../AppVectorUtils/app/otbVectorDataTransform.cxx | 6 +++--- 89 files changed, 272 insertions(+), 272 deletions(-) diff --git a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx index cacfcc8141..d84f93db64 100644 --- a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx +++ b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx @@ -40,7 +40,7 @@ public: itkTypeMacro(MultivariateAlterationDetector, otb::Wrapper::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("MultivariateAlterationDetector"); SetDescription("Multivariate Alteration Detector"); @@ -104,11 +104,11 @@ private: SetDocExampleParameterValue("out", "detectedChangeImage.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { typedef otb::MultivariateAlterationDetectorImageFilter< FloatVectorImageType, diff --git a/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx index e535991b5e..4652d55562 100644 --- a/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx +++ b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx @@ -53,7 +53,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ClassificationMapRegularization"); SetDescription("Filters the input labeled image using Majority Voting in a ball shaped neighbordhood."); @@ -111,12 +111,12 @@ private: SetDocExampleParameterValue("ip.undecidedlabel", "7"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Majority Voting m_NeighMajVotingFilter = NeighborhoodMajorityVotingFilterType::New(); diff --git a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx index 3aed87bd66..cf138b8da3 100644 --- a/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx +++ b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx @@ -71,7 +71,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ComputeConfusionMatrix"); SetDescription("Computes the confusion matrix of a classification"); @@ -132,7 +132,7 @@ private: SetDocExampleParameterValue("nodatalabel","255"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } @@ -209,7 +209,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { Int32ImageType* input = this->GetParameterInt32Image("in"); diff --git a/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx index f48ec15b74..990d41ba1a 100644 --- a/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx +++ b/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx @@ -42,7 +42,7 @@ public: itkTypeMacro(ComputeImagesStatistics, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ComputeImagesStatistics"); SetDescription("Computes global mean and standard deviation for each band from a set of images and optionally saves the results in an XML file."); @@ -71,12 +71,12 @@ private: SetDocExampleParameterValue("out", "EstimateImageStatisticsQB1.xml"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //Statistics estimator typedef otb::StreamingStatisticsVectorImageFilter<FloatVectorImageType> StreamingStatisticsVImageFilterType; diff --git a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx index 096a70cc4c..d6153c4880 100644 --- a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx +++ b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx @@ -42,7 +42,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ComputeOGRLayersFeaturesStatistics"); SetDescription("Compute statistics of the features in a set of OGR Layers"); @@ -70,7 +70,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if ( HasValue("inshp") ) { @@ -101,7 +101,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { clock_t tic = clock(); diff --git a/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx index 8d588ae7b1..ff97cd686c 100644 --- a/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx +++ b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx @@ -73,7 +73,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ComputePolylineFeatureFromImage"); SetDescription("This application compute for each studied polyline, contained in the input VectorData, the chosen descriptors."); @@ -111,12 +111,12 @@ private: SetDocExampleParameterValue("out", "PolylineFeatureFromImage_LI_NONDVI_gt.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Vector Data into Image projection FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx index cd7c988361..528cc0496f 100644 --- a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx +++ b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx @@ -48,12 +48,12 @@ typedef itk::AmoebaOptimizer OptimizerType; typedef const OptimizerType * OptimizerPointer; -void Execute(itk::Object *caller, const itk::EventObject & event) +void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE { Execute( (const itk::Object *)caller, event); } -void Execute(const itk::Object * object, const itk::EventObject & event) +void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE { OptimizerPointer optimizer = dynamic_cast< OptimizerPointer >( object ); @@ -112,7 +112,7 @@ public: itkTypeMacro(DSFuzzyModelEstimation, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("DSFuzzyModelEstimation"); SetDescription("Estimate feature fuzzy model parameters using 2 vector data (ground truth samples and wrong samples)."); @@ -179,7 +179,7 @@ private: SetDocExampleParameterValue("out", "DSFuzzyModelEstimation.xml"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent @@ -189,7 +189,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //Instantiate diff --git a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx index 3eac231b52..7b52a9026b 100644 --- a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx +++ b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx @@ -90,7 +90,7 @@ public: itkTypeMacro(FusionOfClassifications, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("FusionOfClassifications"); SetDescription("Fuses several classifications maps of the same image on the basis of class labels."); @@ -168,7 +168,7 @@ private: SetDocExampleParameterValue("out","classification_fused.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } @@ -280,7 +280,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Clear any previous filter m_Filters.clear(); diff --git a/Modules/Applications/AppClassification/app/otbImageClassifier.cxx b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx index 2a33fb63e5..9442729120 100644 --- a/Modules/Applications/AppClassification/app/otbImageClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx @@ -62,7 +62,7 @@ public: typedef ClassificationFilterType::ConfidenceImageType ConfidenceImageType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ImageClassifier"); SetDescription("Performs a classification of the input image according to a model file."); @@ -119,12 +119,12 @@ private: SetDocExampleParameterValue("out", "clLabeledImageQB1.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Load input image FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx b/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx index 3d42261c52..e713cda0a8 100644 --- a/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx +++ b/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx @@ -164,7 +164,7 @@ public: itkTypeMacro(KMeansClassification, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("KMeansClassification"); SetDescription("Unsupervised KMeans image classification"); @@ -218,7 +218,7 @@ private: SetDocExampleParameterValue("out", "ClassificationFilterOutput.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // test of input image // if (HasValue("in")) @@ -251,7 +251,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { GetLogger()->Debug("Entering DoExecute\n"); diff --git a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx index 27b56434f6..50a8a736e0 100644 --- a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx @@ -51,7 +51,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("OGRLayerClassifier"); SetDescription("Classify an OGR layer based on a machine learning model and a list of features to consider."); @@ -89,7 +89,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if ( HasValue("inshp") ) { @@ -120,7 +120,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { #ifdef OTB_USE_LIBSVM diff --git a/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx b/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx index 50f699b137..545d091ef4 100644 --- a/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx +++ b/Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx @@ -51,7 +51,7 @@ private: } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("PolygonClassStatistics"); SetDescription("Computes statistics on a training polygon set."); @@ -108,12 +108,12 @@ private: SetDocExampleParameterValue("out","polygonStat.xml"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { otb::ogr::DataSource::Pointer vectors = otb::ogr::DataSource::New(this->GetParameterString("vec")); diff --git a/Modules/Applications/AppClassification/app/otbPredictRegression.cxx b/Modules/Applications/AppClassification/app/otbPredictRegression.cxx index 80b1f2ce2f..30fad3edf1 100644 --- a/Modules/Applications/AppClassification/app/otbPredictRegression.cxx +++ b/Modules/Applications/AppClassification/app/otbPredictRegression.cxx @@ -103,7 +103,7 @@ public: typedef otb::MachineLearningModelFactory<ValueType, LabelType> MachineLearningModelFactoryType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("PredictRegression"); SetDescription("Performs a prediction of the input image according to a regression model file."); @@ -170,12 +170,12 @@ private: SetDocExampleParameterValue("out", "clLabeledImageQB1.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Load input image FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppClassification/app/otbSOMClassification.cxx b/Modules/Applications/AppClassification/app/otbSOMClassification.cxx index de5dc07bea..d7f90750fc 100644 --- a/Modules/Applications/AppClassification/app/otbSOMClassification.cxx +++ b/Modules/Applications/AppClassification/app/otbSOMClassification.cxx @@ -73,7 +73,7 @@ private: m_Classifier = ClassificationFilterType::New(); } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SOMClassification"); SetDescription("SOM image classification."); @@ -173,12 +173,12 @@ private: SetDocExampleParameterValue("iv", "0"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // initiating random number generation itk::Statistics::MersenneTwisterRandomVariateGenerator::Pointer diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx index 3ffecfbb0e..87d80a7a44 100644 --- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx @@ -102,7 +102,7 @@ protected: private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("TrainImagesClassifier"); SetDescription( @@ -199,7 +199,7 @@ void DoInit() SetDocExampleParameterValue("io.confmatout", "svmConfusionMatrixQB1.csv"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } @@ -275,7 +275,7 @@ void LogConfusionMatrix(ConfusionMatrixCalculatorType* confMatCalc) otbAppLogINFO("Confusion matrix (rows = reference labels, columns = produced labels):\n" << os.str()); } -void DoExecute() +void DoExecute() ITK_OVERRIDE { //Create training and validation for list samples and label list samples ConcatenateLabelListSampleFilterType::Pointer concatenateTrainingLabels = diff --git a/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx index 96dfef7564..33b752fb46 100644 --- a/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx @@ -51,7 +51,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("TrainOGRLayersClassifier"); SetDescription("Train a SVM classifier based on labeled geometries and a list of features to consider."); @@ -88,7 +88,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if ( HasValue("inshp") ) { @@ -119,7 +119,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { #ifdef OTB_USE_LIBSVM clock_t tic = clock(); diff --git a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx index 01a8398323..3039d44a0a 100644 --- a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx @@ -95,7 +95,7 @@ protected: private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("TrainRegression"); SetDescription( @@ -172,7 +172,7 @@ void DoInit() SetDocExampleParameterValue("classifier", "libsvm"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { if (HasValue("io.csv") && IsParameterEnabled("io.csv")) { @@ -253,7 +253,7 @@ void ParseCSVPredictors(std::string path, ListSampleType* outputList) ifs.close(); } -void DoExecute() +void DoExecute() ITK_OVERRIDE { GetLogger()->Debug("Entering DoExecute\n"); //Create training and validation for list samples and label list samples diff --git a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx index 4c29d7d5b5..c260e16819 100644 --- a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx +++ b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx @@ -55,7 +55,7 @@ public: itkTypeMacro(VectorDataDSValidation, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VectorDataDSValidation"); SetDescription("Vector data validation based on the fusion of features using Dempster-Shafer evidence theory framework."); @@ -102,7 +102,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent @@ -112,7 +112,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //Read the vector data diff --git a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx index bc1c11ada2..6284f6b589 100644 --- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx +++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx @@ -77,7 +77,7 @@ public: itkTypeMacro(HomologousPointsExtraction, otb::Wrapper::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("HomologousPointsExtraction"); SetDocName("Homologous points extraction"); @@ -197,7 +197,7 @@ private: SetDocExampleParameterValue("out","homologous.txt"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } @@ -321,7 +321,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { OGRMultiLineString mls; diff --git a/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx index 9fcd0ed5a8..06e07d00ad 100644 --- a/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx +++ b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx @@ -86,7 +86,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("DimensionalityReduction"); SetDescription("Perform Dimension reduction of the input image."); @@ -175,7 +175,7 @@ private: SetDocExampleParameterValue("method", "pca"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if (HasValue("in")) { @@ -223,7 +223,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get Parameters diff --git a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx index caca296741..444749182f 100644 --- a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx +++ b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx @@ -58,7 +58,7 @@ itkTypeMacro(EdgeExtraction, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("EdgeExtraction"); SetDescription("Computes edge features on every pixel of the input image selected channel"); @@ -121,12 +121,12 @@ SetDocExampleParameterValue("channel", "1"); SetDocExampleParameterValue("out", "Edges.tif"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx index 230fe1a4d3..4212104bde 100644 --- a/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx +++ b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx @@ -50,7 +50,7 @@ public: itkTypeMacro(LineSegmentDetection, otb::Wrapper::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("LineSegmentDetection"); SetDescription("Detect line segments in raster"); @@ -82,11 +82,11 @@ private: SetDocExampleParameterValue("out", "LineSegmentDetection.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { typedef otb::VectorImageToAmplitudeImageFilter<FloatVectorImageType, FloatImageType> VectorImageToAmplitudeImageFilterType; diff --git a/Modules/Applications/AppFiltering/app/otbDespeckle.cxx b/Modules/Applications/AppFiltering/app/otbDespeckle.cxx index bdd6b49716..0fde206f26 100644 --- a/Modules/Applications/AppFiltering/app/otbDespeckle.cxx +++ b/Modules/Applications/AppFiltering/app/otbDespeckle.cxx @@ -51,7 +51,7 @@ public: itkTypeMacro(Despeckle, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Despeckle"); SetDescription("Perform speckle noise reduction on SAR image."); @@ -123,12 +123,12 @@ private: SetDocExampleParameterValue("out", "despeckle.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType* inVImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppFiltering/app/otbSmoothing.cxx b/Modules/Applications/AppFiltering/app/otbSmoothing.cxx index 210c2f2eb7..18cd825f50 100644 --- a/Modules/Applications/AppFiltering/app/otbSmoothing.cxx +++ b/Modules/Applications/AppFiltering/app/otbSmoothing.cxx @@ -52,7 +52,7 @@ public: itkTypeMacro(Smoothing, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Smoothing"); SetDescription("Apply a smoothing filter to an image"); @@ -120,12 +120,12 @@ private: SetDocExampleParameterValue("type.anidif.conductance", "1.5", exId); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { GetLogger()->Debug("Entering DoExecute\n"); diff --git a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx index 8fe879ccf4..94bb44a6ac 100644 --- a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx +++ b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx @@ -50,7 +50,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("BundleToPerfectSensor"); SetDescription("Perform P+XS pansharpening"); @@ -102,7 +102,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if(!HasUserValue("mode") && HasValue("inp") && HasValue("inxs") && otb::PleiadesPToXSAffineTransformCalculator::CanCompute(GetParameterImage("inp"),GetParameterImage("inxs"))) { @@ -111,7 +111,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType* panchroV = GetParameterImage("inp"); FloatVectorImageType* xs = GetParameterImage("inxs"); diff --git a/Modules/Applications/AppFusion/app/otbPansharpening.cxx b/Modules/Applications/AppFusion/app/otbPansharpening.cxx index 41d98e0fdc..7b5e9def30 100644 --- a/Modules/Applications/AppFusion/app/otbPansharpening.cxx +++ b/Modules/Applications/AppFusion/app/otbPansharpening.cxx @@ -70,7 +70,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Pansharpening"); SetDescription("Perform P+XS pansharpening"); @@ -134,12 +134,12 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType* panchroV = GetParameterImage("inp"); if ( panchroV->GetNumberOfComponentsPerPixel() != 1 ) diff --git a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx index e627f82a41..3894ed1484 100644 --- a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx +++ b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx @@ -89,7 +89,7 @@ public: itkTypeMacro(HyperspectralUnmixing, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("HyperspectralUnmixing"); SetDescription("Estimate abundance maps from an hyperspectral image and a set of endmembers."); @@ -137,12 +137,12 @@ private: SetDocExampleParameterValue("ua", "ucls"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { m_ProcessObjects.clear(); diff --git a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx index 34a521e47d..cc729585ce 100644 --- a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx +++ b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx @@ -44,7 +44,7 @@ public: itkTypeMacro(VertexComponentAnalysis, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VertexComponentAnalysis"); SetDescription("Find endmembers in hyperspectral images with Vertex Component Analysis"); @@ -78,12 +78,12 @@ private: SetDocExampleParameterValue("outendm", "VertexComponentAnalysis.tif double"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { DoubleVectorImageType::Pointer inputImage = GetParameterDoubleVectorImage("in"); DoubleVectorImageType::Pointer endmembersImage; diff --git a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx index e6433df582..37d55102e5 100644 --- a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx +++ b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx @@ -244,7 +244,7 @@ public: <FloatImageType, LabelImageType> CasterToLabelImageType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ColorMapping"); SetDescription("Maps an input label image to 8-bits RGB using look-up tables."); @@ -392,7 +392,7 @@ private: SetDocExampleParameterValue("out", "Colorized_ROI_QB_MUL_1_SVN_CLASS_MULTI.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Make sure the operation color->label is not called with methods continuous or image. // These methods are not implemented for this operation yet. @@ -406,7 +406,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { if(GetParameterInt("op")==0) { diff --git a/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx b/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx index 4b336187ae..6084c38755 100644 --- a/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx +++ b/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx @@ -46,7 +46,7 @@ public: typedef otb::StreamingCompareImageFilter<FloatImageType> StreamingCompareImageFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("CompareImages"); SetDescription("Estimator between 2 images."); @@ -121,7 +121,7 @@ private: SetDocExampleParameterValue("roi.sizey", "200"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Set channel interval if( HasValue("ref.in") ) @@ -156,7 +156,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Init filters m_ExtractRefFilter = ExtractROIMonoFilterType::New(); diff --git a/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx b/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx index 9d39a839b2..3b981669cb 100644 --- a/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx +++ b/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx @@ -51,7 +51,7 @@ public: typedef ObjectList<ExtractROIFilterType> ExtractROIFilterListType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ConcatenateImages"); SetDescription("Concatenate a list of images of the same size into a single multi-channel one."); @@ -84,7 +84,7 @@ private: SetDocExampleParameterValue("out", "otbConcatenateImages.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent @@ -94,7 +94,7 @@ private: m_ExtractorList = ExtractROIFilterListType::New(); } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image list FloatVectorImageListType::Pointer inList = this->GetParameterImageList("il"); diff --git a/Modules/Applications/AppImageUtils/app/otbConvert.cxx b/Modules/Applications/AppImageUtils/app/otbConvert.cxx index 7bd8d1ffcb..7de721d786 100644 --- a/Modules/Applications/AppImageUtils/app/otbConvert.cxx +++ b/Modules/Applications/AppImageUtils/app/otbConvert.cxx @@ -75,7 +75,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Convert"); SetDescription("Convert an image to a different format, eventually rescaling the data" @@ -136,7 +136,7 @@ private: SetDocExampleParameterValue("type", "linear"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } @@ -316,7 +316,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { switch ( this->GetParameterOutputImagePixelType("out") ) { diff --git a/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx b/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx index af07ee3ac3..a997f673d3 100644 --- a/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx +++ b/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx @@ -42,7 +42,7 @@ public: itkTypeMacro(DEMConvert, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("DEMConvert"); SetDescription("Converts a geo-referenced DEM image into a general raster file compatible with OTB DEM handling."); @@ -70,7 +70,7 @@ private: SetDocExampleParameterValue("out", "outputDEM"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // nothing to update } @@ -80,7 +80,7 @@ void DoUpdateParameters() * (.ras, .geom and . omd) */ -void DoExecute() +void DoExecute() ITK_OVERRIDE { // Load input image FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx b/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx index 8e06ba0db2..cc992824c1 100644 --- a/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx +++ b/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx @@ -91,7 +91,7 @@ private: } return false; } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("DownloadSRTMTiles"); SetDescription("Download or list SRTM tiles related to a set of images"); @@ -132,13 +132,13 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //Get the mode diff --git a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx index 2f623fa19b..e09f0d852b 100644 --- a/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx +++ b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx @@ -55,7 +55,7 @@ public: FloatVectorImageType::InternalPixelType> ExtractROIFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ExtractROI"); SetDescription("Extract a ROI defined by the user."); @@ -116,7 +116,7 @@ private: SetDocExampleParameterValue("out", "ExtractROI.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Update the sizes only if the user has not defined a size if ( HasValue("in") ) @@ -219,7 +219,7 @@ private: return false; } - void DoExecute() + void DoExecute() ITK_OVERRIDE { ExtractROIFilterType::InputImageType* inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx index fc2e201298..dfff214a23 100644 --- a/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx +++ b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx @@ -55,7 +55,7 @@ public: typedef otb::ChangeInformationImageFilter<FloatVectorImageType> ChangeInfoFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ManageNoData"); SetDescription("Manage No-Data"); @@ -116,13 +116,13 @@ private: SetDocExampleParameterValue("mode.buildmask.outv", "0"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inputPtr = this->GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx index d22a137178..4e7ce61476 100644 --- a/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx +++ b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx @@ -55,7 +55,7 @@ public: FloatVectorImageType> ShrinkFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("MultiResolutionPyramid"); SetDescription("Build a multi-resolution pyramid of the image."); @@ -109,14 +109,14 @@ private: SetDocExampleParameterValue("fast", "false"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent // Reinitialize the internal process used } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Initializing the process m_SmoothingFilter = SmoothingVectorImageFilterType::New(); diff --git a/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx index ee40c5ca59..35a860d0d4 100644 --- a/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx +++ b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx @@ -43,7 +43,7 @@ public: itkTypeMacro(PixelValue, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("PixelValue"); SetDescription("Get the value of a pixel."); @@ -85,7 +85,7 @@ private: SetDocExampleParameterValue("cl", "Channel1"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if ( HasValue("in") ) { @@ -108,7 +108,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { std::ostringstream ossOutput; FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx b/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx index fbf901e9a7..7c3677041f 100644 --- a/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx +++ b/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx @@ -50,7 +50,7 @@ public: <ExtractROIFilterType::OutputImageType, ExtractROIFilterType::OutputImageType> ShrinkImageFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Quicklook"); SetDescription("Generates a subsampled version of an image extract"); @@ -116,7 +116,7 @@ private: SetDocExampleParameterValue("out", "quicklookImage.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Update the sizes only if the user does not defined a size if ( HasValue("in") ) @@ -193,7 +193,7 @@ bool CropRegionOfInterest() return false; } - void DoExecute() + void DoExecute() ITK_OVERRIDE { InputImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx index bba8905a17..d4b4514c47 100644 --- a/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx +++ b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx @@ -45,7 +45,7 @@ public: itkTypeMacro(ReadImageInfo, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ReadImageInfo"); SetDescription("Get information about the image"); @@ -245,12 +245,12 @@ private: SetDocExampleParameterValue("in", "QB_Toulouse_Ortho_XS.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { std::ostringstream ossOutput; FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbRescale.cxx b/Modules/Applications/AppImageUtils/app/otbRescale.cxx index ace0ee39f5..d0304e74a4 100644 --- a/Modules/Applications/AppImageUtils/app/otbRescale.cxx +++ b/Modules/Applications/AppImageUtils/app/otbRescale.cxx @@ -46,7 +46,7 @@ public: typedef otb::VectorRescaleIntensityImageFilter<FloatVectorImageType> RescaleImageFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Rescale"); SetDescription("Rescale the image between two given values."); @@ -84,12 +84,12 @@ private: SetDocExampleParameterValue("outmax", "255"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx b/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx index 8a732d68ce..42e609144d 100644 --- a/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx +++ b/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx @@ -46,7 +46,7 @@ public: FloatVectorImageType::InternalPixelType> FilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SplitImage"); SetDescription("Split a N multiband image into N images"); @@ -73,12 +73,12 @@ private: SetDocExampleParameterValue("out", "splittedImage.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx b/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx index 9140183ce4..932f2114fc 100644 --- a/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx +++ b/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx @@ -42,7 +42,7 @@ public: typedef otb::TileImageFilter<FloatVectorImageType> TileFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("TileFusion"); SetDescription("Fusion of an image made of several tile files."); @@ -75,12 +75,12 @@ private: SetDocExampleParameterValue("out", "EntireImage.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to be done } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image list FloatVectorImageListType::Pointer tileList = this->GetParameterImageList("il"); diff --git a/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx b/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx index eacd3e2ad1..3c910f26e1 100644 --- a/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx +++ b/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx @@ -126,7 +126,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("RadiometricIndices"); SetDescription("Compute radiometric indices."); @@ -433,7 +433,7 @@ private: } } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { //Nothing to do here } @@ -483,7 +483,7 @@ private: otbAppLogINFO(<< m_Map[GetSelectedItems("list")[idx]].item << " added.");\ } - void DoExecute() + void DoExecute() ITK_OVERRIDE { int nbChan = GetParameterImage("in")->GetNumberOfComponentsPerPixel(); diff --git a/Modules/Applications/AppKMZ/app/otbKmzExport.cxx b/Modules/Applications/AppKMZ/app/otbKmzExport.cxx index 506d390dd7..e4156451bc 100644 --- a/Modules/Applications/AppKMZ/app/otbKmzExport.cxx +++ b/Modules/Applications/AppKMZ/app/otbKmzExport.cxx @@ -42,7 +42,7 @@ public: itkTypeMacro(KmzExport, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("KmzExport"); SetDescription("Export the input image in a KMZ product."); @@ -85,12 +85,12 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { typedef otb::KmzProductWriter<FloatVectorImageType> KmzProductWriterType; diff --git a/Modules/Applications/AppMathParser/app/otbBandMath.cxx b/Modules/Applications/AppMathParser/app/otbBandMath.cxx index 64f8893a1b..31f4304550 100644 --- a/Modules/Applications/AppMathParser/app/otbBandMath.cxx +++ b/Modules/Applications/AppMathParser/app/otbBandMath.cxx @@ -50,7 +50,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("BandMath"); SetDescription("Perform a mathematical operation on monoband images"); @@ -84,7 +84,7 @@ private: SetDocExampleParameterValue("exp", "\"cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3, im3b4)\""); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Check if the expression is correctly set if (HasValue("il")) @@ -155,7 +155,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image list FloatVectorImageListType::Pointer inList = GetParameterImageList("il"); diff --git a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx index 1aa1c471e3..ab0876183b 100644 --- a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx +++ b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx @@ -52,7 +52,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("BandMathX"); SetDescription("This application performs mathematical operations on multiband images.\n" @@ -171,7 +171,7 @@ private: SetDocExampleParameterValue("exp", "\"cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3, im3b4)\""); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // check if input context should be used bool useContext = this->ContextCheck(); @@ -265,7 +265,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image list FloatVectorImageListType::Pointer inList = GetParameterImageList("il"); diff --git a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx index 86848cbcc7..e60b4bb8e9 100644 --- a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx +++ b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx @@ -52,7 +52,7 @@ itkTypeMacro(LocalStatisticExtraction, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("LocalStatisticExtraction"); SetDescription("Computes local statistical moments on every pixel in the selected channel of the input image"); @@ -92,12 +92,12 @@ SetDocExampleParameterValue("radius", "3"); SetDocExampleParameterValue("out", "Statistics.tif"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx index d453b699a4..9e5e121d5f 100644 --- a/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx +++ b/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx @@ -73,7 +73,7 @@ itkTypeMacro(BinaryMorphologicalOperation, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("BinaryMorphologicalOperation"); SetDescription("Performs morphological operations on an input image channel"); @@ -156,12 +156,12 @@ SetDocExampleParameterValue("structype.ball.yradius", "5"); SetDocExampleParameterValue("filter", "erode"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx index c00828e065..ae025a22be 100644 --- a/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx +++ b/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx @@ -73,7 +73,7 @@ itkTypeMacro(GrayScaleMorphologicalOperation, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("GrayScaleMorphologicalOperation"); SetDescription("Performs morphological operations on a grayscale input image"); @@ -139,12 +139,12 @@ SetDocExampleParameterValue("structype.ball.yradius", "5"); SetDocExampleParameterValue("filter", "erode"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx index 9e26eca335..141ff62a30 100644 --- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx +++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx @@ -121,7 +121,7 @@ private: std::string m_inImageName; bool m_currentEnabledStateOfFluxParam; - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("OpticalCalibration"); SetDescription("Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5, Pleiades, Spot6. For other sensors the application also allows providing calibration parameters manually."); @@ -354,7 +354,7 @@ private: m_currentEnabledStateOfFluxParam=false; } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { std::ostringstream ossOutput; //ossOutput << std::endl << "--DoUpdateParameters--" << std::endl; @@ -558,7 +558,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //Main filters instanciations m_ImageToLuminanceFilter = ImageToLuminanceImageFilterType::New(); diff --git a/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx index dfed506759..2a59b8c74e 100644 --- a/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx +++ b/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx @@ -47,7 +47,7 @@ public: typedef otb::GenericRSTransform<> TransformType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ConvertCartoToGeoPoint"); SetDescription("Convert cartographic coordinates to geographic one."); @@ -88,11 +88,11 @@ private: SetDocExampleParameterValue("mapproj.utm.zone", "31"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the projectionRef std::string inputProjRef = MapProjectionParametersHandler::GetProjectionRefFromChoice(this, "mapproj"); diff --git a/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx index 91efb2578f..8a01ff5c61 100644 --- a/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx +++ b/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx @@ -46,7 +46,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ConvertSensorToGeoPoint"); SetDescription("Sensor to geographic coordinates conversion."); @@ -96,11 +96,11 @@ private: SetDocExampleParameterValue("input.idy","200"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get input Image FloatVectorImageType::Pointer inImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx index 4d98fbf521..ea59c1430a 100644 --- a/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx +++ b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx @@ -54,7 +54,7 @@ public: itkTypeMacro(GenerateRPCSensorModel, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("GenerateRPCSensorModel"); SetDescription("Generate a RPC sensor model from a list of Ground Control Points."); @@ -97,12 +97,12 @@ private: SetDocExampleParameterValue("map.epsg.code","32631"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { OGRMultiLineString mls; diff --git a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx index 6f71f0ff77..d6cf00da8f 100644 --- a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx +++ b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx @@ -101,7 +101,7 @@ private: m_DisplacementFieldCaster = DisplacementFieldCastFilterType::New(); } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("GridBasedImageResampling"); SetDescription("Resamples an image according to a resampling grid"); @@ -183,12 +183,12 @@ private: SetDocExampleParameterValue("grid.type","def"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here } -void DoExecute() +void DoExecute() ITK_OVERRIDE { // Get the input image FloatVectorImageType* inImage = GetParameterImage("io.in"); diff --git a/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx b/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx index 11653420aa..acd93b4472 100644 --- a/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx +++ b/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx @@ -46,7 +46,7 @@ public: <FloatVectorImageType, VectorDataType> EnvelopeFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ImageEnvelope"); SetDescription("Extracts an image envelope."); @@ -84,12 +84,12 @@ private: SetDocExampleParameterValue("out", "ImageEnvelope.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to be done } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer input = GetParameterImage("in"); diff --git a/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx index b78e4f9064..e411fa356e 100644 --- a/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx +++ b/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx @@ -45,11 +45,11 @@ private: { } - virtual ~ObtainUTMZoneFromGeoPoint() + ~ObtainUTMZoneFromGeoPoint() ITK_OVERRIDE { } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ObtainUTMZoneFromGeoPoint"); SetDescription("UTM zone determination from a geographic point."); @@ -79,12 +79,12 @@ private: SetDocExampleParameterValue("lon","124.0"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { int utmZone = otb::Utils::GetZoneFromGeoPoint(GetParameterFloat("lon"), GetParameterFloat("lat")); diff --git a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx index aeaa067795..987586e89a 100644 --- a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx +++ b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx @@ -84,7 +84,7 @@ public: typedef otb::BCOInterpolateImageFunction<FloatVectorImageType> BCOInterpolationType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("OrthoRectification"); std::ostringstream oss; @@ -231,7 +231,7 @@ private: SetDocExampleParameterValue("io.out","QB_Toulouse_ortho.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if (HasValue("io.in")) { @@ -590,7 +590,7 @@ private: } // if (HasValue("io.in")) } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input image FloatVectorImageType* inImage = GetParameterImage("io.in"); diff --git a/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx index e34600f5f1..aacb3bfe2c 100644 --- a/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx +++ b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx @@ -53,7 +53,7 @@ public: itkTypeMacro(RefineSensorModel, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("RefineSensorModel"); SetDescription("Perform least-square fit of a sensor model to a set of tie points"); @@ -100,12 +100,12 @@ private: SetDocExampleParameterValue("map.epsg.code","32631"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { OGRMultiLineString mls; diff --git a/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx index 682ceb7d96..30e0ba020f 100644 --- a/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx +++ b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx @@ -77,7 +77,7 @@ public: private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("RigidTransformResample"); SetDescription("Resample an image with a rigid transform"); @@ -171,12 +171,12 @@ private: SetDocExampleParameterValue("transform.type.rotation.scaley", "2."); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType* inputImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx index dc8661fd03..20cdd5b957 100644 --- a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx +++ b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx @@ -78,7 +78,7 @@ public: FloatVectorImageType> BasicResamplerType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Superimpose"); SetDescription("Using available image metadata, project one image onto another one"); @@ -148,7 +148,7 @@ private: SetDocExampleParameterValue("out", "SuperimposedXS_to_PAN.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if(!HasUserValue("mode") && HasValue("inr") && HasValue("inm") && otb::PleiadesPToXSAffineTransformCalculator::CanCompute(GetParameterImage("inr"),GetParameterImage("inm"))) { @@ -158,7 +158,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the inputs FloatVectorImageType* refImage = GetParameterImage("inr"); diff --git a/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx index a05557666d..f829053c6f 100644 --- a/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx +++ b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx @@ -57,7 +57,7 @@ public: ; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VectorDataReprojection"); std::ostringstream oss; @@ -112,12 +112,12 @@ private: SetDocExampleParameterValue("out.vd","reprojected_vd.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { GetLogger()->Debug("Entering DoExecute\n"); diff --git a/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx b/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx index e68fea82d1..7b6b61e24f 100644 --- a/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx +++ b/Modules/Applications/AppSARCalibration/app/otbSARCalibration.cxx @@ -42,7 +42,7 @@ public: FloatImageType> CalibrationFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SARCalibration"); SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.\n"); @@ -86,12 +86,12 @@ private: SetDocExampleParameterValue("out", "SarRadiometricCalibration.tif" ); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input complex image ComplexFloatImageType* floatComplexImage = GetParameterComplexFloatImage("in"); diff --git a/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx b/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx index 58bae02e5e..b8877b68bb 100644 --- a/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx +++ b/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx @@ -42,7 +42,7 @@ public: FloatImageType> CalibrationFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SarRadiometricCalibration"); SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.\n"); @@ -86,12 +86,12 @@ private: SetDocExampleParameterValue("out", "SarRadiometricCalibration.tif" ); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { otbAppLogWARNING("This application is deprecated, it will be renamed in next" " version of OTB. Please consider using the renamed copy SARCalibration." diff --git a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx index e54c192744..dc0aa92b37 100644 --- a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx +++ b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx @@ -81,7 +81,7 @@ public: itkTypeMacro(SARDecompositions, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SARDecompositions"); SetDescription("From one-band complex images (each one related to an element of the Sinclair matrix), returns the selected decomposition."); @@ -155,12 +155,12 @@ private: SetDocExampleParameterValue("out", "HaA.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { bool inhv = HasUserValue("inhv"); diff --git a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx index c3edee8da6..268b4d855a 100644 --- a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx +++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx @@ -181,7 +181,7 @@ public: itkTypeMacro(SARPolarMatrixConvert, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SARPolarMatrixConvert"); SetDescription("This applications allows converting classical polarimetric matrices to each other."); @@ -351,7 +351,7 @@ private: SetDocExampleParameterValue("outc", "mcoherency.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { int convType = GetParameterInt("conv"); @@ -435,7 +435,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //**************************************** diff --git a/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx b/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx index b1017b3d7e..17f75f4617 100644 --- a/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx +++ b/Modules/Applications/AppSARPolarSynth/app/otbSARPolarSynth.cxx @@ -41,7 +41,7 @@ public: itkTypeMacro(SARPolarSynth, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("SARPolarSynth"); SetDescription("Gives, for each pixel, the power that would have been received by a SAR system with a basis different from the classical (H,V) one (polarimetric synthetis)."); @@ -149,12 +149,12 @@ private: SetDocExampleParameterValue("out", "newbasis.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { m_MCPSFilter = MCPSFilterType::New(); diff --git a/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx index ae569d67e1..8f014d3ecd 100644 --- a/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx +++ b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx @@ -66,7 +66,7 @@ public: <VectorDataType, VectorDataType> VectorDataProjectionFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ConnectedComponentSegmentation"); SetDescription("Connected component segmentation and object based image filtering of the input image according to user-defined criterions."); @@ -117,12 +117,12 @@ private: SetDocExampleParameterValue("out", "ConnectedComponentSegmentation.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { InputVectorImageType::Pointer inputImage = GetParameterImage("in"); diff --git a/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx index 74423df477..d8224dbf51 100644 --- a/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx +++ b/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx @@ -127,7 +127,7 @@ public: <FloatPixelType, Int16PixelType> > HooverColorFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("HooverCompareSegmentation"); SetDescription("Compare two segmentations with Hoover metrics"); @@ -197,12 +197,12 @@ private: SetDocExampleParameterValue("outgt", "maur_colored_GT.tif uint8"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { UInt32ImageType::Pointer inputGT = GetParameterUInt32Image("ingt"); UInt32ImageType::Pointer inputMS = GetParameterUInt32Image("inms"); diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx index f693b50234..39e39d5258 100644 --- a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx +++ b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx @@ -87,7 +87,7 @@ public: LSMSSegmentation(): m_FinalReader(),m_ImportGeoInformationFilter(),m_FilesToRemoveAfterExecute(),m_TmpDirCleanup(false){} - virtual ~LSMSSegmentation(){} + ~LSMSSegmentation() ITK_OVERRIDE{} private: LabelImageReaderType::Pointer m_FinalReader; @@ -211,7 +211,7 @@ private: return vrtfname; } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("LSMSSegmentation"); SetDescription("Second step of the exact Large-Scale Mean-Shift segmentation workflow."); @@ -284,11 +284,11 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { m_FilesToRemoveAfterExecute.clear(); @@ -683,7 +683,7 @@ private: SetParameterOutputImage("out",m_ImportGeoInformationFilter->GetOutput()); } - void AfterExecuteAndWriteOutputs() + void AfterExecuteAndWriteOutputs() ITK_OVERRIDE { // Release input files m_FinalReader = 0; diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx index 64156f9eda..23f3397859 100644 --- a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx +++ b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx @@ -70,7 +70,7 @@ public: private: ChangeLabelImageFilterType::Pointer m_ChangeLabelFilter; - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("LSMSSmallRegionsMerging"); SetDescription("Third (optional) step of the exact Large-Scale Mean-Shift segmentation workflow."); @@ -118,11 +118,11 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { clock_t tic = clock(); diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx index e037361874..df54787f26 100644 --- a/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx +++ b/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx @@ -63,7 +63,7 @@ public: itkTypeMacro(Vectorization, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("LSMSVectorization"); SetDescription("Fourth step of the exact Large-Scale Mean-Shift segmentation workflow."); @@ -102,11 +102,11 @@ private: SetDocExampleParameterValue("tilesizey","256"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { } - void DoExecute() + void DoExecute() ITK_OVERRIDE { clock_t tic = clock(); diff --git a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx index a1fb4bb030..c02e5fab05 100644 --- a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx +++ b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx @@ -43,7 +43,7 @@ public: itkTypeMacro(MeanShiftSmoothing, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("MeanShiftSmoothing"); SetDescription("Perform mean shift filtering"); @@ -115,7 +115,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if(IsParameterEnabled("modesearch")) { @@ -128,7 +128,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType* input = GetParameterImage("in"); diff --git a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx index c726d12e09..3e600c82a7 100644 --- a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx +++ b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx @@ -131,7 +131,7 @@ public: itkTypeMacro(Segmentation, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Segmentation"); SetDescription("Performs segmentation of an image, and output either a raster or a vector file. In vector mode, large input datasets are supported."); @@ -340,7 +340,7 @@ private: SetDocExampleParameterValue("filter", "meanshift",1); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } @@ -441,7 +441,7 @@ private: return streamingVectorizedFilter->GetStreamSize(); } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Switch on segmentation mode const std::string segModeType = GetParameterString("mode"); diff --git a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx index 3307a8f817..92383058a8 100644 --- a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx +++ b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx @@ -121,7 +121,7 @@ private: m_VMedianFilter = MedianFilterType::New(); } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("BlockMatching"); SetDescription("Performs block-matching to estimate pixel-wise disparities between two images"); @@ -321,7 +321,7 @@ private: SetDocExampleParameterValue("io.out","MyDisparity.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if(IsParameterEnabled("mask.variancet") || IsParameterEnabled("mask.nodata")) { @@ -354,7 +354,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatImageType::Pointer leftImage = GetParameterFloatImage("io.inleft"); FloatImageType::Pointer rightImage = GetParameterFloatImage("io.inright"); diff --git a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx index 3f434a7672..894c73e973 100644 --- a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx +++ b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx @@ -59,7 +59,7 @@ private: m_DispToElev = DisparityToElevationFilterType::New(); } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("DisparityMapToElevationMap"); SetDescription("Projects a disparity map into a regular elevation map"); @@ -125,12 +125,12 @@ private: SetDocExampleParameterValue("io.out","dem.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inputDisp = this->GetParameterImage("io.in"); FloatVectorImageType::Pointer sensorLeft = this->GetParameterImage("io.left"); diff --git a/Modules/Applications/AppStereo/app/otbFineRegistration.cxx b/Modules/Applications/AppStereo/app/otbFineRegistration.cxx index 23f993bd3a..33481d3185 100644 --- a/Modules/Applications/AppStereo/app/otbFineRegistration.cxx +++ b/Modules/Applications/AppStereo/app/otbFineRegistration.cxx @@ -111,7 +111,7 @@ public: typedef otb::ImageFileReader<VectorImageType> InternalReaderType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("FineRegistration"); SetDescription("Estimate disparity map between two images."); @@ -225,12 +225,12 @@ private: SetDocExampleParameterValue("mry", "3"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer refImage = GetParameterImage("ref"); // fixed FloatVectorImageType::Pointer secImage = GetParameterImage("sec"); // moved diff --git a/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx b/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx index c6422776ea..0be9121fdf 100644 --- a/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx +++ b/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx @@ -49,7 +49,7 @@ public: private: GeneratePlyFile(){} - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("GeneratePlyFile"); SetDescription("Generate a 3D Ply file from a DEM and a color image."); @@ -87,13 +87,13 @@ private: SetDocExampleParameterValue("incolor","image_color.tif"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Update the UTM zone params MapProjectionParametersHandler::InitializeUTMParameters(this, "incolor", "map"); } - void DoExecute() + void DoExecute() ITK_OVERRIDE { std::string outfname = GetParameterString("out"); diff --git a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx index d1077c56bc..80dbe412d3 100644 --- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx +++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx @@ -312,7 +312,7 @@ private: } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("StereoFramework"); SetDescription("Compute the ground elevation based on one or multiple stereo pair(s)"); @@ -525,7 +525,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { if( HasValue("input.il") ) { @@ -591,7 +591,7 @@ private: } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Setup the DSM Handler otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this, "elev"); diff --git a/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx index d7934029a8..de20a9b507 100644 --- a/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx +++ b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx @@ -96,7 +96,7 @@ private: m_StatisticsFilter = StatisticsFilterType::New(); } - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("StereoRectificationGridGenerator"); SetDescription("Generates two deformation fields to stereo-rectify (i.e. resample in epipolar geometry) a pair of stereo images up to the sensor model precision"); @@ -198,12 +198,12 @@ private: SetDocExampleParameterValue("epi.elevation.default","400"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here } - void DoExecute() + void DoExecute() ITK_OVERRIDE { m_DisplacementFieldSource->SetLeftImage(GetParameterImage("io.inleft")); m_DisplacementFieldSource->SetRightImage(GetParameterImage("io.inright")); diff --git a/Modules/Applications/AppTest/app/otbTestApplication.cxx b/Modules/Applications/AppTest/app/otbTestApplication.cxx index 86d70293e9..e1bfd325fc 100644 --- a/Modules/Applications/AppTest/app/otbTestApplication.cxx +++ b/Modules/Applications/AppTest/app/otbTestApplication.cxx @@ -38,7 +38,7 @@ public: itkTypeMacro(TestApplication, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("TestApplication"); SetDescription("This application helps developers to test parameters types"); @@ -99,12 +99,12 @@ private: SetDocExampleParameterValue("filename", "myFilename.foo"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { //std::cout << "TestApplication::DoUpdateParameters" << std::endl; } - void DoExecute() + void DoExecute() ITK_OVERRIDE { //std::cout << "TestApplication::DoExecute" << std::endl; } diff --git a/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx index 7695115d54..fa14c6dc82 100644 --- a/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx +++ b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx @@ -64,7 +64,7 @@ itkTypeMacro(HaralickTextureExtraction, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("HaralickTextureExtraction"); SetDescription("Computes textures on every pixel of the input image selected channel"); @@ -154,12 +154,12 @@ SetDocExampleParameterValue("texture", "simple"); SetDocExampleParameterValue("out", "HaralickTextures.tif"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx index 8369046672..3fe88a9897 100644 --- a/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx +++ b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx @@ -55,7 +55,7 @@ itkTypeMacro(SFSTextureExtraction, otb::Application); private: -void DoInit() +void DoInit() ITK_OVERRIDE { SetName("SFSTextureExtraction"); SetDescription("Computes Structural Feature Set textures on every pixel of the input image selected channel"); @@ -116,12 +116,12 @@ SetDocExampleParameterValue("parameters.spathre", "100"); SetDocExampleParameterValue("out", "SFSTextures.tif"); } -void DoUpdateParameters() +void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here : all parameters are independent } -void DoExecute() +void DoExecute() ITK_OVERRIDE { FloatVectorImageType::Pointer inImage = GetParameterImage("in"); inImage->UpdateOutputInformation(); diff --git a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx index 045b6b321d..9cacf044be 100644 --- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx +++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx @@ -57,7 +57,7 @@ public: typedef otb::OGRDataSourceToLabelImageFilter<FloatImageType> OGRDataSourceToMapFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("Rasterization"); SetDescription("Rasterize a vector dataset."); @@ -139,13 +139,13 @@ private: SetDocExampleParameterValue("spy","1."); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do } - void DoExecute() + void DoExecute() ITK_OVERRIDE { otb::ogr::DataSource::Pointer ogrDS; UInt8ImageType::Pointer referenceImage; diff --git a/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx b/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx index c7d5c1cb97..5c668497f4 100644 --- a/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx @@ -44,7 +44,7 @@ public: typedef otb::ConcatenateVectorDataFilter<VectorDataType> ConcatenateFilterType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("ConcatenateVectorData"); SetDescription("Concatenate VectorDatas"); @@ -71,12 +71,12 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the input VectorData list VectorDataListType* vectorDataList = GetParameterVectorDataList("vd"); diff --git a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx index e163a34094..3ff6ee10d1 100644 --- a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx @@ -47,7 +47,7 @@ public: typedef otb::OSMDataToVectorDataGenerator VectorDataProviderType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("OSMDownloader"); SetDescription("Generate a vector data from OSM on the input image extend"); @@ -91,7 +91,7 @@ private: } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // CASE: when the -print option is not required and the User // does not set the option OSMKey or the option Output or does not @@ -108,7 +108,7 @@ private: } } - void DoExecute() + void DoExecute() ITK_OVERRIDE { typedef otb::ImageToEnvelopeVectorDataFilter<FloatVectorImageType, VectorDataType> EnvelopeFilterType; diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx index 3084e59302..95e1ef3968 100644 --- a/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx @@ -62,7 +62,7 @@ public: typedef otb::RemoteSensingRegion<double> RemoteSensingRegionType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VectorDataExtractROI"); SetDescription("Perform an extract ROI on the input vector data according to the input image extent"); @@ -100,12 +100,12 @@ private: SetDocExampleParameterValue("io.out", "apTvUtVectorDataExtractROIApplicationTest.shp"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do here for the parameters : all are independent } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the inputs VectorDataType* vd = GetParameterVectorData("io.vd"); diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx index 6f0d0ef888..570c269fd7 100644 --- a/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx @@ -40,7 +40,7 @@ public: itkTypeMacro(VectorDataSetField, otb::Application); private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VectorDataSetField"); SetDescription("Set a field in vector data."); @@ -71,12 +71,12 @@ private: SetDocExampleParameterValue("fv", "Sample polygon"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // Nothing to do (for now) } - void DoExecute() + void DoExecute() ITK_OVERRIDE { m_InputData = GetParameterVectorData("in"); diff --git a/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx index 3fb4a0aeef..089d05813f 100644 --- a/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx @@ -51,7 +51,7 @@ public: typedef itk::CenteredSimilarity2DTransform<double> TransformType; private: - void DoInit() + void DoInit() ITK_OVERRIDE { SetName("VectorDataTransform"); SetDescription("Apply a transform to each vertex of the input VectorData"); @@ -106,12 +106,12 @@ private: SetDocExampleParameterValue("transform.ro", "5"); } - void DoUpdateParameters() + void DoUpdateParameters() ITK_OVERRIDE { // nothing to update } - void DoExecute() + void DoExecute() ITK_OVERRIDE { // Get the support image FloatVectorImageType* inImage = GetParameterImage("in"); -- GitLab