From 02f2a97dda87d8d38536ea46695366a95f7e6566 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 31 Dec 2017 16:38:51 -0600 Subject: [PATCH 1/5] STYLE: Remove CMake-language block-end command arguments Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. --- ANTS.cmake | 16 ++++++++-------- Examples/CMakeLists.txt | 14 +++++++------- Examples/TestSuite/CMakeLists.txt | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ANTS.cmake b/ANTS.cmake index f23a13f0d..ef3ba9eb5 100644 --- a/ANTS.cmake +++ b/ANTS.cmake @@ -68,7 +68,7 @@ if(USE_VTK) vtkImagingGeneral vtkRenderingAnnotation ) - else(VTK_VERSION_MAJOR GREATER 6) + else() find_package(VTK COMPONENTS vtkRenderingVolumeOpenGL vtkCommonCore vtkCommonDataModel @@ -80,16 +80,16 @@ if(USE_VTK) vtkImagingStencil vtkImagingGeneral vtkRenderingAnnotation) - endif(VTK_VERSION_MAJOR GREATER 6) + endif() if(VTK_FOUND) include(${VTK_USE_FILE}) include_directories(${VTK_INCLUDE_DIRS}) set(INIT_VTK_LIBRARIES ${VTK_LIBRARIES}) - else(VTK_FOUND) + else() message("Cannot build some programs without VTK. Please set VTK_DIR if you need these programs.") - endif(VTK_FOUND) -endif(USE_VTK) + endif() +endif() # With MS compilers on Win64, we need the /bigobj switch, else generated # code results in objects with number of sections exceeding object file @@ -106,11 +106,11 @@ if (ITK_USE_FFTWD OR ITK_USE_FFTWF) if(ITK_USE_SYSTEM_FFTW) find_package( FFTW ) link_directories(${FFTW_LIBDIR}) - else(ITK_USE_SYSTEM_FFTW) + else() link_directories(${ITK_DIR}/fftw/lib) include_directories(${ITK_DIR}/fftw/include) - endif(ITK_USE_SYSTEM_FFTW) -endif(ITK_USE_FFTWD OR ITK_USE_FFTWF) + endif() +endif() # These are configure time options that specify which # subset of tests should be run diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index f235b82f3..50cedc288 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -160,13 +160,13 @@ if (BUILD_ALL_ANTS_APPS) foreach(ANTS_APP ${MORE_ANTS_APPS}) STANDARD_ANTS_BUILD(${ANTS_APP} "") endforeach() -else(BUILD_ALL_ANTS_APPS) +else() foreach(ANTS_APP ${MORE_ANTS_APPS}) if(ANTS_BUILD_${ANTS_APP}) STANDARD_ANTS_BUILD(${ANTS_APP} "") endif() endforeach() -endif(BUILD_ALL_ANTS_APPS) +endif() if(USE_VTK) @@ -185,7 +185,7 @@ set(VTK_ANTS_APPS foreach(ANTS_APP ${VTK_ANTS_APPS}) STANDARD_ANTS_BUILD(${ANTS_APP} "${VTK_LIBRARIES}") endforeach() -endif(USE_VTK) +endif() install(PROGRAMS ../Scripts/ANTSpexec.sh ../Scripts/antsASLProcessing.sh @@ -221,17 +221,17 @@ if( COPY_SCRIPT_FILES_TO_BIN_DIR ) foreach( SCRIPT_FILE ${SCRIPT_FILES} ) message( " Copying ${SCRIPT_FILE} to ${CMAKE_CURRENT_BINARY_DIR}/../../bin/" ) CONFIGURE_FILE( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) - endforeach( SCRIPT_FILE ) + endforeach() foreach( SCRIPT_FILE ${PSCRIPT_FILES} ) message( " Copying ${SCRIPT_FILE} to ${CMAKE_CURRENT_BINARY_DIR}/../../bin/" ) CONFIGURE_FILE( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) - endforeach( SCRIPT_FILE ) -endif( COPY_SCRIPT_FILES_TO_BIN_DIR ) + endforeach() +endif() ## Build test option if(BUILD_TESTING) add_subdirectory(TestSuite) -endif(BUILD_TESTING) +endif() set(CPACK_PACKAGE_NAME "ANTs") set(CPACK_PACKAGE_VENDOR "CMake.org") diff --git a/Examples/TestSuite/CMakeLists.txt b/Examples/TestSuite/CMakeLists.txt index dee570f11..f583f847e 100644 --- a/Examples/TestSuite/CMakeLists.txt +++ b/Examples/TestSuite/CMakeLists.txt @@ -29,7 +29,7 @@ macro(MakeTestDriverFromANTSbinary ANTSbinaryName ANTSbinaryTestSourceName ANTS_ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) -endmacro(MakeTestDriverFromANTSbinary ANTSbinaryName) +endmacro() #----------------------------------------------------------------------- # Setup locations to find externally maintained test data. @@ -949,7 +949,7 @@ endif() ############ End of CompositeTransformUtil tests################# -endif(RUN_LONG_TESTS) +endif() ############################################################## ############################################################## @@ -1075,11 +1075,11 @@ ExternalData_expand_arguments(${PROJECT_NAME}FetchData C_IMAGE DATA{${SMALL_DATA include(ANTS_SYN_WITH_TIME_test.cmake) include(APOC_OTSU_INIT_test.cmake) -endif(RUN_LONG_TESTS) +endif() include(ANTS_PSE_MSQ_TXT_test.cmake) include(ANTS_PSE_MSQ_VTK_test.cmake) -endif(RUN_SHORT_TESTS) +endif() ExternalData_add_target( ${PROJECT_NAME}FetchData ) # Name of data management target From 2ff3c96478786f131a1282c38bda0ddabef786b1 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 31 Dec 2017 16:38:58 -0600 Subject: [PATCH 2/5] STYLE: Convert CMake-language commands to lower case Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. --- CMake/ProjectSourceVersion.cmake | 2 +- CMakeLists.txt | 2 +- Common.cmake | 16 ++++++++-------- Examples/CMakeLists.txt | 6 +++--- SuperBuild/External_VTK_patch.cmake | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMake/ProjectSourceVersion.cmake b/CMake/ProjectSourceVersion.cmake index 7ec1092a2..93a0a5f4f 100644 --- a/CMake/ProjectSourceVersion.cmake +++ b/CMake/ProjectSourceVersion.cmake @@ -106,7 +106,7 @@ if(_GIT_VERSION VERSION_EQUAL _${CMAKE_PROJECT_NAME}_VERSION) else() # The first commit after a tag should increase the project version # number in Version.cmake and be "dev1" - MATH(EXPR _GIT_VERSION_COUNT "${_GIT_VERSION_COUNT}+1") + math(EXPR _GIT_VERSION_COUNT "${_GIT_VERSION_COUNT}+1") set(_GIT_VERSION_DEV "${_GIT_VERSION_COUNT}") endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e2b2c0cc..2d889a3b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(LIBRARY_SOVERSION_INFO 2) set(LIBRARY_VERSION_INFO 2.2.0) set(LOCAL_PROJECT_NAME ANTS) -INCLUDE(InstallRequiredSystemLibraries) +include(InstallRequiredSystemLibraries) ## NOTE THERE SHOULD BE NO PROJECT STATEMENT HERE! ## This file acts as a simple switch to initiate ## two completely independant CMake build environments. diff --git a/Common.cmake b/Common.cmake index 89ec22f43..69e818443 100644 --- a/Common.cmake +++ b/Common.cmake @@ -25,14 +25,14 @@ set(ANTS_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) ###################################################################################################### # BA - add this stuff to help installation of ANTsR -# SET(CMAKE_SKIP_BUILD_RPATH FALSE) -# SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -# SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -# SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -# LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) -# IF("${isSystemDir}" STREQUAL "-1") -# SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -# ENDIF("${isSystemDir}" STREQUAL "-1") +# set(CMAKE_SKIP_BUILD_RPATH FALSE) +# set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) +# if("${isSystemDir}" STREQUAL "-1") +# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +# endif("${isSystemDir}" STREQUAL "-1") ##################################################################################################### set(USE_ITKv4 ON) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 50cedc288..09ebedb80 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -25,7 +25,7 @@ macro(STANDARD_ANTS_BUILD ANTS_FUNCTION_NAME EXTRA_LIBS) set( ANTS_FUNCTION_NAME ${ANTS_FUNCTION_NAME} ) add_library(l_${ANTS_FUNCTION_NAME} ${ANTS_FUNCTION_NAME}.cxx) - SET_TARGET_PROPERTIES(l_${ANTS_FUNCTION_NAME} PROPERTIES + set_target_properties(l_${ANTS_FUNCTION_NAME} PROPERTIES SOVERSION ${LIBRARY_SOVERSION_INFO} VERSION ${LIBRARY_VERSION_INFO}) message(STATUS "${ANTS_FUNCTION_NAME} ${EXTRA_LIBS}") target_link_libraries(l_${ANTS_FUNCTION_NAME} antsUtilities ${EXTRA_LIBS} ) @@ -220,11 +220,11 @@ if( COPY_SCRIPT_FILES_TO_BIN_DIR ) file( GLOB PSCRIPT_FILES "../Scripts/*.pl" ) foreach( SCRIPT_FILE ${SCRIPT_FILES} ) message( " Copying ${SCRIPT_FILE} to ${CMAKE_CURRENT_BINARY_DIR}/../../bin/" ) - CONFIGURE_FILE( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) + configure_file( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) endforeach() foreach( SCRIPT_FILE ${PSCRIPT_FILES} ) message( " Copying ${SCRIPT_FILE} to ${CMAKE_CURRENT_BINARY_DIR}/../../bin/" ) - CONFIGURE_FILE( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) + configure_file( ${SCRIPT_FILE} ${CMAKE_CURRENT_BINARY_DIR}/../../bin/ COPYONLY ) endforeach() endif() diff --git a/SuperBuild/External_VTK_patch.cmake b/SuperBuild/External_VTK_patch.cmake index 0708121fa..d1d5dedb9 100644 --- a/SuperBuild/External_VTK_patch.cmake +++ b/SuperBuild/External_VTK_patch.cmake @@ -5,11 +5,11 @@ file(READ ${vtkDetCFLAGS} code) string(REPLACE -"SET(VTK_REQUIRED_C_FLAGS \"\${VTK_REQUIRED_C_FLAGS} -mlong-branch\")" +"set(VTK_REQUIRED_C_FLAGS \"\${VTK_REQUIRED_C_FLAGS} -mlong-branch\")" "" code "${code}") string(REPLACE -"SET(VTK_REQUIRED_CXX_FLAGS \"\${VTK_REQUIRED_CXX_FLAGS} -mlong-branch\")" +"set(VTK_REQUIRED_CXX_FLAGS \"\${VTK_REQUIRED_CXX_FLAGS} -mlong-branch\")" "" code "${code}") From 6c8f7ffdd6ffdd480f485a77082c9d109d7da137 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 31 Dec 2017 16:37:15 -0600 Subject: [PATCH 3/5] COMP: Prepare for C++11 features in ITKv5 ITKv5 is going to require C++11 so require newer versions of cmake features. --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d889a3b7..e7ac65d29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,12 @@ -cmake_minimum_required(VERSION 2.8.9) -cmake_policy(VERSION 2.8.9) +if(CMAKE_CXX_STANDARD) + #if CMAKE_CXX_STANDARD is requested, then require + #new version of cmake to force C++11 that can + #improve support of C++11 features. + cmake_minimum_required(VERSION 3.8.2 FATAL_ERROR) +else() + cmake_minimum_required(VERSION 2.8.9) + cmake_policy(VERSION 2.8.9) +endif() find_program(CCACHE_PROGRAM ccache) if(CCACHE_PROGRAM) From 644b9e3a2d5a9b5cc2ab930862ac35ac4827353f Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 31 Dec 2017 17:23:12 -0600 Subject: [PATCH 4/5] ENH: Avoid duplicate ccache calls. On computers that have ccache install, this was silently trying to use ccache to do the the builds. However, if problems arose due to ccache, the failure errors were very difficult to resolve. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7ac65d29..519db0290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,13 @@ else() cmake_policy(VERSION 2.8.9) endif() -find_program(CCACHE_PROGRAM ccache) -if(CCACHE_PROGRAM) +option(ANTS_BUILD_WITH_CCACHE "Build ${LOCAL_PROJECT_NAME} using ccache if available." ON) +mark_as_advanced(ANTS_BUILD_WITH_CCACHE) +if(ANTS_BUILD_WITH_CCACHE) + find_program(CCACHE_PROGRAM ccache) + if(CCACHE_PROGRAM) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") + endif() endif() set(LIBRARY_SOVERSION_INFO 2) From 477cf4c2c848bf0a53b6dfc3ad1823e6e391e530 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 1 Jan 2018 15:27:05 -0600 Subject: [PATCH 5/5] COMP: Add ITK_OVERRIDE for improved compile time validation When building with C++11 the compiler can provide additional validation for overriden functions --- Examples/itkantsRegistrationHelper.h | 2 +- ImageRegistration/itkANTSAffine3DTransform.h | 10 +++++----- .../itkANTSCenteredAffine2DTransform.h | 10 +++++----- .../itkANTSImageRegistrationOptimizer.h | 2 +- ImageRegistration/itkANTSImageTransformation.h | 2 +- ...tkAvantsMutualInformationRegistrationFunction.h | 14 +++++++------- .../itkAvantsPDEDeformableRegistrationFunction.h | 4 ++-- .../itkCrossCorrelationRegistrationFunction.h | 14 +++++++------- ...kExpectationBasedPointSetRegistrationFunction.h | 14 +++++++------- .../itkLabelImageGenericInterpolateImageFunction.h | 6 +++--- ImageRegistration/itkLabelSelectionAdaptor.h | 2 +- .../itkPICSLAdvancedNormalizationToolKit.h | 2 +- .../itkProbabilisticRegistrationFunction.h | 14 +++++++------- ...kSpatialMutualInformationRegistrationFunction.h | 14 +++++++------- .../itkSyNDemonsRegistrationFunction.h | 14 +++++++------- ...rParameterizedNeighborhoodOperatorImageFilter.h | 6 +++--- .../antsAtroposSegmentationImageFilter.h | 2 +- .../antsBoxPlotQuantileListSampleFilter.h | 4 ++-- ImageSegmentation/antsGaussianListSampleFunction.h | 6 +++--- .../antsGrubbsRosnerListSampleFilter.h | 4 ++-- .../antsHistogramParzenWindowsListSampleFunction.h | 6 +++--- ...amParzenShapeAndOrientationListSampleFunction.h | 6 +++--- ImageSegmentation/antsListSampleFunction.h | 4 ++-- .../antsListSampleToListSampleFilter.h | 6 +++--- .../antsLogEuclideanGaussianListSampleFunction.h | 6 +++--- .../antsManifoldParzenWindowsListSampleFunction.h | 6 +++--- .../antsPartialVolumeGaussianListSampleFunction.h | 6 +++--- .../itkWeightedVotingFusionImageFilter.h | 2 +- Temporary/antsFastMarchingImageFilter.h | 6 +++--- Temporary/itkDivideByConstantImageFilter.h | 2 +- ...eanSquaresPointSetToPointSetIntensityMetricv4.h | 12 ++++++------ Temporary/itkMultiplyByConstantImageFilter.h | 2 +- Tensor/itkExpTensorImageFilter.h | 2 +- Tensor/itkLogTensorImageFilter.h | 2 +- ...ncipalDirectionTensorReorientationImageFilter.h | 2 +- Utilities/ReadWriteData.h | 4 ++-- Utilities/antsCommandLineOption.h | 4 ++-- Utilities/antsCommandLineParser.h | 2 +- Utilities/antsMatrixUtilities.h | 2 +- Utilities/antsSCCANObject.h | 2 +- .../itkAdaptiveNonLocalMeansDenoisingImageFilter.h | 2 +- .../itkAlternatingValueDifferenceImageFilter.h | 10 +++++----- ...kAlternatingValueSimpleSubtractionImageFilter.h | 8 ++++---- Utilities/itkAverageOverDimensionImageFilter.h | 6 +++--- Utilities/itkDecomposeTensorFunction.h | 2 +- .../itkDeformationFieldGradientTensorImageFilter.h | 4 ++-- Utilities/itkDeterminantTensorImageFilter.h | 2 +- Utilities/itkDiReCTImageFilter.h | 2 +- .../itkDisplacementFieldFromMultiTransformFilter.h | 10 +++++----- .../itkGeneralToBSplineDisplacementFieldFilter.h | 2 +- .../itkGeometricJacobianDeterminantImageFilter.h | 4 ++-- .../itkImageIntensityAndGradientToPointSetFilter.h | 4 ++-- Utilities/itkLabelOverlapMeasuresImageFilter.h | 2 +- Utilities/itkLabelPerimeterEstimationCalculator.h | 2 +- Utilities/itkLabeledPointSetFileReader.h | 2 +- Utilities/itkLabeledPointSetFileWriter.h | 2 +- Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h | 10 +++++----- ...tkNeighborhoodFirstOrderStatisticsImageFilter.h | 2 +- Utilities/itkNonLocalPatchBasedImageFilter.h | 2 +- Utilities/itkNonLocalSuperresolutionImageFilter.h | 2 +- ...terialSpinLabeledCerebralBloodFlowImageFilter.h | 4 ++-- Utilities/itkSliceTimingCorrectionImageFilter.h | 10 +++++----- .../itkSplitAlternatingTimeSeriesImageFilter.h | 6 +++--- Utilities/itkSurfaceCurvatureBase.h | 2 +- Utilities/itkSurfaceImageCurvature.h | 2 +- Utilities/itkVarianceImageFilter.h | 2 +- Utilities/itkVectorFieldGradientImageFunction.h | 8 ++++---- Utilities/itkWarpImageMultiTransformFilter.h | 10 +++++----- 68 files changed, 177 insertions(+), 177 deletions(-) diff --git a/Examples/itkantsRegistrationHelper.h b/Examples/itkantsRegistrationHelper.h index 7de98e348..aff969986 100644 --- a/Examples/itkantsRegistrationHelper.h +++ b/Examples/itkantsRegistrationHelper.h @@ -792,7 +792,7 @@ class RegistrationHelper : public itk::Object protected: RegistrationHelper(); - virtual ~RegistrationHelper(); + virtual ~RegistrationHelper() ITK_OVERRIDE; private: typename itk::ImageBase::Pointer GetShrinkImageOutputInformation(const itk::ImageBase * inputImageInformation, diff --git a/ImageRegistration/itkANTSAffine3DTransform.h b/ImageRegistration/itkANTSAffine3DTransform.h index 827e9c5fc..c7cf0c982 100644 --- a/ImageRegistration/itkANTSAffine3DTransform.h +++ b/ImageRegistration/itkANTSAffine3DTransform.h @@ -99,7 +99,7 @@ class ANTSAffine3DTransform : itkGetConstReferenceMacro( K3, TScalarType ); /** Set the parameters to the IdentityTransform */ - virtual void SetIdentity() ITK_OVERRIDE; + void SetIdentity() ITK_OVERRIDE; /** Set the transformation from a container of parameters. * This is typically used by optimizers. @@ -126,20 +126,20 @@ class ANTSAffine3DTransform : * Get local Jacobian for the given point * \c j will sized properly as needed. */ - virtual void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE; + void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE; protected: /* ANTSAffine3DTransform(const MatrixType &matrix, */ /* const OutputVectorType &offset); */ ANTSAffine3DTransform(unsigned int outputDims, unsigned int paramDims); ANTSAffine3DTransform(); - ~ANTSAffine3DTransform() + virtual ~ANTSAffine3DTransform() ITK_OVERRIDE { }; - virtual void ComputeMatrix() ITK_OVERRIDE; + void ComputeMatrix() ITK_OVERRIDE; - virtual void ComputeMatrixParameters() ITK_OVERRIDE; + void ComputeMatrixParameters() ITK_OVERRIDE; void SetVarRotation(const VnlQuaternionType & rotation) { diff --git a/ImageRegistration/itkANTSCenteredAffine2DTransform.h b/ImageRegistration/itkANTSCenteredAffine2DTransform.h index cb3239e94..db933cf30 100644 --- a/ImageRegistration/itkANTSCenteredAffine2DTransform.h +++ b/ImageRegistration/itkANTSCenteredAffine2DTransform.h @@ -174,7 +174,7 @@ class ANTSCenteredAffine2DTransform : * Get local Jacobian for the given point * \c j will sized properly as needed. */ - virtual void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE; + void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & j) const ITK_OVERRIDE; /** * This method creates and returns a new ANTSCenteredAffine2DTransform object @@ -189,7 +189,7 @@ class ANTSCenteredAffine2DTransform : void CloneTo( Pointer & clone ) const; /** Reset the parameters to create and identity transform. */ - virtual void SetIdentity() ITK_OVERRIDE; + void SetIdentity() ITK_OVERRIDE; protected: // Rigid2DTransform(); @@ -200,7 +200,7 @@ class ANTSCenteredAffine2DTransform : ANTSCenteredAffine2DTransform( unsigned int outputSpaceDimension, unsigned int parametersDimension); // ~Rigid2DTransform(); - ~ANTSCenteredAffine2DTransform(); + virtual ~ANTSCenteredAffine2DTransform() ITK_OVERRIDE; /** * Print contents of an ANTSCenteredAffine2DTransform @@ -210,13 +210,13 @@ class ANTSCenteredAffine2DTransform : /** Compute the matrix from angle. This is used in Set methods * to update the underlying matrix whenever a transform parameter * is changed. */ - virtual void ComputeMatrix() ITK_OVERRIDE; + void ComputeMatrix() ITK_OVERRIDE; /** Compute the angle from the matrix. This is used to compute * transform parameters from a given matrix. This is used in * MatrixOffsetTransformBase::Compose() and * MatrixOffsetTransformBase::GetInverse(). */ - virtual void ComputeMatrixParameters() ITK_OVERRIDE; + void ComputeMatrixParameters() ITK_OVERRIDE; /** Update angle without recomputation of other internal variables. */ void SetVarAngle( TScalarType angle ) diff --git a/ImageRegistration/itkANTSImageRegistrationOptimizer.h b/ImageRegistration/itkANTSImageRegistrationOptimizer.h index cd9a2418b..7f3055293 100644 --- a/ImageRegistration/itkANTSImageRegistrationOptimizer.h +++ b/ImageRegistration/itkANTSImageRegistrationOptimizer.h @@ -2091,7 +2091,7 @@ class ANTSImageRegistrationOptimizer } ANTSImageRegistrationOptimizer(); - virtual ~ANTSImageRegistrationOptimizer() + virtual ~ANTSImageRegistrationOptimizer() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkANTSImageTransformation.h b/ImageRegistration/itkANTSImageTransformation.h index 1a6efe771..a708bb1ba 100644 --- a/ImageRegistration/itkANTSImageTransformation.h +++ b/ImageRegistration/itkANTSImageTransformation.h @@ -165,7 +165,7 @@ class ANTSImageTransformation itkBooleanMacro( WriteComponentImages ); protected: ANTSImageTransformation(); - virtual ~ANTSImageTransformation() + virtual ~ANTSImageTransformation() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h b/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h index ea1c07eb8..cc173c683 100644 --- a/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h +++ b/ImageRegistration/itkAvantsMutualInformationRegistrationFunction.h @@ -194,14 +194,14 @@ class AvantsMutualInformationRegistrationFunction : } /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void *itkNotUsed(GlobalData) ) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void *itkNotUsed(GlobalData) ) const ITK_OVERRIDE { return 1; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -212,13 +212,13 @@ class AvantsMutualInformationRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE { delete (GlobalDataStruct *) GlobalData; } /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; typedef double CoordinateRepresentationType; @@ -494,7 +494,7 @@ class AvantsMutualInformationRegistrationFunction : return this->m_Energy; } - virtual VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, + VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -584,7 +584,7 @@ class AvantsMutualInformationRegistrationFunction : return (double) this->m_Padding + windowTerm * (float)(this->m_NumberOfHistogramBins - this->m_Padding); } - virtual VectorType ComputeUpdate(const NeighborhoodType & neighborhood, + VectorType ComputeUpdate(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -688,7 +688,7 @@ class AvantsMutualInformationRegistrationFunction : protected: AvantsMutualInformationRegistrationFunction(); - virtual ~AvantsMutualInformationRegistrationFunction() + virtual ~AvantsMutualInformationRegistrationFunction() ITK_OVERRIDE { }; void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; diff --git a/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h b/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h index 117495306..1e722166a 100644 --- a/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h +++ b/ImageRegistration/itkAvantsPDEDeformableRegistrationFunction.h @@ -224,7 +224,7 @@ class AvantsPDEDeformableRegistrationFunction : return update * this->m_GradientStep; } - virtual VectorType ComputeUpdate(const NeighborhoodType & neighborhood, + VectorType ComputeUpdate(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -318,7 +318,7 @@ class AvantsPDEDeformableRegistrationFunction : this->m_RobustnessParameter = -1.e12; } - ~AvantsPDEDeformableRegistrationFunction() + virtual ~AvantsPDEDeformableRegistrationFunction() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkCrossCorrelationRegistrationFunction.h b/ImageRegistration/itkCrossCorrelationRegistrationFunction.h index 6e9f4da35..feae3b0e1 100644 --- a/ImageRegistration/itkCrossCorrelationRegistrationFunction.h +++ b/ImageRegistration/itkCrossCorrelationRegistrationFunction.h @@ -143,14 +143,14 @@ class CrossCorrelationRegistrationFunction : typename TDisplacementField::PixelType vec ); /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void * /* GlobalData */) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void * /* GlobalData */) const ITK_OVERRIDE { return m_TimeStep; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -158,7 +158,7 @@ class CrossCorrelationRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE { //HACK: This code is suspicous and a possible source of // very difficult to diagnose failures. @@ -170,7 +170,7 @@ class CrossCorrelationRegistrationFunction : } /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; double ComputeCrossCorrelation() { @@ -276,7 +276,7 @@ class CrossCorrelationRegistrationFunction : m_FixedImageMask = img; } - virtual VectorType ComputeUpdate(const NeighborhoodType & neighborhood, + VectorType ComputeUpdate(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -294,7 +294,7 @@ class CrossCorrelationRegistrationFunction : return update; } - virtual VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, + VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -341,7 +341,7 @@ class CrossCorrelationRegistrationFunction : protected: CrossCorrelationRegistrationFunction(); - ~CrossCorrelationRegistrationFunction() + virtual ~CrossCorrelationRegistrationFunction() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h b/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h index 404898eaa..9e6f0200c 100644 --- a/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h +++ b/ImageRegistration/itkExpectationBasedPointSetRegistrationFunction.h @@ -152,14 +152,14 @@ class ExpectationBasedPointSetRegistrationFunction : MovingImageGradientCalculatorPointer; /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData) ) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData) ) const ITK_OVERRIDE { return m_TimeStep; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -170,21 +170,21 @@ class ExpectationBasedPointSetRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE; + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE; void ExpectationLandmarkField(float weight, bool whichdirection); void FastExpectationLandmarkField(float weight, bool whichdirection, long whichlabel, bool dobsp); /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; /** This method is called by a finite difference solver image filter at * each pixel that does not lie on a data set boundary */ - virtual PixelType ComputeUpdate(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( + PixelType ComputeUpdate(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( 0.0) ) ITK_OVERRIDE; - virtual PixelType ComputeUpdateInv(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( + PixelType ComputeUpdateInv(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( 0.0) ) ITK_OVERRIDE; /** Get the metric value. The metric value is the mean square difference @@ -246,7 +246,7 @@ class ExpectationBasedPointSetRegistrationFunction : protected: ExpectationBasedPointSetRegistrationFunction(); - ~ExpectationBasedPointSetRegistrationFunction() + virtual ~ExpectationBasedPointSetRegistrationFunction() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkLabelImageGenericInterpolateImageFunction.h b/ImageRegistration/itkLabelImageGenericInterpolateImageFunction.h index 8bb463b09..881f59610 100644 --- a/ImageRegistration/itkLabelImageGenericInterpolateImageFunction.h +++ b/ImageRegistration/itkLabelImageGenericInterpolateImageFunction.h @@ -63,17 +63,17 @@ class LabelImageGenericInterpolateImageFunction : /** * Evaluate at the given index */ - virtual OutputType EvaluateAtContinuousIndex( + OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & cindex ) const ITK_OVERRIDE { return this->EvaluateAtContinuousIndex( cindex, NULL ); } - virtual void SetInputImage( const TInputImage *image ) ITK_OVERRIDE; + void SetInputImage( const TInputImage *image ) ITK_OVERRIDE; protected: LabelImageGenericInterpolateImageFunction(); - ~LabelImageGenericInterpolateImageFunction(){}; + virtual ~LabelImageGenericInterpolateImageFunction() ITK_OVERRIDE{}; std::vector m_InternalInterpolators; std::vector m_LabelSelectionAdaptors; diff --git a/ImageRegistration/itkLabelSelectionAdaptor.h b/ImageRegistration/itkLabelSelectionAdaptor.h index 1b66c8c70..247270b46 100644 --- a/ImageRegistration/itkLabelSelectionAdaptor.h +++ b/ImageRegistration/itkLabelSelectionAdaptor.h @@ -80,7 +80,7 @@ class ITK_EXPORT LabelSelectionImageAdaptor:public protected: LabelSelectionImageAdaptor() {} - virtual ~LabelSelectionImageAdaptor() {} + virtual ~LabelSelectionImageAdaptor() ITK_OVERRIDE {} private: LabelSelectionImageAdaptor(const Self &); //purposely not implemented diff --git a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h index 5bc67dade..d99c513e4 100644 --- a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h +++ b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h @@ -101,7 +101,7 @@ class PICSLAdvancedNormalizationToolKit protected: PICSLAdvancedNormalizationToolKit(); - virtual ~PICSLAdvancedNormalizationToolKit() + virtual ~PICSLAdvancedNormalizationToolKit() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkProbabilisticRegistrationFunction.h b/ImageRegistration/itkProbabilisticRegistrationFunction.h index e6bb318e3..648891974 100644 --- a/ImageRegistration/itkProbabilisticRegistrationFunction.h +++ b/ImageRegistration/itkProbabilisticRegistrationFunction.h @@ -143,14 +143,14 @@ class ProbabilisticRegistrationFunction : typename TDisplacementField::PixelType vec ); /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void * /* GlobalData */) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void * /* GlobalData */) const ITK_OVERRIDE { return m_TimeStep; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -158,7 +158,7 @@ class ProbabilisticRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE { //HACK: The signature of this function should be reconsidered // a delete of a re-interpret cast is a dangerous @@ -167,7 +167,7 @@ class ProbabilisticRegistrationFunction : } /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; /** Set the object's state before each iteration. */ void InitializeIterationOld(); @@ -271,7 +271,7 @@ class ProbabilisticRegistrationFunction : m_FixedImageMask = img; } - virtual VectorType ComputeUpdate(const NeighborhoodType & neighborhood, + VectorType ComputeUpdate(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -289,7 +289,7 @@ class ProbabilisticRegistrationFunction : return update; } - virtual VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, + VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -318,7 +318,7 @@ class ProbabilisticRegistrationFunction : float m_TEMP; protected: ProbabilisticRegistrationFunction(); - ~ProbabilisticRegistrationFunction() + virtual ~ProbabilisticRegistrationFunction() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h b/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h index c73730c54..0af29183b 100644 --- a/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h +++ b/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h @@ -191,14 +191,14 @@ class SpatialMutualInformationRegistrationFunction : } /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void *itkNotUsed(GlobalData) ) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void *itkNotUsed(GlobalData) ) const ITK_OVERRIDE { return 1; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -209,13 +209,13 @@ class SpatialMutualInformationRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE { delete (GlobalDataStruct *) GlobalData; } /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; typedef double CoordinateRepresentationType; @@ -451,7 +451,7 @@ class SpatialMutualInformationRegistrationFunction : return this->m_Energy; } - virtual VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, + VectorType ComputeUpdateInv(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -548,7 +548,7 @@ class SpatialMutualInformationRegistrationFunction : return (double) this->m_Padding + windowTerm * (float)(this->m_NumberOfHistogramBins - this->m_Padding); } - virtual VectorType ComputeUpdate(const NeighborhoodType & neighborhood, + VectorType ComputeUpdate(const NeighborhoodType & neighborhood, void * /* globalData */, const FloatOffsetType & /* offset */ = FloatOffsetType(0.0) ) ITK_OVERRIDE { @@ -666,7 +666,7 @@ class SpatialMutualInformationRegistrationFunction : protected: SpatialMutualInformationRegistrationFunction(); - virtual ~SpatialMutualInformationRegistrationFunction() + virtual ~SpatialMutualInformationRegistrationFunction() ITK_OVERRIDE { }; void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; diff --git a/ImageRegistration/itkSyNDemonsRegistrationFunction.h b/ImageRegistration/itkSyNDemonsRegistrationFunction.h index dae45b004..230447ac1 100644 --- a/ImageRegistration/itkSyNDemonsRegistrationFunction.h +++ b/ImageRegistration/itkSyNDemonsRegistrationFunction.h @@ -131,14 +131,14 @@ class SyNDemonsRegistrationFunction : } /** This class uses a constant timestep of 1. */ - virtual TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData) ) const ITK_OVERRIDE + TimeStepType ComputeGlobalTimeStep(void * itkNotUsed(GlobalData) ) const ITK_OVERRIDE { return m_TimeStep; } /** Return a pointer to a global data structure that is passed to * this object from the solver at each calculation. */ - virtual void * GetGlobalDataPointer() const ITK_OVERRIDE + void * GetGlobalDataPointer() const ITK_OVERRIDE { GlobalDataStruct *global = new GlobalDataStruct(); @@ -149,18 +149,18 @@ class SyNDemonsRegistrationFunction : } /** Release memory for global data structure. */ - virtual void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE; + void ReleaseGlobalDataPointer( void *GlobalData ) const ITK_OVERRIDE; /** Set the object's state before each iteration. */ - virtual void InitializeIteration() ITK_OVERRIDE; + void InitializeIteration() ITK_OVERRIDE; /** This method is called by a finite difference solver image filter at * each pixel that does not lie on a data set boundary */ - virtual PixelType ComputeUpdate(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = + PixelType ComputeUpdate(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( 0.0) ) ITK_OVERRIDE; - virtual PixelType ComputeUpdateInv(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = + PixelType ComputeUpdateInv(const NeighborhoodType & neighborhood, void *globalData, const FloatOffsetType & offset = FloatOffsetType( 0.0) ) ITK_OVERRIDE; @@ -206,7 +206,7 @@ class SyNDemonsRegistrationFunction : protected: SyNDemonsRegistrationFunction(); - ~SyNDemonsRegistrationFunction() + virtual ~SyNDemonsRegistrationFunction() ITK_OVERRIDE { } diff --git a/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h b/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h index 2e53cd789..c247e5280 100644 --- a/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h +++ b/ImageRegistration/itkVectorParameterizedNeighborhoodOperatorImageFilter.h @@ -108,7 +108,7 @@ class VectorParameterizedNeighborhoodOperatorImageFilter : this->Modified(); } - /** Allows a user to override the internal boundary condition. Care should be + virtual /** Allows a user to ITK_OVERRIDE the internal boundary condition. Care should be * be taken to ensure that the overriding boundary condition is a persistent * object during the time it is referenced. The overriding condition * can be of a different type than the default type as long as it is @@ -125,7 +125,7 @@ class VectorParameterizedNeighborhoodOperatorImageFilter : * execution model. * * \sa ProcessObject::GenerateInputRequestedRegion() */ - virtual void GenerateInputRequestedRegion() + void GenerateInputRequestedRegion() throw (InvalidRequestedRegionError) ITK_OVERRIDE; void SetParameterImage( ParameterImagePointer I) @@ -139,7 +139,7 @@ class VectorParameterizedNeighborhoodOperatorImageFilter : m_ParameterImage = ITK_NULLPTR; } - virtual ~VectorParameterizedNeighborhoodOperatorImageFilter() + virtual ~VectorParameterizedNeighborhoodOperatorImageFilter() ITK_OVERRIDE { } diff --git a/ImageSegmentation/antsAtroposSegmentationImageFilter.h b/ImageSegmentation/antsAtroposSegmentationImageFilter.h index 69590e7af..8bb892e6a 100644 --- a/ImageSegmentation/antsAtroposSegmentationImageFilter.h +++ b/ImageSegmentation/antsAtroposSegmentationImageFilter.h @@ -737,7 +737,7 @@ class AtroposSegmentationImageFilter : #endif protected: AtroposSegmentationImageFilter(); - ~AtroposSegmentationImageFilter(); + virtual ~AtroposSegmentationImageFilter() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h b/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h index 288ad1bcf..45f12742f 100644 --- a/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h +++ b/ImageSegmentation/antsBoxPlotQuantileListSampleFilter.h @@ -89,11 +89,11 @@ class BoxPlotQuantileListSampleFilter // itkGetConstMacro( Outliers, InstanceIdentifierContainerType ); protected: BoxPlotQuantileListSampleFilter(); - virtual ~BoxPlotQuantileListSampleFilter(); + virtual ~BoxPlotQuantileListSampleFilter() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; - virtual void GenerateData() ITK_OVERRIDE; + void GenerateData() ITK_OVERRIDE; private: BoxPlotQuantileListSampleFilter( const Self & ); // purposely not implemented diff --git a/ImageSegmentation/antsGaussianListSampleFunction.h b/ImageSegmentation/antsGaussianListSampleFunction.h index f89944a1d..7fc94a8d1 100644 --- a/ImageSegmentation/antsGaussianListSampleFunction.h +++ b/ImageSegmentation/antsGaussianListSampleFunction.h @@ -65,13 +65,13 @@ class GaussianListSampleFunction /** Helper functions */ - virtual void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; protected: GaussianListSampleFunction(); - virtual ~GaussianListSampleFunction(); + virtual ~GaussianListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h b/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h index 5377305ee..9a92dddb4 100644 --- a/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h +++ b/ImageSegmentation/antsGrubbsRosnerListSampleFilter.h @@ -86,11 +86,11 @@ class GrubbsRosnerListSampleFilter // itkGetConstMacro( Outliers, InstanceIdentifierContainerType ); protected: GrubbsRosnerListSampleFilter(); - virtual ~GrubbsRosnerListSampleFilter(); + virtual ~GrubbsRosnerListSampleFilter() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; - virtual void GenerateData() ITK_OVERRIDE; + void GenerateData() ITK_OVERRIDE; private: GrubbsRosnerListSampleFilter( const Self & ); // purposely not implemented diff --git a/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h b/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h index ea49d2054..8dc221a81 100644 --- a/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h +++ b/ImageSegmentation/antsHistogramParzenWindowsListSampleFunction.h @@ -74,13 +74,13 @@ class HistogramParzenWindowsListSampleFunction itkSetMacro( NumberOfHistogramBins, unsigned int ); itkGetConstMacro( NumberOfHistogramBins, unsigned int ); - virtual void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; protected: HistogramParzenWindowsListSampleFunction(); - virtual ~HistogramParzenWindowsListSampleFunction(); + virtual ~HistogramParzenWindowsListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h b/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h index 13128c29c..5eb1d043d 100644 --- a/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h +++ b/ImageSegmentation/antsJointHistogramParzenShapeAndOrientationListSampleFunction.h @@ -73,7 +73,7 @@ class JointHistogramParzenShapeAndOrientationListSampleFunction /** Helper functions */ - virtual void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; itkSetMacro( ShapeSigma, RealType ); itkGetConstMacro( ShapeSigma, RealType ); @@ -85,11 +85,11 @@ class JointHistogramParzenShapeAndOrientationListSampleFunction itkSetMacro( NumberOfOrientationJointHistogramBins, unsigned int ); itkGetConstMacro( NumberOfOrientationJointHistogramBins, unsigned int ); - virtual TOutput Evaluate( const InputMeasurementVectorType & ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType & ) const ITK_OVERRIDE; protected: JointHistogramParzenShapeAndOrientationListSampleFunction(); - virtual ~JointHistogramParzenShapeAndOrientationListSampleFunction(); + virtual ~JointHistogramParzenShapeAndOrientationListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/antsListSampleFunction.h b/ImageSegmentation/antsListSampleFunction.h index cea28cd3b..f175fca6f 100644 --- a/ImageSegmentation/antsListSampleFunction.h +++ b/ImageSegmentation/antsListSampleFunction.h @@ -103,11 +103,11 @@ class ListSampleFunction : /** Evaluate the function at specified Point position. * Subclasses must provide this method. */ - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE = 0; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE = 0; protected: ListSampleFunction(); - ~ListSampleFunction() + virtual ~ListSampleFunction() ITK_OVERRIDE { } diff --git a/ImageSegmentation/antsListSampleToListSampleFilter.h b/ImageSegmentation/antsListSampleToListSampleFilter.h index 7f6db0e79..991d87655 100644 --- a/ImageSegmentation/antsListSampleToListSampleFilter.h +++ b/ImageSegmentation/antsListSampleToListSampleFilter.h @@ -61,18 +61,18 @@ class ListSampleToListSampleFilter : public ProcessObject /** Get the list sample output of this object. */ OutputListSampleType * GetOutput(); - virtual void Update() ITK_OVERRIDE + void Update() ITK_OVERRIDE { this->GenerateData(); } protected: ListSampleToListSampleFilter(); - ~ListSampleToListSampleFilter() + virtual ~ListSampleToListSampleFilter() ITK_OVERRIDE { }; - virtual void GenerateData() ITK_OVERRIDE = 0; + void GenerateData() ITK_OVERRIDE = 0; void AllocateOutput(); diff --git a/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h b/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h index 7b7e7eb47..44a1f795a 100644 --- a/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h +++ b/ImageSegmentation/antsLogEuclideanGaussianListSampleFunction.h @@ -57,13 +57,13 @@ class LogEuclideanGaussianListSampleFunction /** Helper functions */ - virtual void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; protected: LogEuclideanGaussianListSampleFunction(); - virtual ~LogEuclideanGaussianListSampleFunction(); + virtual ~LogEuclideanGaussianListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h b/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h index ee055fdd3..da38150c1 100644 --- a/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h +++ b/ImageSegmentation/antsManifoldParzenWindowsListSampleFunction.h @@ -86,13 +86,13 @@ class ManifoldParzenWindowsListSampleFunction itkSetMacro( KernelSigma, RealType ); itkGetConstMacro( KernelSigma, RealType ); - virtual void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetInputListSample( const InputListSampleType * ptr ) ITK_OVERRIDE; - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; protected: ManifoldParzenWindowsListSampleFunction(); - virtual ~ManifoldParzenWindowsListSampleFunction(); + virtual ~ManifoldParzenWindowsListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h b/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h index 9c7dd7b55..565d3e5c1 100644 --- a/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h +++ b/ImageSegmentation/antsPartialVolumeGaussianListSampleFunction.h @@ -66,13 +66,13 @@ class PartialVolumeGaussianListSampleFunction typedef TOutput RealType; typedef TOutput OutputType; - virtual void SetIndexedInputListSample(unsigned int d, const InputListSampleType * ptr ) ITK_OVERRIDE; + void SetIndexedInputListSample(unsigned int d, const InputListSampleType * ptr ) ITK_OVERRIDE; - virtual TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; + TOutput Evaluate( const InputMeasurementVectorType& measurement ) const ITK_OVERRIDE; protected: PartialVolumeGaussianListSampleFunction(); - virtual ~PartialVolumeGaussianListSampleFunction(); + virtual ~PartialVolumeGaussianListSampleFunction() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; void GenerateData(); diff --git a/ImageSegmentation/itkWeightedVotingFusionImageFilter.h b/ImageSegmentation/itkWeightedVotingFusionImageFilter.h index d580f620b..90b2f85b2 100644 --- a/ImageSegmentation/itkWeightedVotingFusionImageFilter.h +++ b/ImageSegmentation/itkWeightedVotingFusionImageFilter.h @@ -314,7 +314,7 @@ class WeightedVotingFusionImageFilter protected: WeightedVotingFusionImageFilter(); - ~WeightedVotingFusionImageFilter() {} + virtual ~WeightedVotingFusionImageFilter() ITK_OVERRIDE {} void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/Temporary/antsFastMarchingImageFilter.h b/Temporary/antsFastMarchingImageFilter.h index a6a180ad7..15aad3a6c 100644 --- a/Temporary/antsFastMarchingImageFilter.h +++ b/Temporary/antsFastMarchingImageFilter.h @@ -333,7 +333,7 @@ class FMarchingImageFilter : #endif protected: FMarchingImageFilter(); - ~FMarchingImageFilter() + virtual ~FMarchingImageFilter() ITK_OVERRIDE { }; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; @@ -352,9 +352,9 @@ class FMarchingImageFilter : void GenerateData() ITK_OVERRIDE; /** Generate the output image meta information. */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; - virtual void EnlargeOutputRequestedRegion(DataObject *output) ITK_OVERRIDE; + void EnlargeOutputRequestedRegion(DataObject *output) ITK_OVERRIDE; /** Get Large Value. This value is used to represent the concept of infinity for the time assigned to pixels that diff --git a/Temporary/itkDivideByConstantImageFilter.h b/Temporary/itkDivideByConstantImageFilter.h index 9686f7e2a..eb9ed9447 100644 --- a/Temporary/itkDivideByConstantImageFilter.h +++ b/Temporary/itkDivideByConstantImageFilter.h @@ -140,7 +140,7 @@ class DivideByConstantImageFilter : DivideByConstantImageFilter() { }; - virtual ~DivideByConstantImageFilter() + virtual ~DivideByConstantImageFilter() ITK_OVERRIDE { }; diff --git a/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h b/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h index cc9344b6a..6b8c8c0ec 100644 --- a/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h +++ b/Temporary/itkMeanSquaresPointSetToPointSetIntensityMetricv4.h @@ -133,17 +133,17 @@ class MeanSquaresPointSetToPointSetIntensityMetricv4: /** * Initialize the metric by estimating the intensity and distance sigmas */ - virtual void Initialize( void ) throw ( ExceptionObject ) ITK_OVERRIDE; + void Initialize( void ) throw ( ExceptionObject ) ITK_OVERRIDE; /** * Prepare point sets for use. */ - virtual void InitializePointSets() const ITK_OVERRIDE; + void InitializePointSets() const ITK_OVERRIDE; /** * Calculates the local metric value for a single point. */ - virtual MeasureType GetLocalNeighborhoodValue( const PointType &, const PixelType & ) const ITK_OVERRIDE; + MeasureType GetLocalNeighborhoodValue( const PointType &, const PixelType & ) const ITK_OVERRIDE; /** Helper method allows for code reuse while skipping the metric value * calculation when appropriate */ @@ -152,16 +152,16 @@ class MeanSquaresPointSetToPointSetIntensityMetricv4: /** * Calculates the local value and derivative for a single point. */ - virtual void GetLocalNeighborhoodValueAndDerivative( const PointType &, + void GetLocalNeighborhoodValueAndDerivative( const PointType &, MeasureType &, LocalDerivativeType &, const PixelType & ) const ITK_OVERRIDE; /** Clone method will clone the existing instance of this type, * including its internal member variables. */ - virtual typename LightObject::Pointer InternalClone() const ITK_OVERRIDE; + typename LightObject::Pointer InternalClone() const ITK_OVERRIDE; protected: MeanSquaresPointSetToPointSetIntensityMetricv4(); - virtual ~MeanSquaresPointSetToPointSetIntensityMetricv4(); + virtual ~MeanSquaresPointSetToPointSetIntensityMetricv4() ITK_OVERRIDE; /** * Estimate the intensity distance sigma based on simple heuristic diff --git a/Temporary/itkMultiplyByConstantImageFilter.h b/Temporary/itkMultiplyByConstantImageFilter.h index 411a76979..eaf0d5b96 100644 --- a/Temporary/itkMultiplyByConstantImageFilter.h +++ b/Temporary/itkMultiplyByConstantImageFilter.h @@ -57,7 +57,7 @@ class MultiplyByConstantImageFilter : { } - virtual ~MultiplyByConstantImageFilter() + virtual ~MultiplyByConstantImageFilter() ITK_OVERRIDE { } }; diff --git a/Tensor/itkExpTensorImageFilter.h b/Tensor/itkExpTensorImageFilter.h index 64ccc0b2f..684d53405 100644 --- a/Tensor/itkExpTensorImageFilter.h +++ b/Tensor/itkExpTensorImageFilter.h @@ -91,7 +91,7 @@ class ExpTensorImageFilter : // itkGetConstReferenceMacro(Radius, InputSizeType); protected: ExpTensorImageFilter(); - virtual ~ExpTensorImageFilter() + virtual ~ExpTensorImageFilter() ITK_OVERRIDE { } diff --git a/Tensor/itkLogTensorImageFilter.h b/Tensor/itkLogTensorImageFilter.h index 366b636f0..a747dcf83 100644 --- a/Tensor/itkLogTensorImageFilter.h +++ b/Tensor/itkLogTensorImageFilter.h @@ -91,7 +91,7 @@ class LogTensorImageFilter : // itkGetConstReferenceMacro(Radius, InputSizeType); protected: LogTensorImageFilter(); - virtual ~LogTensorImageFilter() + virtual ~LogTensorImageFilter() ITK_OVERRIDE { } diff --git a/Tensor/itkPreservationOfPrincipalDirectionTensorReorientationImageFilter.h b/Tensor/itkPreservationOfPrincipalDirectionTensorReorientationImageFilter.h index d68375e69..4549f0ffe 100644 --- a/Tensor/itkPreservationOfPrincipalDirectionTensorReorientationImageFilter.h +++ b/Tensor/itkPreservationOfPrincipalDirectionTensorReorientationImageFilter.h @@ -131,7 +131,7 @@ class PreservationOfPrincipalDirectionTensorReorientationImageFilter : typedef typename OutputImageType::IndexType OutputIndexType; protected: PreservationOfPrincipalDirectionTensorReorientationImageFilter(); - virtual ~PreservationOfPrincipalDirectionTensorReorientationImageFilter() + virtual ~PreservationOfPrincipalDirectionTensorReorientationImageFilter() ITK_OVERRIDE { } diff --git a/Utilities/ReadWriteData.h b/Utilities/ReadWriteData.h index db8697e21..3499caaf9 100644 --- a/Utilities/ReadWriteData.h +++ b/Utilities/ReadWriteData.h @@ -719,12 +719,12 @@ class nullBuf : public std::streambuf { public: - virtual std::streamsize xsputn( const char * itkNotUsed( s ), std::streamsize n ) + virtual std::streamsize xsputn( const char * itkNotUsed( s ), std::streamsize n ) ITK_OVERRIDE { return n; } - virtual int overflow( int itkNotUsed( c ) ) + virtual int overflow( int itkNotUsed( c ) ) ITK_OVERRIDE { return 1; } diff --git a/Utilities/antsCommandLineOption.h b/Utilities/antsCommandLineOption.h index f85a40911..bf7b4cb05 100644 --- a/Utilities/antsCommandLineOption.h +++ b/Utilities/antsCommandLineOption.h @@ -53,7 +53,7 @@ class OptionFunction m_StageID( 0 ) { }; - ~OptionFunction() + virtual ~OptionFunction() ITK_OVERRIDE { }; @@ -194,7 +194,7 @@ class CommandLineOption protected: CommandLineOption(); - virtual ~CommandLineOption() + virtual ~CommandLineOption() ITK_OVERRIDE { }; private: diff --git a/Utilities/antsCommandLineParser.h b/Utilities/antsCommandLineParser.h index 1fd313322..1484c0458 100644 --- a/Utilities/antsCommandLineParser.h +++ b/Utilities/antsCommandLineParser.h @@ -154,7 +154,7 @@ class CommandLineParser protected: CommandLineParser(); - virtual ~CommandLineParser() + virtual ~CommandLineParser() ITK_OVERRIDE { } diff --git a/Utilities/antsMatrixUtilities.h b/Utilities/antsMatrixUtilities.h index 402d22130..6486b4f33 100644 --- a/Utilities/antsMatrixUtilities.h +++ b/Utilities/antsMatrixUtilities.h @@ -303,7 +303,7 @@ class antsMatrixUtilities : } antsMatrixUtilities(); - ~antsMatrixUtilities() + virtual ~antsMatrixUtilities() ITK_OVERRIDE { } diff --git a/Utilities/antsSCCANObject.h b/Utilities/antsSCCANObject.h index ccb0ddb04..bbbbbc83c 100644 --- a/Utilities/antsSCCANObject.h +++ b/Utilities/antsSCCANObject.h @@ -1178,7 +1178,7 @@ class antsSCCANObject : } antsSCCANObject(); - ~antsSCCANObject() + virtual ~antsSCCANObject() ITK_OVERRIDE { } diff --git a/Utilities/itkAdaptiveNonLocalMeansDenoisingImageFilter.h b/Utilities/itkAdaptiveNonLocalMeansDenoisingImageFilter.h index b53ae1175..532d67703 100644 --- a/Utilities/itkAdaptiveNonLocalMeansDenoisingImageFilter.h +++ b/Utilities/itkAdaptiveNonLocalMeansDenoisingImageFilter.h @@ -162,7 +162,7 @@ class AdaptiveNonLocalMeansDenoisingImageFilter : protected: AdaptiveNonLocalMeansDenoisingImageFilter(); - ~AdaptiveNonLocalMeansDenoisingImageFilter() {} + virtual ~AdaptiveNonLocalMeansDenoisingImageFilter() ITK_OVERRIDE {} void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkAlternatingValueDifferenceImageFilter.h b/Utilities/itkAlternatingValueDifferenceImageFilter.h index 4e48d7097..d975b3b64 100644 --- a/Utilities/itkAlternatingValueDifferenceImageFilter.h +++ b/Utilities/itkAlternatingValueDifferenceImageFilter.h @@ -116,7 +116,7 @@ class AlternatingValueDifferenceImageFilter : #endif protected: AlternatingValueDifferenceImageFilter(); - ~AlternatingValueDifferenceImageFilter() + virtual ~AlternatingValueDifferenceImageFilter() ITK_OVERRIDE { } @@ -127,12 +127,12 @@ class AlternatingValueDifferenceImageFilter : * * \sa ProcessObject::VerifyInputInformation */ - virtual void VerifyInputInformation() ITK_OVERRIDE; + void VerifyInputInformation() ITK_OVERRIDE; /** Overrides GenerateOutputInformation() in order to produce * an image which has a different information than the first input. * \sa ProcessObject::GenerateOutputInformaton() */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** Overrides GenerateInputRequestedRegion() in order to inform * the pipeline execution model of different input requested regions @@ -142,12 +142,12 @@ class AlternatingValueDifferenceImageFilter : /** This method is used to set the state of the filter before * multi-threading. */ - virtual void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() ITK_OVERRIDE; /** AlternatingValueDifferenceImageFilter can be implemented as a multithreaded filter. * \sa ImageSource::ThreadedGenerateData(), * ImageSource::GenerateData() */ - virtual void ThreadedGenerateData(const OutputImageRegionType & + void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) ITK_OVERRIDE; private: diff --git a/Utilities/itkAlternatingValueSimpleSubtractionImageFilter.h b/Utilities/itkAlternatingValueSimpleSubtractionImageFilter.h index ea67c789a..f41b4c1c5 100644 --- a/Utilities/itkAlternatingValueSimpleSubtractionImageFilter.h +++ b/Utilities/itkAlternatingValueSimpleSubtractionImageFilter.h @@ -83,7 +83,7 @@ class AlternatingValueSimpleSubtractionImageFilter : #endif protected: AlternatingValueSimpleSubtractionImageFilter(); - ~AlternatingValueSimpleSubtractionImageFilter() + virtual ~AlternatingValueSimpleSubtractionImageFilter() ITK_OVERRIDE { } @@ -94,12 +94,12 @@ class AlternatingValueSimpleSubtractionImageFilter : * * \sa ProcessObject::VerifyInputInformation */ - virtual void VerifyInputInformation() ITK_OVERRIDE; + void VerifyInputInformation() ITK_OVERRIDE; /** Overrides GenerateOutputInformation() in order to produce * an image which has a different information than the first input. * \sa ProcessObject::GenerateOutputInformaton() */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** Overrides GenerateInputRequestedRegion() in order to inform * the pipeline execution model of different input requested regions @@ -110,7 +110,7 @@ class AlternatingValueSimpleSubtractionImageFilter : /** AlternatingValueSimpleSubtractionImageFilter can be implemented as a multithreaded filter. * \sa ImageSource::ThreadedGenerateData(), * ImageSource::GenerateData() */ - virtual void ThreadedGenerateData(const OutputImageRegionType & + void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) ITK_OVERRIDE; private: diff --git a/Utilities/itkAverageOverDimensionImageFilter.h b/Utilities/itkAverageOverDimensionImageFilter.h index faebc3be3..573229f3e 100644 --- a/Utilities/itkAverageOverDimensionImageFilter.h +++ b/Utilities/itkAverageOverDimensionImageFilter.h @@ -229,7 +229,7 @@ class AverageOverDimensionImageFilter: protected: AverageOverDimensionImageFilter(); - ~AverageOverDimensionImageFilter() {} + virtual ~AverageOverDimensionImageFilter() ITK_OVERRIDE {} void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE; /** AverageOverDimensionImageFilter can produce an image which is a different @@ -240,7 +240,7 @@ class AverageOverDimensionImageFilter: * below. * * \sa ProcessObject::GenerateOutputInformaton() */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** This function calls the actual region copier to do the mapping from * output image space to input image space. It uses a @@ -252,7 +252,7 @@ class AverageOverDimensionImageFilter: * support output images of a lower dimension that the input. * * \sa ImageToImageFilter::CallCopyRegion() */ - virtual void CallCopyOutputRegionToInputRegion(InputImageRegionType & destRegion, + void CallCopyOutputRegionToInputRegion(InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion) ITK_OVERRIDE; /** AverageOverDimensionImageFilter can be implemented as a multithreaded filter. diff --git a/Utilities/itkDecomposeTensorFunction.h b/Utilities/itkDecomposeTensorFunction.h index 694df03b0..a4f620c90 100644 --- a/Utilities/itkDecomposeTensorFunction.h +++ b/Utilities/itkDecomposeTensorFunction.h @@ -73,7 +73,7 @@ class DecomposeTensorFunction : public ProcessObject RealType EvaluateDeterminant( InputMatrixType & ); DecomposeTensorFunction(); - virtual ~DecomposeTensorFunction() + virtual ~DecomposeTensorFunction() ITK_OVERRIDE { } diff --git a/Utilities/itkDeformationFieldGradientTensorImageFilter.h b/Utilities/itkDeformationFieldGradientTensorImageFilter.h index c0e35d1a3..5dd24adde 100755 --- a/Utilities/itkDeformationFieldGradientTensorImageFilter.h +++ b/Utilities/itkDeformationFieldGradientTensorImageFilter.h @@ -89,7 +89,7 @@ class ITK_EXPORT DeformationFieldGradientTensorImageFilter : * pipeline execution model. * * \sa ImageToImageFilter::GenerateInputRequestedRegion() */ - virtual void GenerateInputRequestedRegion() throw( InvalidRequestedRegionError ) ITK_OVERRIDE; + void GenerateInputRequestedRegion() throw( InvalidRequestedRegionError ) ITK_OVERRIDE; itkSetClampMacro( Order, unsigned int, 1, 2 ); itkGetConstReferenceMacro( Order, unsigned int ); @@ -111,7 +111,7 @@ class ITK_EXPORT DeformationFieldGradientTensorImageFilter : protected: DeformationFieldGradientTensorImageFilter(); - virtual ~DeformationFieldGradientTensorImageFilter() {} + virtual ~DeformationFieldGradientTensorImageFilter() ITK_OVERRIDE {} /** Do any necessary casting/copying of the input data. Input pixel types whose value types are not real number types must be cast to real number diff --git a/Utilities/itkDeterminantTensorImageFilter.h b/Utilities/itkDeterminantTensorImageFilter.h index 5da670fd3..1a90af634 100755 --- a/Utilities/itkDeterminantTensorImageFilter.h +++ b/Utilities/itkDeterminantTensorImageFilter.h @@ -64,7 +64,7 @@ class ITK_EXPORT DeterminantTensorImageFilter : protected: DeterminantTensorImageFilter(); - virtual ~DeterminantTensorImageFilter() {} + virtual ~DeterminantTensorImageFilter() ITK_OVERRIDE {} /** DeterminantTensorImageFilter can be implemented as a * multithreaded filter (we're only using vnl_det(), which is trivially diff --git a/Utilities/itkDiReCTImageFilter.h b/Utilities/itkDiReCTImageFilter.h index 5162a6633..a4dc9490c 100644 --- a/Utilities/itkDiReCTImageFilter.h +++ b/Utilities/itkDiReCTImageFilter.h @@ -261,7 +261,7 @@ class DiReCTImageFilter : protected: DiReCTImageFilter(); - virtual ~DiReCTImageFilter(); + virtual ~DiReCTImageFilter() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkDisplacementFieldFromMultiTransformFilter.h b/Utilities/itkDisplacementFieldFromMultiTransformFilter.h index 3fc419524..6d091a639 100644 --- a/Utilities/itkDisplacementFieldFromMultiTransformFilter.h +++ b/Utilities/itkDisplacementFieldFromMultiTransformFilter.h @@ -57,20 +57,20 @@ class DisplacementFieldFromMultiTransformFilter : typedef typename Superclass::PointType PointType; - virtual void GenerateInputRequestedRegion() ITK_OVERRIDE + void GenerateInputRequestedRegion() ITK_OVERRIDE { Superclass::GenerateInputRequestedRegion(); } - virtual void BeforeThreadedGenerateData() ITK_OVERRIDE + void BeforeThreadedGenerateData() ITK_OVERRIDE { }; - virtual void AfterThreadedGenerateData() ITK_OVERRIDE + void AfterThreadedGenerateData() ITK_OVERRIDE { }; - virtual void GenerateOutputInformation() ITK_OVERRIDE + void GenerateOutputInformation() ITK_OVERRIDE { // call the superclass's implementation Superclass::GenerateOutputInformation(); @@ -83,7 +83,7 @@ class DisplacementFieldFromMultiTransformFilter : Superclass::m_EdgePaddingValue.Fill(kMaxDisp); } - ~DisplacementFieldFromMultiTransformFilter() + virtual ~DisplacementFieldFromMultiTransformFilter() ITK_OVERRIDE { }; void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE diff --git a/Utilities/itkGeneralToBSplineDisplacementFieldFilter.h b/Utilities/itkGeneralToBSplineDisplacementFieldFilter.h index 66f242693..3c2baabcb 100644 --- a/Utilities/itkGeneralToBSplineDisplacementFieldFilter.h +++ b/Utilities/itkGeneralToBSplineDisplacementFieldFilter.h @@ -78,7 +78,7 @@ class GeneralToBSplineDisplacementFieldFilter : protected: GeneralToBSplineDisplacementFieldFilter(); - virtual ~GeneralToBSplineDisplacementFieldFilter(); + virtual ~GeneralToBSplineDisplacementFieldFilter() ITK_OVERRIDE; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkGeometricJacobianDeterminantImageFilter.h b/Utilities/itkGeometricJacobianDeterminantImageFilter.h index 8186df775..e1495fd81 100755 --- a/Utilities/itkGeometricJacobianDeterminantImageFilter.h +++ b/Utilities/itkGeometricJacobianDeterminantImageFilter.h @@ -84,14 +84,14 @@ class ITK_EXPORT GeometricJacobianDeterminantImageFilter : * pipeline execution model. * * \sa ImageToImageFilter::GenerateInputRequestedRegion() */ - virtual void GenerateInputRequestedRegion() throw( InvalidRequestedRegionError ) ITK_OVERRIDE; + void GenerateInputRequestedRegion() throw( InvalidRequestedRegionError ) ITK_OVERRIDE; /** Get access to the input image casted as real pixel values */ itkGetConstObjectMacro( RealValuedInputImage, RealVectorImageType ); protected: GeometricJacobianDeterminantImageFilter(); - virtual ~GeometricJacobianDeterminantImageFilter() {} + virtual ~GeometricJacobianDeterminantImageFilter() ITK_OVERRIDE {} /** Do any necessary casting/copying of the input data. Input pixel types whose value types are not real number types must be cast to real number diff --git a/Utilities/itkImageIntensityAndGradientToPointSetFilter.h b/Utilities/itkImageIntensityAndGradientToPointSetFilter.h index baa8e4ff6..17afc9518 100644 --- a/Utilities/itkImageIntensityAndGradientToPointSetFilter.h +++ b/Utilities/itkImageIntensityAndGradientToPointSetFilter.h @@ -124,13 +124,13 @@ class ImageIntensityAndGradientToPointSetFilter protected: ImageIntensityAndGradientToPointSetFilter(); - ~ImageIntensityAndGradientToPointSetFilter() + virtual ~ImageIntensityAndGradientToPointSetFilter() ITK_OVERRIDE { } void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; - virtual void GenerateData() ITK_OVERRIDE; + void GenerateData() ITK_OVERRIDE; double m_Sigma; diff --git a/Utilities/itkLabelOverlapMeasuresImageFilter.h b/Utilities/itkLabelOverlapMeasuresImageFilter.h index e2f618db9..16b03d352 100644 --- a/Utilities/itkLabelOverlapMeasuresImageFilter.h +++ b/Utilities/itkLabelOverlapMeasuresImageFilter.h @@ -187,7 +187,7 @@ class LabelOverlapMeasuresImageFilter : #endif protected: LabelOverlapMeasuresImageFilter(); - ~LabelOverlapMeasuresImageFilter() + virtual ~LabelOverlapMeasuresImageFilter() ITK_OVERRIDE { }; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkLabelPerimeterEstimationCalculator.h b/Utilities/itkLabelPerimeterEstimationCalculator.h index c782b8740..66bdad475 100644 --- a/Utilities/itkLabelPerimeterEstimationCalculator.h +++ b/Utilities/itkLabelPerimeterEstimationCalculator.h @@ -115,7 +115,7 @@ class ITK_EXPORT LabelPerimeterEstimationCalculator: protected: LabelPerimeterEstimationCalculator(); - ~LabelPerimeterEstimationCalculator() {} + virtual ~LabelPerimeterEstimationCalculator() ITK_OVERRIDE {} void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE; private: diff --git a/Utilities/itkLabeledPointSetFileReader.h b/Utilities/itkLabeledPointSetFileReader.h index 356ed5016..65fa7d191 100644 --- a/Utilities/itkLabeledPointSetFileReader.h +++ b/Utilities/itkLabeledPointSetFileReader.h @@ -104,7 +104,7 @@ class LabeledPointSetFileReader protected: LabeledPointSetFileReader(); - ~LabeledPointSetFileReader() + virtual ~LabeledPointSetFileReader() ITK_OVERRIDE { } diff --git a/Utilities/itkLabeledPointSetFileWriter.h b/Utilities/itkLabeledPointSetFileWriter.h index fd1bec435..09b26c900 100644 --- a/Utilities/itkLabeledPointSetFileWriter.h +++ b/Utilities/itkLabeledPointSetFileWriter.h @@ -103,7 +103,7 @@ class LabeledPointSetFileWriter : public Object itkGetConstMacro( ImageDirection, ImageDirectionType ); protected: LabeledPointSetFileWriter(); - virtual ~LabeledPointSetFileWriter(); + virtual ~LabeledPointSetFileWriter() ITK_OVERRIDE; virtual void GenerateData(); diff --git a/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h b/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h index 4ff81918a..e2160a94b 100644 --- a/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h +++ b/Utilities/itkN3MRIBiasFieldCorrectionImageFilter.h @@ -109,15 +109,15 @@ class N3BiasFieldScaleCostFunction itkSetObjectMacro( MaskImage, TMaskImage ); itkSetObjectMacro( ConfidenceImage, TConfidenceImage ); - virtual MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE; + MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE; - virtual void GetDerivative( const ParametersType & parameters, DerivativeType & derivative ) const ITK_OVERRIDE; + void GetDerivative( const ParametersType & parameters, DerivativeType & derivative ) const ITK_OVERRIDE; - virtual unsigned int GetNumberOfParameters() const ITK_OVERRIDE; + unsigned int GetNumberOfParameters() const ITK_OVERRIDE; protected: N3BiasFieldScaleCostFunction(); - virtual ~N3BiasFieldScaleCostFunction(); + virtual ~N3BiasFieldScaleCostFunction() ITK_OVERRIDE; private: N3BiasFieldScaleCostFunction(const Self &); // purposely not implemented void operator=(const Self &); // purposely not implemented @@ -256,7 +256,7 @@ class N3MRIBiasFieldCorrectionImageFilter : itkGetConstMacro( CurrentConvergenceMeasurement, RealType ); protected: N3MRIBiasFieldCorrectionImageFilter(); - ~N3MRIBiasFieldCorrectionImageFilter() + virtual ~N3MRIBiasFieldCorrectionImageFilter() ITK_OVERRIDE { }; void PrintSelf( std::ostream& os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h b/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h index e1e5f70fb..50ff9255b 100644 --- a/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h +++ b/Utilities/itkNeighborhoodFirstOrderStatisticsImageFilter.h @@ -93,7 +93,7 @@ class ITK_EXPORT NeighborhoodFirstOrderStatisticsImageFilter: } - ~NeighborhoodFirstOrderStatisticsImageFilter() {} + virtual ~NeighborhoodFirstOrderStatisticsImageFilter() ITK_OVERRIDE {} private: NeighborhoodFirstOrderStatisticsImageFilter(const Self &); //purposely not implemented void operator=(const Self &); //purposely not implemented diff --git a/Utilities/itkNonLocalPatchBasedImageFilter.h b/Utilities/itkNonLocalPatchBasedImageFilter.h index 0d6917de6..bf53a9847 100644 --- a/Utilities/itkNonLocalPatchBasedImageFilter.h +++ b/Utilities/itkNonLocalPatchBasedImageFilter.h @@ -141,7 +141,7 @@ class NonLocalPatchBasedImageFilter : protected: NonLocalPatchBasedImageFilter(); - ~NonLocalPatchBasedImageFilter() {} + virtual ~NonLocalPatchBasedImageFilter() ITK_OVERRIDE {} void BeforeThreadedGenerateData() ITK_OVERRIDE; diff --git a/Utilities/itkNonLocalSuperresolutionImageFilter.h b/Utilities/itkNonLocalSuperresolutionImageFilter.h index 11195cd90..ad2856fd2 100644 --- a/Utilities/itkNonLocalSuperresolutionImageFilter.h +++ b/Utilities/itkNonLocalSuperresolutionImageFilter.h @@ -195,7 +195,7 @@ class NonLocalSuperresolutionImageFilter : protected: NonLocalSuperresolutionImageFilter(); - ~NonLocalSuperresolutionImageFilter() {} + virtual ~NonLocalSuperresolutionImageFilter() ITK_OVERRIDE {} void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; diff --git a/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h b/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h index 769e5391d..c78c4e020 100644 --- a/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h +++ b/Utilities/itkPulsedArterialSpinLabeledCerebralBloodFlowImageFilter.h @@ -113,7 +113,7 @@ class PulsedArterialSpinLabeledCerebralBloodFlowImageFilter : #endif protected: PulsedArterialSpinLabeledCerebralBloodFlowImageFilter(); - ~PulsedArterialSpinLabeledCerebralBloodFlowImageFilter() + virtual ~PulsedArterialSpinLabeledCerebralBloodFlowImageFilter() ITK_OVERRIDE { } @@ -125,7 +125,7 @@ class PulsedArterialSpinLabeledCerebralBloodFlowImageFilter : /** PulsedArterialSpinLabeledCerebralBloodFlowImageFilter can be implemented as a multithreaded filter. * \sa ImageSource::ThreadedGenerateData(), * ImageSource::GenerateData() */ - virtual void ThreadedGenerateData(const OutputImageRegionType & + void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) ITK_OVERRIDE; private: diff --git a/Utilities/itkSliceTimingCorrectionImageFilter.h b/Utilities/itkSliceTimingCorrectionImageFilter.h index 98b37ddb5..89fa13862 100644 --- a/Utilities/itkSliceTimingCorrectionImageFilter.h +++ b/Utilities/itkSliceTimingCorrectionImageFilter.h @@ -121,7 +121,7 @@ class SliceTimingCorrectionImageFilter : #endif protected: SliceTimingCorrectionImageFilter(); - ~SliceTimingCorrectionImageFilter() + virtual ~SliceTimingCorrectionImageFilter() ITK_OVERRIDE { } @@ -132,12 +132,12 @@ class SliceTimingCorrectionImageFilter : * * \sa ProcessObject::VerifyInputInformation */ - virtual void VerifyInputInformation() ITK_OVERRIDE; + void VerifyInputInformation() ITK_OVERRIDE; /** Overrides GenerateOutputInformation() in order to produce * an image which has a different information than the first input. * \sa ProcessObject::GenerateOutputInformaton() */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** Overrides GenerateInputRequestedRegion() in order to inform * the pipeline execution model of different input requested regions @@ -147,12 +147,12 @@ class SliceTimingCorrectionImageFilter : /** This method is used to set the state of the filter before * multi-threading. */ - virtual void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() ITK_OVERRIDE; /** SliceTimingCorrectionImageFilter can be implemented as a multithreaded filter. * \sa ImageSource::ThreadedGenerateData(), * ImageSource::GenerateData() */ - virtual void ThreadedGenerateData(const OutputImageRegionType & + void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) ITK_OVERRIDE; private: diff --git a/Utilities/itkSplitAlternatingTimeSeriesImageFilter.h b/Utilities/itkSplitAlternatingTimeSeriesImageFilter.h index 2d08b1c53..0e13842d3 100644 --- a/Utilities/itkSplitAlternatingTimeSeriesImageFilter.h +++ b/Utilities/itkSplitAlternatingTimeSeriesImageFilter.h @@ -87,18 +87,18 @@ class SplitAlternatingTimeSeriesImageFilter: protected: SplitAlternatingTimeSeriesImageFilter(); - ~SplitAlternatingTimeSeriesImageFilter() {} + virtual ~SplitAlternatingTimeSeriesImageFilter() ITK_OVERRIDE {} void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE; /** Overrides GenerateOutputInformation() in order to produce * an image which has a different information than the first input. * \sa ProcessObject::GenerateOutputInformaton() */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** SplitAlternatingTimeSeriesImageFilter can be implemented as a multithreaded filter. * \sa ImageSource::ThreadedGenerateData(), * ImageSource::GenerateData() */ - virtual void ThreadedGenerateData(const OutputImageRegionType & + void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId) ITK_OVERRIDE; private: diff --git a/Utilities/itkSurfaceCurvatureBase.h b/Utilities/itkSurfaceCurvatureBase.h index 484dbe678..65597c093 100644 --- a/Utilities/itkSurfaceCurvatureBase.h +++ b/Utilities/itkSurfaceCurvatureBase.h @@ -195,7 +195,7 @@ class SurfaceCurvatureBase : public ProcessObject protected: SurfaceCurvatureBase(); - virtual ~SurfaceCurvatureBase() + virtual ~SurfaceCurvatureBase() ITK_OVERRIDE { }; diff --git a/Utilities/itkSurfaceImageCurvature.h b/Utilities/itkSurfaceImageCurvature.h index 50f549749..820346689 100644 --- a/Utilities/itkSurfaceImageCurvature.h +++ b/Utilities/itkSurfaceImageCurvature.h @@ -240,7 +240,7 @@ class SurfaceImageCurvature : protected: SurfaceImageCurvature(); - ~SurfaceImageCurvature() + virtual ~SurfaceImageCurvature() ITK_OVERRIDE { }; diff --git a/Utilities/itkVarianceImageFilter.h b/Utilities/itkVarianceImageFilter.h index 3384e4dd2..ce1a71bcc 100644 --- a/Utilities/itkVarianceImageFilter.h +++ b/Utilities/itkVarianceImageFilter.h @@ -90,7 +90,7 @@ class VarianceImageFilter: protected: VarianceImageFilter(); - virtual ~VarianceImageFilter() {} + virtual ~VarianceImageFilter() ITK_OVERRIDE {} /** VarianceImageFilter can be implemented as a multithreaded filter. * Therefore, this implementation provides a ThreadedGenerateData() diff --git a/Utilities/itkVectorFieldGradientImageFunction.h b/Utilities/itkVectorFieldGradientImageFunction.h index f8113ef1f..6798cb0c7 100644 --- a/Utilities/itkVectorFieldGradientImageFunction.h +++ b/Utilities/itkVectorFieldGradientImageFunction.h @@ -84,17 +84,17 @@ class VectorFieldGradientImageFunction : /** * Evaluate Jacobian */ - virtual MatrixType Evaluate( const PointType & point ) const ITK_OVERRIDE + MatrixType Evaluate( const PointType & point ) const ITK_OVERRIDE { return this->EvaluateJacobian( point ); } - virtual MatrixType EvaluateAtIndex( const IndexType & idx ) const ITK_OVERRIDE + MatrixType EvaluateAtIndex( const IndexType & idx ) const ITK_OVERRIDE { return this->EvaluateJacobianAtIndex( idx ); } - virtual MatrixType EvaluateAtContinuousIndex( const ContinuousIndexType & idx ) const ITK_OVERRIDE + MatrixType EvaluateAtContinuousIndex( const ContinuousIndexType & idx ) const ITK_OVERRIDE { return this->EvaluateJacobianAtContinuousIndex( idx ); } @@ -250,7 +250,7 @@ class VectorFieldGradientImageFunction : protected: VectorFieldGradientImageFunction(); - virtual ~VectorFieldGradientImageFunction() + virtual ~VectorFieldGradientImageFunction() ITK_OVERRIDE { } diff --git a/Utilities/itkWarpImageMultiTransformFilter.h b/Utilities/itkWarpImageMultiTransformFilter.h index 9322daa67..5635e2053 100644 --- a/Utilities/itkWarpImageMultiTransformFilter.h +++ b/Utilities/itkWarpImageMultiTransformFilter.h @@ -231,7 +231,7 @@ class WarpImageMultiTransformFilter : * implemenation for GenerateOutputInformation() which set * the output information according the OutputSpacing, OutputOrigin * and the deformation field's LargestPossibleRegion. */ - virtual void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() ITK_OVERRIDE; /** It is difficult to compute in advance the input image region * required to compute the requested output region. Thus the safest @@ -239,15 +239,15 @@ class WarpImageMultiTransformFilter : * * For the deformation field, the input requested region * set to be the same as that of the output requested region. */ - virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + void GenerateInputRequestedRegion() ITK_OVERRIDE; /** This method is used to set the state of the filter before * multi-threading. */ - virtual void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() ITK_OVERRIDE; /** This method is used to set the state of the filter after * multi-threading. */ - virtual void AfterThreadedGenerateData() ITK_OVERRIDE; + void AfterThreadedGenerateData() ITK_OVERRIDE; /** precompute the smoothed image if necessary **/ void SetSmoothScale(double scale); @@ -297,7 +297,7 @@ class WarpImageMultiTransformFilter : bool m_bFirstDeformNoInterp; protected: WarpImageMultiTransformFilter(); - ~WarpImageMultiTransformFilter() + virtual ~WarpImageMultiTransformFilter() ITK_OVERRIDE { }; void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;