From 9e582fd86c04cd003566d4d9907cd0a15f51111f Mon Sep 17 00:00:00 2001 From: Shelly Belsky Date: Thu, 23 Jan 2025 16:34:32 -0500 Subject: [PATCH] ENH: Remove the `ITK_USE_CONCEPT_CHECKING` option --- CMakeLists.txt | 10 +++++----- Modules/Bridge/VTK/include/itkVTKImageExport.h | 3 +-- Modules/Core/Common/include/itkCompensatedSummation.h | 4 +--- Modules/Core/Common/include/itkExtractImageFilter.h | 5 ----- .../Common/include/itkFiniteCylinderSpatialFunction.h | 4 ---- .../Core/Common/include/itkHeavisideStepFunctionBase.h | 2 -- Modules/Core/Common/include/itkKernelFunctionBase.h | 4 ---- Modules/Core/Common/include/itkMath.h | 2 -- Modules/Core/Common/include/itkSobelOperator.h | 4 ---- Modules/Core/Common/include/itkStreamingImageFilter.h | 4 ---- Modules/Core/Common/src/itkConfigure.h.in | 1 - .../Core/Common/test/itkSimpleFilterWatcherTest.cxx | 5 +---- .../include/itkDenseFiniteDifferenceImageFilter.h | 4 ---- .../include/itkFiniteDifferenceImageFilter.h | 4 ---- .../include/itkGPUDenseFiniteDifferenceImageFilter.h | 4 ---- .../include/itkGPUFiniteDifferenceImageFilter.h | 4 ---- .../include/itkComplexConjugateImageAdaptor.h | 4 ---- .../include/itkBSplineDecompositionImageFilter.h | 4 ---- Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h | 5 ----- .../Core/QuadEdgeMesh/include/itkQuadEdgeMeshPoint.h | 5 ----- .../include/itkTestingExtractSliceImageFilter.h | 4 ---- .../include/itkTestingStretchIntensityImageFilter.h | 4 ---- .../include/itkTransformGeometryImageFilter.h | 2 -- .../itkCurvatureAnisotropicDiffusionImageFilter.h | 4 ---- .../itkGradientAnisotropicDiffusionImageFilter.h | 4 ---- ...itkVectorCurvatureAnisotropicDiffusionImageFilter.h | 4 ---- .../itkVectorGradientAnisotropicDiffusionImageFilter.h | 4 ---- .../AntiAlias/include/itkAntiAliasBinaryImageFilter.h | 4 ---- .../include/itkBinaryPruningImageFilter.h | 4 ---- .../include/itkBinaryThinningImageFilter.h | 4 ---- .../include/itkDilateObjectMorphologyImageFilter.h | 4 ---- .../include/itkErodeObjectMorphologyImageFilter.h | 4 ---- .../include/itkObjectMorphologyImageFilter.h | 4 ---- .../itkMaskedFFTNormalizedCorrelationImageFilter.h | 4 ---- .../include/itkNormalizedCorrelationImageFilter.h | 4 ---- .../include/itkBinaryMinMaxCurvatureFlowImageFilter.h | 4 ---- .../include/itkCurvatureFlowImageFilter.h | 4 ---- .../include/itkMinMaxCurvatureFlowImageFilter.h | 4 ---- .../itkDiffusionTensor3DReconstructionImageFilter.h | 4 ---- .../include/itkTensorFractionalAnisotropyImageFilter.h | 4 ---- .../include/itkTensorRelativeAnisotropyImageFilter.h | 4 ---- .../itkExponentialDisplacementFieldImageFilter.h | 4 ---- .../include/itkInverseDisplacementFieldImageFilter.h | 4 ---- .../itkIterativeInverseDisplacementFieldImageFilter.h | 4 ---- .../include/itkTransformToDisplacementFieldFilter.h | 4 ---- .../itkApproximateSignedDistanceMapImageFilter.h | 4 ---- .../itkContourDirectedMeanDistanceImageFilter.h | 4 ---- .../include/itkContourMeanDistanceImageFilter.h | 4 ---- .../include/itkDanielssonDistanceMapImageFilter.h | 4 ---- .../include/itkDirectedHausdorffDistanceImageFilter.h | 4 ---- .../include/itkFastChamferDistanceImageFilter.h | 4 ---- .../include/itkHausdorffDistanceImageFilter.h | 4 ---- .../include/itkIsoContourDistanceImageFilter.h | 4 ---- .../itkSignedDanielssonDistanceMapImageFilter.h | 4 ---- .../include/itkSignedMaurerDistanceMapImageFilter.h | 4 ---- .../FFT/include/itkVnlForwardFFTImageFilter.h | 4 ---- .../itkVnlHalfHermitianToRealInverseFFTImageFilter.h | 4 ---- .../FFT/include/itkVnlInverseFFTImageFilter.h | 4 ---- .../itkVnlRealToHalfHermitianForwardFFTImageFilter.h | 4 ---- .../include/itkFastMarchingExtensionImageFilter.h | 4 ---- .../include/itkFastMarchingExtensionImageFilterBase.h | 4 ---- .../FastMarching/include/itkFastMarchingImageFilter.h | 4 ---- .../FastMarching/include/itkFastMarchingTraits.h | 2 -- .../include/itkFastMarchingUpwindGradientImageFilter.h | 4 ---- .../itkGPUGradientAnisotropicDiffusionImageFilter.h | 4 ---- .../include/itkGPUNeighborhoodOperatorImageFilter.h | 2 -- .../include/itkAbsoluteValueDifferenceImageFilter.h | 4 ---- .../ImageCompare/include/itkSTAPLEImageFilter.h | 4 ---- .../include/itkSimilarityIndexImageFilter.h | 4 ---- .../include/itkSquaredDifferenceImageFilter.h | 4 ---- .../ImageCompose/include/itkComposeImageFilter.h | 4 ---- .../ImageCompose/include/itkJoinImageFilter.h | 4 ---- .../ImageCompose/include/itkJoinSeriesImageFilter.h | 4 ---- .../ImageFeature/include/itkBilateralImageFilter.h | 4 ---- .../include/itkCannyEdgeDetectionImageFilter.h | 4 ---- .../ImageFeature/include/itkDerivativeImageFilter.h | 4 ---- .../include/itkDiscreteGaussianDerivativeImageFilter.h | 4 ---- .../include/itkGradientVectorFlowImageFilter.h | 4 ---- .../itkHessian3DToVesselnessMeasureImageFilter.h | 4 ---- .../include/itkHessianRecursiveGaussianImageFilter.h | 4 ---- .../include/itkHessianToObjectnessMeasureImageFilter.h | 4 ---- .../include/itkHoughTransform2DCirclesImageFilter.h | 5 ----- .../include/itkHoughTransform2DLinesImageFilter.h | 4 ---- .../ImageFeature/include/itkLaplacianImageFilter.h | 4 ---- .../include/itkLaplacianSharpeningImageFilter.h | 4 ---- .../include/itkMaskFeaturePointSelectionFilter.h | 4 ---- .../include/itkSimpleContourExtractorImageFilter.h | 4 ---- .../include/itkSobelEdgeDetectionImageFilter.h | 4 ---- .../ImageFeature/include/itkUnsharpMaskImageFilter.h | 2 -- .../itkZeroCrossingBasedEdgeDetectionImageFilter.h | 4 ---- .../ImageFeature/include/itkZeroCrossingImageFilter.h | 4 ---- .../include/itkBinaryFunctorImageFilter.h | 4 ---- .../include/itkBinaryGeneratorImageFilter.h | 4 ---- .../include/itkMaskNeighborhoodOperatorImageFilter.h | 4 ---- .../include/itkNeighborhoodOperatorImageFilter.h | 4 ---- .../ImageFilterBase/include/itkNoiseImageFilter.h | 4 ---- .../include/itkTernaryFunctorImageFilter.h | 4 ---- .../include/itkTernaryGeneratorImageFilter.h | 4 ---- .../include/itkVectorNeighborhoodOperatorImageFilter.h | 4 ---- .../include/itkUnaryFrequencyDomainFilter.h | 2 -- .../ImageFusion/include/itkLabelOverlayImageFilter.h | 4 ---- .../itkDifferenceOfGaussiansGradientImageFilter.h | 4 ---- .../ImageGradient/include/itkGradientImageFilter.h | 4 ---- .../include/itkGradientMagnitudeImageFilter.h | 4 ---- .../itkGradientMagnitudeRecursiveGaussianImageFilter.h | 4 ---- .../include/itkGradientRecursiveGaussianImageFilter.h | 4 ---- .../include/itkVectorGradientMagnitudeImageFilter.h | 4 ---- .../include/itkBSplineDownsampleImageFilter.h | 4 ---- .../ImageGrid/include/itkBSplineUpsampleImageFilter.h | 4 ---- .../ImageGrid/include/itkBinShrinkImageFilter.h | 4 ---- .../ImageGrid/include/itkConstantPadImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkCropImageFilter.h | 4 ---- .../ImageGrid/include/itkInterpolateImageFilter.h | 4 ---- .../include/itkInterpolateImagePointsFilter.h | 4 ---- .../ImageGrid/include/itkMirrorPadImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkOrientImageFilter.h | 4 ---- .../ImageGrid/include/itkRegionOfInterestImageFilter.h | 4 ---- .../ImageGrid/include/itkResampleImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkShrinkImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkSliceImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkTileImageFilter.h | 4 ---- .../Filtering/ImageGrid/include/itkWarpImageFilter.h | 4 ---- .../ImageGrid/include/itkWarpVectorImageFilter.h | 4 ---- .../ImageGrid/include/itkWrapPadImageFilter.h | 4 ---- .../include/itkZeroFluxNeumannPadImageFilter.h | 4 ---- .../ImageIntensity/include/itkAbsImageFilter.h | 4 ---- .../ImageIntensity/include/itkAcosImageFilter.h | 4 ---- .../ImageIntensity/include/itkAddImageFilter.h | 4 ---- .../ImageIntensity/include/itkAndImageFilter.h | 4 ---- .../ImageIntensity/include/itkAsinImageFilter.h | 4 ---- .../ImageIntensity/include/itkAtan2ImageFilter.h | 4 ---- .../ImageIntensity/include/itkAtanImageFilter.h | 4 ---- .../include/itkBinaryMagnitudeImageFilter.h | 4 ---- .../include/itkBoundedReciprocalImageFilter.h | 4 ---- .../ImageIntensity/include/itkClampImageFilter.h | 2 -- .../include/itkComplexToImaginaryImageFilter.h | 4 ---- .../include/itkComplexToModulusImageFilter.h | 4 ---- .../include/itkComplexToPhaseImageFilter.h | 4 ---- .../include/itkComplexToRealImageFilter.h | 4 ---- .../include/itkConstrainedValueAdditionImageFilter.h | 4 ---- .../include/itkConstrainedValueDifferenceImageFilter.h | 4 ---- .../ImageIntensity/include/itkCosImageFilter.h | 4 ---- .../ImageIntensity/include/itkDivideImageFilter.h | 4 ---- .../include/itkEdgePotentialImageFilter.h | 4 ---- .../ImageIntensity/include/itkExpImageFilter.h | 4 ---- .../ImageIntensity/include/itkExpNegativeImageFilter.h | 4 ---- .../include/itkHistogramMatchingImageFilter.h | 4 ---- .../include/itkIntensityWindowingImageFilter.h | 4 ---- .../include/itkInvertIntensityImageFilter.h | 4 ---- .../ImageIntensity/include/itkLog10ImageFilter.h | 4 ---- .../ImageIntensity/include/itkLogImageFilter.h | 4 ---- .../include/itkMagnitudeAndPhaseToComplexImageFilter.h | 4 ---- .../ImageIntensity/include/itkMaskImageFilter.h | 4 ---- .../ImageIntensity/include/itkMaskNegatedImageFilter.h | 4 ---- .../include/itkMatrixIndexSelectionImageFilter.h | 4 ---- .../ImageIntensity/include/itkMaximumImageFilter.h | 4 ---- .../ImageIntensity/include/itkMinimumImageFilter.h | 4 ---- .../ImageIntensity/include/itkModulusImageFilter.h | 4 ---- .../ImageIntensity/include/itkMultiplyImageFilter.h | 4 ---- .../ImageIntensity/include/itkNaryAddImageFilter.h | 4 ---- .../ImageIntensity/include/itkNaryFunctorImageFilter.h | 4 ---- .../ImageIntensity/include/itkNaryMaximumImageFilter.h | 4 ---- .../include/itkNormalizeToConstantImageFilter.h | 4 ---- .../ImageIntensity/include/itkNotImageFilter.h | 4 ---- .../ImageIntensity/include/itkOrImageFilter.h | 4 ---- .../include/itkPolylineMask2DImageFilter.h | 4 ---- .../include/itkPolylineMaskImageFilter.h | 4 ---- .../ImageIntensity/include/itkPowImageFilter.h | 5 ----- .../include/itkRGBToLuminanceImageFilter.h | 4 ---- .../include/itkRescaleIntensityImageFilter.h | 4 ---- .../ImageIntensity/include/itkShiftScaleImageFilter.h | 4 ---- .../ImageIntensity/include/itkSigmoidImageFilter.h | 4 ---- .../ImageIntensity/include/itkSinImageFilter.h | 4 ---- .../ImageIntensity/include/itkSqrtImageFilter.h | 4 ---- .../ImageIntensity/include/itkSquareImageFilter.h | 4 ---- .../ImageIntensity/include/itkSubtractImageFilter.h | 4 ---- .../include/itkSymmetricEigenAnalysisImageFilter.h | 8 -------- .../ImageIntensity/include/itkTanImageFilter.h | 4 ---- .../include/itkVectorExpandImageFilter.h | 4 ---- .../include/itkVectorIndexSelectionCastImageFilter.h | 4 ---- .../include/itkVectorMagnitudeImageFilter.h | 4 ---- .../include/itkVectorRescaleIntensityImageFilter.h | 4 ---- .../ImageIntensity/include/itkWeightedAddImageFilter.h | 4 ---- .../ImageIntensity/include/itkXorImageFilter.h | 4 ---- .../ImageLabel/include/itkChangeLabelImageFilter.h | 4 ---- .../ImageLabel/include/itkScanlineFilterCommon.h | 3 --- .../include/itkAdditiveGaussianNoiseImageFilter.h | 4 ---- .../include/itkSaltAndPepperNoiseImageFilter.h | 4 ---- .../ImageNoise/include/itkShotNoiseImageFilter.h | 4 ---- .../ImageNoise/include/itkSpeckleNoiseImageFilter.h | 4 ---- .../ImageStatistics/include/itkAccumulateImageFilter.h | 4 ---- .../include/itkBinaryProjectionImageFilter.h | 4 ---- .../include/itkLabelOverlapMeasuresImageFilter.h | 4 ---- .../include/itkLabelStatisticsImageFilter.h | 5 ----- .../include/itkMaximumProjectionImageFilter.h | 4 ---- .../include/itkMeanProjectionImageFilter.h | 4 ---- .../include/itkMedianProjectionImageFilter.h | 5 ----- .../include/itkMinimumMaximumImageFilter.h | 4 ---- .../include/itkMinimumProjectionImageFilter.h | 4 ---- .../ImageStatistics/include/itkProjectionImageFilter.h | 4 ---- .../itkStandardDeviationProjectionImageFilter.h | 5 ----- .../ImageStatistics/include/itkStatisticsImageFilter.h | 4 ---- .../include/itkSumProjectionImageFilter.h | 4 ---- .../LabelMap/include/itkAggregateLabelMapFilter.h | 6 +----- .../include/itkAttributeKeepNObjectsLabelMapFilter.h | 6 +----- .../include/itkAttributeOpeningLabelMapFilter.h | 4 ---- .../include/itkAttributePositionLabelMapFilter.h | 4 ---- .../include/itkAttributeRelabelLabelMapFilter.h | 4 ---- .../include/itkAttributeSelectionLabelMapFilter.h | 4 ---- .../include/itkAttributeUniqueLabelMapFilter.h | 4 ---- .../LabelMap/include/itkBinaryFillholeImageFilter.h | 4 ---- .../LabelMap/include/itkBinaryGrindPeakImageFilter.h | 4 ---- .../include/itkBinaryImageToShapeLabelMapFilter.h | 4 ---- .../include/itkBinaryImageToStatisticsLabelMapFilter.h | 4 ---- .../itkBinaryReconstructionByDilationImageFilter.h | 4 ---- .../itkBinaryReconstructionByErosionImageFilter.h | 4 ---- .../include/itkBinaryReconstructionLabelMapFilter.h | 4 ---- .../include/itkBinaryShapeKeepNObjectsImageFilter.h | 4 ---- .../include/itkBinaryShapeOpeningImageFilter.h | 4 ---- .../itkBinaryStatisticsKeepNObjectsImageFilter.h | 4 ---- .../include/itkBinaryStatisticsOpeningImageFilter.h | 4 ---- .../LabelMap/include/itkChangeLabelLabelMapFilter.h | 6 +----- .../LabelMap/include/itkLabelImageToLabelMapFilter.h | 2 -- .../include/itkLabelImageToShapeLabelMapFilter.h | 4 ---- .../include/itkLabelImageToStatisticsLabelMapFilter.h | 4 ---- .../LabelMap/include/itkLabelMapToLabelImageFilter.h | 2 -- .../LabelMap/include/itkLabelSelectionLabelMapFilter.h | 4 ---- .../include/itkLabelShapeKeepNObjectsImageFilter.h | 4 ---- .../LabelMap/include/itkLabelShapeOpeningImageFilter.h | 4 ---- .../itkLabelStatisticsKeepNObjectsImageFilter.h | 4 ---- .../include/itkLabelStatisticsOpeningImageFilter.h | 4 ---- .../LabelMap/include/itkLabelUniqueLabelMapFilter.h | 4 ---- .../LabelMap/include/itkMergeLabelMapFilter.h | 6 +----- .../LabelMap/include/itkRelabelLabelMapFilter.h | 6 +----- .../include/itkShapeKeepNObjectsLabelMapFilter.h | 6 +----- .../LabelMap/include/itkShapeLabelMapFilter.h | 6 +----- .../LabelMap/include/itkShapeOpeningLabelMapFilter.h | 6 +----- .../LabelMap/include/itkShapePositionLabelMapFilter.h | 4 ---- .../LabelMap/include/itkShapeRelabelImageFilter.h | 4 ---- .../LabelMap/include/itkShapeRelabelLabelMapFilter.h | 6 +----- .../LabelMap/include/itkShapeUniqueLabelMapFilter.h | 6 +----- .../LabelMap/include/itkShiftScaleLabelMapFilter.h | 6 +----- .../include/itkStatisticsKeepNObjectsLabelMapFilter.h | 6 +----- .../LabelMap/include/itkStatisticsLabelMapFilter.h | 6 +----- .../include/itkStatisticsOpeningLabelMapFilter.h | 6 +----- .../include/itkStatisticsPositionLabelMapFilter.h | 4 ---- .../LabelMap/include/itkStatisticsRelabelImageFilter.h | 4 ---- .../include/itkStatisticsRelabelLabelMapFilter.h | 6 +----- .../include/itkStatisticsUniqueLabelMapFilter.h | 6 +----- .../include/itkBasicDilateImageFilter.h | 4 ---- .../include/itkBasicErodeImageFilter.h | 4 ---- .../include/itkClosingByReconstructionImageFilter.h | 4 ---- .../include/itkDoubleThresholdImageFilter.h | 4 ---- .../include/itkGrayscaleConnectedClosingImageFilter.h | 4 ---- .../include/itkGrayscaleConnectedOpeningImageFilter.h | 4 ---- .../include/itkGrayscaleFillholeImageFilter.h | 4 ---- .../include/itkGrayscaleFunctionDilateImageFilter.h | 4 ---- .../include/itkGrayscaleFunctionErodeImageFilter.h | 4 ---- .../include/itkGrayscaleGeodesicDilateImageFilter.h | 4 ---- .../include/itkGrayscaleGeodesicErodeImageFilter.h | 4 ---- .../include/itkGrayscaleGrindPeakImageFilter.h | 4 ---- .../include/itkHConcaveImageFilter.h | 4 ---- .../include/itkHConvexImageFilter.h | 4 ---- .../include/itkHMaximaImageFilter.h | 4 ---- .../include/itkHMinimaImageFilter.h | 4 ---- .../include/itkOpeningByReconstructionImageFilter.h | 4 ---- .../include/itkRegionalMaximaImageFilter.h | 4 ---- .../include/itkRegionalMinimaImageFilter.h | 4 ---- .../include/itkValuedRegionalExtremaImageFilter.h | 4 ---- .../include/itkValuedRegionalMaximaImageFilter.h | 4 ---- .../include/itkValuedRegionalMinimaImageFilter.h | 4 ---- .../Path/include/itkContourExtractor2DImageFilter.h | 4 ---- .../include/itkDiscreteCurvatureQuadEdgeMeshFilter.h | 4 ---- .../itkDiscreteCurvatureTensorQuadEdgeMeshFilter.h | 8 ++------ .../itkDiscreteGaussianCurvatureQuadEdgeMeshFilter.h | 4 ---- .../itkDiscreteMaximumCurvatureQuadEdgeMeshFilter.h | 4 ---- .../itkDiscreteMeanCurvatureQuadEdgeMeshFilter.h | 4 ---- .../itkDiscreteMinimumCurvatureQuadEdgeMeshFilter.h | 4 ---- .../itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h | 4 ---- .../itkLaplacianDeformationQuadEdgeMeshFilter.h | 2 -- .../Smoothing/include/itkBinomialBlurImageFilter.h | 4 ---- .../Smoothing/include/itkBoxMeanImageFilter.h | 5 ----- .../Smoothing/include/itkBoxSigmaImageFilter.h | 5 ----- .../Smoothing/include/itkDiscreteGaussianImageFilter.h | 6 ------ .../Filtering/Smoothing/include/itkMeanImageFilter.h | 4 ---- .../Filtering/Smoothing/include/itkMedianImageFilter.h | 4 ---- .../include/itkSmoothingRecursiveGaussianImageFilter.h | 4 ---- .../include/itkBinaryThresholdImageFilter.h | 4 ---- .../include/itkBinaryThresholdProjectionImageFilter.h | 4 ---- .../include/itkHistogramThresholdImageFilter.h | 4 ---- .../include/itkKappaSigmaThresholdImageFilter.h | 4 ---- .../include/itkOtsuMultipleThresholdsImageFilter.h | 4 ---- .../Thresholding/include/itkThresholdImageFilter.h | 4 ---- .../include/itkThresholdLabelerImageFilter.h | 4 ---- .../Review/include/itkGridForwardWarpImageFilter.h | 4 ---- .../Review/include/itkLabelGeometryImageFilter.h | 4 ---- .../itkMultiphaseDenseFiniteDifferenceImageFilter.h | 4 ---- .../itkMultiphaseSparseFiniteDifferenceImageFilter.h | 4 ---- .../include/itkRobustAutomaticThresholdImageFilter.h | 4 ---- .../itkScalarChanAndVeseDenseLevelSetImageFilter.h | 4 ---- .../itkScalarChanAndVeseSparseLevelSetImageFilter.h | 4 ---- .../Eigen/include/itkEigenAnalysis2DImageFilter.h | 4 ---- .../FEM/include/itkImageToRectilinearFEMObjectFilter.h | 8 ++------ .../include/itkMultiResolutionPyramidImageFilter.h | 4 ---- .../itkPhysicsBasedNonRigidRegistrationMethod.h | 4 ---- .../include/itkDefaultImageToImageMetricTraitsv4.h | 8 +++----- .../Metricsv4/include/itkImageToImageMetricv4.h | 6 ++---- .../include/itkBayesianClassifierImageFilter.h | 4 ---- .../itkBayesianClassifierInitializationImageFilter.h | 4 ---- .../include/itkScalarImageKmeansImageFilter.h | 4 ---- .../include/itkConnectedComponentFunctorImageFilter.h | 4 ---- .../include/itkHardConnectedComponentImageFilter.h | 4 ---- .../include/itkRelabelComponentImageFilter.h | 4 ---- .../include/itkScalarConnectedComponentImageFilter.h | 4 ---- .../include/itkVectorConnectedComponentImageFilter.h | 4 ---- .../include/itkKLMRegionGrowImageFilter.h | 8 ++------ .../LabelVoting/include/itkBinaryMedianImageFilter.h | 4 ---- .../LabelVoting/include/itkLabelVotingImageFilter.h | 4 ---- .../include/itkVotingBinaryHoleFillingImageFilter.h | 4 ---- .../LabelVoting/include/itkVotingBinaryImageFilter.h | 4 ---- .../itkVotingBinaryIterativeHoleFillingImageFilter.h | 4 ---- .../include/itkCannySegmentationLevelSetImageFilter.h | 4 ---- .../LevelSets/include/itkCollidingFrontsImageFilter.h | 4 ---- .../LevelSets/include/itkCurvesLevelSetImageFilter.h | 4 ---- .../include/itkExtensionVelocitiesImageFilter.h | 4 ---- .../include/itkNarrowBandCurvesLevelSetImageFilter.h | 4 ---- .../include/itkNarrowBandLevelSetImageFilter.h | 4 ---- ...arrowBandThresholdSegmentationLevelSetImageFilter.h | 4 ---- .../itkParallelSparseFieldLevelSetImageFilter.h | 4 ---- .../include/itkReinitializeLevelSetImageFilter.h | 4 ---- .../include/itkSegmentationLevelSetImageFilter.h | 4 ---- .../itkSparseFieldFourthOrderLevelSetImageFilter.h | 4 ---- .../include/itkSparseFieldLevelSetImageFilter.h | 4 ---- .../include/itkWhitakerSparseLevelSetImage.h | 6 ------ .../include/itkMRFImageFilter.h | 4 ---- .../include/itkRGBGibbsPriorFilter.h | 4 ---- .../include/itkConfidenceConnectedImageFilter.h | 4 ---- .../include/itkConnectedThresholdImageFilter.h | 4 ---- .../include/itkIsolatedConnectedImageFilter.h | 4 ---- .../include/itkNeighborhoodConnectedImageFilter.h | 4 ---- .../include/itkVectorConfidenceConnectedImageFilter.h | 5 ----- .../include/itkVoronoiPartitioningImageFilter.h | 4 ---- .../include/itkVoronoiSegmentationImageFilter.h | 4 ---- .../include/itkVoronoiSegmentationRGBImageFilter.h | 4 ---- .../Watersheds/include/itkTobogganImageFilter.h | 4 ---- .../Watersheds/include/itkWatershedImageFilter.h | 4 ---- .../BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h | 6 ------ Utilities/Doxygen/DoxygenConfig.cmake | 1 - Wrapping/DoxygenConfig.cmake | 1 - 349 files changed, 35 insertions(+), 1406 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f349b3f98f..67f79fcbcfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -494,11 +494,11 @@ option( mark_as_advanced(ITK_USE_64BITS_IDS) # ITK turn on concept checking -option( - ITK_USE_CONCEPT_CHECKING - "Turn on concept checking to give helpful errors at compile time if a type cannot be used as a template parameter." - ON) -mark_as_advanced(ITK_USE_CONCEPT_CHECKING) +if(ITK_USE_CONCEPT_CHECKING) + message( + WARNING + "Ignoring ITK_USE_CONCEPT_CHECKING, as concept checking is performed unconditionally. This variable is no longer used") +endif() if(ITK_USE_STRICT_CONCEPT_CHECKING) message( WARNING diff --git a/Modules/Bridge/VTK/include/itkVTKImageExport.h b/Modules/Bridge/VTK/include/itkVTKImageExport.h index 1c0747e6d3b..22ca4d28bd7 100644 --- a/Modules/Bridge/VTK/include/itkVTKImageExport.h +++ b/Modules/Bridge/VTK/include/itkVTKImageExport.h @@ -73,9 +73,8 @@ class ITK_TEMPLATE_EXPORT VTKImageExport : public VTKImageExportBase /** The type of the input image. */ using InputImageType = TInputImage; -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(ImageDimensionCheck, (Concept::SameDimensionOrMinusOneOrTwo<3, Self::InputImageDimension>)); -#endif + /** Set the input image of this image exporter. */ using Superclass::SetInput; void diff --git a/Modules/Core/Common/include/itkCompensatedSummation.h b/Modules/Core/Common/include/itkCompensatedSummation.h index 7dbb6235c31..9c7c2bd5f2c 100644 --- a/Modules/Core/Common/include/itkCompensatedSummation.h +++ b/Modules/Core/Common/include/itkCompensatedSummation.h @@ -124,10 +124,8 @@ class ITK_TEMPLATE_EXPORT CompensatedSummation AccumulateType m_Sum{}; AccumulateType m_Compensation{}; -// Maybe support more types in the future with template specialization. -#ifdef ITK_USE_CONCEPT_CHECKING + // Maybe support more types in the future with template specialization. itkConceptMacro(OnlyDefinedForFloatingPointTypes, (itk::Concept::IsFloatingPoint)); -#endif // ITK_USE_CONCEPT_CHECKING }; void ITKCommon_EXPORT diff --git a/Modules/Core/Common/include/itkExtractImageFilter.h b/Modules/Core/Common/include/itkExtractImageFilter.h index 1069ce756bc..ba41f0d9138 100644 --- a/Modules/Core/Common/include/itkExtractImageFilter.h +++ b/Modules/Core/Common/include/itkExtractImageFilter.h @@ -259,12 +259,7 @@ class ITK_TEMPLATE_EXPORT ExtractImageFilter : public InPlaceImageFilter)); - // End concept checking -#endif protected: ExtractImageFilter(); diff --git a/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.h b/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.h index b0f9bca4ac1..16a16cab9a0 100644 --- a/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.h +++ b/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.h @@ -81,12 +81,8 @@ class ITK_TEMPLATE_EXPORT FiniteCylinderSpatialFunction : public InteriorExterio OutputType Evaluate(const InputType & position) const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DimensionShouldBe3, (Concept::SameDimension)); itkConceptMacro(PointDimensionShouldBe3, (Concept::SameDimension)); - // End concept checking -#endif protected: FiniteCylinderSpatialFunction(); diff --git a/Modules/Core/Common/include/itkHeavisideStepFunctionBase.h b/Modules/Core/Common/include/itkHeavisideStepFunctionBase.h index e2a2ae0b760..6a5f1f4361a 100644 --- a/Modules/Core/Common/include/itkHeavisideStepFunctionBase.h +++ b/Modules/Core/Common/include/itkHeavisideStepFunctionBase.h @@ -73,11 +73,9 @@ class ITK_TEMPLATE_EXPORT HeavisideStepFunctionBase : public FunctionBase)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); -#endif // ITK_USE_CONCEPT_CHECKING protected: HeavisideStepFunctionBase() diff --git a/Modules/Core/Common/include/itkKernelFunctionBase.h b/Modules/Core/Common/include/itkKernelFunctionBase.h index 7ea9fbc921e..9a56fdbf40a 100644 --- a/Modules/Core/Common/include/itkKernelFunctionBase.h +++ b/Modules/Core/Common/include/itkKernelFunctionBase.h @@ -58,11 +58,7 @@ class ITK_TEMPLATE_EXPORT KernelFunctionBase : public FunctionBase)); - // End concept checking -#endif protected: KernelFunctionBase() = default; diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h index a4b837206d7..2f4a87123c2 100644 --- a/Modules/Core/Common/include/itkMath.h +++ b/Modules/Core/Common/include/itkMath.h @@ -212,10 +212,8 @@ template inline TReturn CastWithRangeCheck(TInput x) { -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(OnlyDefinedForIntegerTypes1, (itk::Concept::IsInteger)); itkConceptMacro(OnlyDefinedForIntegerTypes2, (itk::Concept::IsInteger)); -#endif // ITK_USE_CONCEPT_CHECKING auto ret = static_cast(x); if constexpr (sizeof(TReturn) > sizeof(TInput) && diff --git a/Modules/Core/Common/include/itkSobelOperator.h b/Modules/Core/Common/include/itkSobelOperator.h index 20cb873986b..c694cf5879f 100644 --- a/Modules/Core/Common/include/itkSobelOperator.h +++ b/Modules/Core/Common/include/itkSobelOperator.h @@ -120,11 +120,7 @@ class ITK_TEMPLATE_EXPORT SobelOperator : public NeighborhoodOperator::ValueType>)); - // End concept checking -#endif /** Type alias support for coefficient vector type.*/ using typename Superclass::CoefficientVector; diff --git a/Modules/Core/Common/include/itkStreamingImageFilter.h b/Modules/Core/Common/include/itkStreamingImageFilter.h index 2b291a1c3ad..1e3979078f5 100644 --- a/Modules/Core/Common/include/itkStreamingImageFilter.h +++ b/Modules/Core/Common/include/itkStreamingImageFilter.h @@ -105,12 +105,8 @@ class ITK_TEMPLATE_EXPORT StreamingImageFilter : public ImageToImageFilter)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: StreamingImageFilter(); diff --git a/Modules/Core/Common/src/itkConfigure.h.in b/Modules/Core/Common/src/itkConfigure.h.in index 6eebd5b3763..c2cb088ac42 100644 --- a/Modules/Core/Common/src/itkConfigure.h.in +++ b/Modules/Core/Common/src/itkConfigure.h.in @@ -73,7 +73,6 @@ #cmakedefine ITK_LEGACY_REMOVE #cmakedefine ITK_LEGACY_SILENT #cmakedefine ITK_FUTURE_LEGACY_REMOVE -#cmakedefine ITK_USE_CONCEPT_CHECKING #cmakedefine ITK_USE_FFTWF #cmakedefine ITK_USE_FFTWD #cmakedefine ITK_USE_CUFFTW diff --git a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx b/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx index f27da3fd7a9..00ef44decc2 100644 --- a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx +++ b/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx @@ -70,12 +70,9 @@ class TanHelperImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(TanHelperImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif + protected: TanHelperImageFilter() = default; ~TanHelperImageFilter() override = default; diff --git a/Modules/Core/FiniteDifference/include/itkDenseFiniteDifferenceImageFilter.h b/Modules/Core/FiniteDifference/include/itkDenseFiniteDifferenceImageFilter.h index cb813a5777e..c8aa62de28e 100644 --- a/Modules/Core/FiniteDifference/include/itkDenseFiniteDifferenceImageFilter.h +++ b/Modules/Core/FiniteDifference/include/itkDenseFiniteDifferenceImageFilter.h @@ -102,14 +102,10 @@ class ITK_TEMPLATE_EXPORT DenseFiniteDifferenceImageFilter /** The container type for the update buffer. */ using UpdateBufferType = OutputImageType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputTimesDoubleCheck, (Concept::MultiplyOperator)); itkConceptMacro(OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(OutputAdditiveAndAssignOperatorsCheck, (Concept::AdditiveAndAssignOperators)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: DenseFiniteDifferenceImageFilter() { m_UpdateBuffer = UpdateBufferType::New(); } diff --git a/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h b/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h index 4104410bcbc..3375cb57f50 100644 --- a/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h +++ b/Modules/Core/FiniteDifference/include/itkFiniteDifferenceImageFilter.h @@ -222,11 +222,7 @@ class ITK_TEMPLATE_EXPORT FiniteDifferenceImageFilter : public InPlaceImageFilte this->SetIsInitialized(true); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputPixelIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: FiniteDifferenceImageFilter(); diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h index 09555db62f1..87a15677112 100644 --- a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h +++ b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h @@ -87,13 +87,9 @@ class ITK_TEMPLATE_EXPORT GPUDenseFiniteDifferenceImageFilter /** The container type for the update buffer. */ using UpdateBufferType = OutputImageType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputTimesDoubleCheck, (Concept::MultiplyOperator)); itkConceptMacro(OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif /** Get OpenCL Kernel source as a string, creates a GetOpenCLSource method */ itkGetOpenCLSourceFromKernelMacro(GPUDenseFiniteDifferenceImageFilterKernel); diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceImageFilter.h b/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceImageFilter.h index 496fa951f5d..ccfffd7a2e6 100644 --- a/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceImageFilter.h +++ b/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceImageFilter.h @@ -128,11 +128,7 @@ class ITK_TEMPLATE_EXPORT GPUFiniteDifferenceImageFilter itkGetConstReferenceMacro(State, GPUFiniteDifferenceFilterEnum); #endif -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputPixelIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif /** Methods to get timers */ itkGetConstReferenceMacro(InitTime, TimeProbe); diff --git a/Modules/Core/ImageAdaptors/include/itkComplexConjugateImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkComplexConjugateImageAdaptor.h index 4b89104c6ca..183c695dc1b 100644 --- a/Modules/Core/ImageAdaptors/include/itkComplexConjugateImageAdaptor.h +++ b/Modules/Core/ImageAdaptors/include/itkComplexConjugateImageAdaptor.h @@ -80,13 +80,9 @@ class ComplexConjugateImageAdaptor /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ComplexConjugateImageAdaptor); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking. */ itkConceptMacro(InputConvertibleToComplex, (Concept::Convertible::ValueType>, typename TImage::PixelType>)); - // End concept checking. */ -#endif protected: ComplexConjugateImageAdaptor() = default; diff --git a/Modules/Core/ImageFunction/include/itkBSplineDecompositionImageFilter.h b/Modules/Core/ImageFunction/include/itkBSplineDecompositionImageFilter.h index 9237ed15fef..e33815a5faa 100644 --- a/Modules/Core/ImageFunction/include/itkBSplineDecompositionImageFilter.h +++ b/Modules/Core/ImageFunction/include/itkBSplineDecompositionImageFilter.h @@ -119,14 +119,10 @@ class ITK_TEMPLATE_EXPORT BSplineDecompositionImageFilter : public ImageToImageF itkGetConstMacro(NumberOfPoles, unsigned int); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: BSplineDecompositionImageFilter(); diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h index 007c577c8dd..e687e7a5fce 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h @@ -425,11 +425,6 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMesh : public Mesh)); - // End concept checking -#endif protected: ExtractSliceImageFilter(); diff --git a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h index 944dd0204d9..a0df764c4a0 100644 --- a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.h @@ -83,14 +83,10 @@ class ITK_TEMPLATE_EXPORT StretchIntensityImageFilter : public ImageSource)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(RealTypeMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(RealTypeAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: StretchIntensityImageFilter(); diff --git a/Modules/Core/Transform/include/itkTransformGeometryImageFilter.h b/Modules/Core/Transform/include/itkTransformGeometryImageFilter.h index eb4b3737acb..25e34453782 100644 --- a/Modules/Core/Transform/include/itkTransformGeometryImageFilter.h +++ b/Modules/Core/Transform/include/itkTransformGeometryImageFilter.h @@ -131,10 +131,8 @@ class ITK_TEMPLATE_EXPORT TransformGeometryImageFilter : public InPlaceImageFilt static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); -#endif /** Transform type alias */ using TransformType = Transform; diff --git a/Modules/Filtering/AnisotropicSmoothing/include/itkCurvatureAnisotropicDiffusionImageFilter.h b/Modules/Filtering/AnisotropicSmoothing/include/itkCurvatureAnisotropicDiffusionImageFilter.h index ecea437e380..d2b689b2bbd 100644 --- a/Modules/Filtering/AnisotropicSmoothing/include/itkCurvatureAnisotropicDiffusionImageFilter.h +++ b/Modules/Filtering/AnisotropicSmoothing/include/itkCurvatureAnisotropicDiffusionImageFilter.h @@ -79,11 +79,7 @@ class ITK_TEMPLATE_EXPORT CurvatureAnisotropicDiffusionImageFilter /** Extract superclass image dimension. */ static constexpr unsigned int ImageDimension = Superclass::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: CurvatureAnisotropicDiffusionImageFilter() diff --git a/Modules/Filtering/AnisotropicSmoothing/include/itkGradientAnisotropicDiffusionImageFilter.h b/Modules/Filtering/AnisotropicSmoothing/include/itkGradientAnisotropicDiffusionImageFilter.h index 38e852f05a4..4d4adde8bfc 100644 --- a/Modules/Filtering/AnisotropicSmoothing/include/itkGradientAnisotropicDiffusionImageFilter.h +++ b/Modules/Filtering/AnisotropicSmoothing/include/itkGradientAnisotropicDiffusionImageFilter.h @@ -72,11 +72,7 @@ class ITK_TEMPLATE_EXPORT GradientAnisotropicDiffusionImageFilter /** Extract information from the superclass. */ static constexpr unsigned int ImageDimension = Superclass::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(UpdateBufferHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GradientAnisotropicDiffusionImageFilter() diff --git a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorCurvatureAnisotropicDiffusionImageFilter.h b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorCurvatureAnisotropicDiffusionImageFilter.h index 1ab01a759b1..da1891198ae 100644 --- a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorCurvatureAnisotropicDiffusionImageFilter.h +++ b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorCurvatureAnisotropicDiffusionImageFilter.h @@ -89,13 +89,9 @@ class ITK_TEMPLATE_EXPORT VectorCurvatureAnisotropicDiffusionImageFilter /** Determine the image dimension. */ static constexpr unsigned int ImageDimension = Superclass::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorCurvatureAnisotropicDiffusionImageFilter() diff --git a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorGradientAnisotropicDiffusionImageFilter.h b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorGradientAnisotropicDiffusionImageFilter.h index 41b0c6bba4f..faa2b52f4be 100644 --- a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorGradientAnisotropicDiffusionImageFilter.h +++ b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorGradientAnisotropicDiffusionImageFilter.h @@ -82,13 +82,9 @@ class ITK_TEMPLATE_EXPORT VectorGradientAnisotropicDiffusionImageFilter /** Determine the image dimension from the superclass. */ static constexpr unsigned int ImageDimension = Superclass::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorGradientAnisotropicDiffusionImageFilter() diff --git a/Modules/Filtering/AntiAlias/include/itkAntiAliasBinaryImageFilter.h b/Modules/Filtering/AntiAlias/include/itkAntiAliasBinaryImageFilter.h index 578f47c63f2..d2e47a20325 100644 --- a/Modules/Filtering/AntiAlias/include/itkAntiAliasBinaryImageFilter.h +++ b/Modules/Filtering/AntiAlias/include/itkAntiAliasBinaryImageFilter.h @@ -154,12 +154,8 @@ class ITK_TEMPLATE_EXPORT AntiAliasBinaryImageFilter : public SparseFieldLevelSe return this->GetNumberOfIterations(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: AntiAliasBinaryImageFilter(); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.h b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.h index 6c9dd323088..001886c68d1 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.h +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.h @@ -112,15 +112,11 @@ class ITK_TEMPLATE_EXPORT BinaryPruningImageFilter : public ImageToImageFilter)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); itkConceptMacro(AdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(IntConvertibleToPixelTypeCheck, (Concept::Convertible)); itkConceptMacro(PixelLessThanIntCheck, (Concept::LessThanComparable)); - // End concept checking -#endif protected: BinaryPruningImageFilter(); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.h b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.h index 2882261324f..03f1ca51d83 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.h +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.h @@ -114,15 +114,11 @@ class ITK_TEMPLATE_EXPORT BinaryThinningImageFilter : public ImageToImageFilter< static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputConvertibleToIntCheck, (Concept::Convertible)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); - // End concept checking -#endif protected: BinaryThinningImageFilter(); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkDilateObjectMorphologyImageFilter.h b/Modules/Filtering/BinaryMathematicalMorphology/include/itkDilateObjectMorphologyImageFilter.h index dedbc26b693..44e9e0e7ef3 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkDilateObjectMorphologyImageFilter.h +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkDilateObjectMorphologyImageFilter.h @@ -80,11 +80,7 @@ class ITK_TEMPLATE_EXPORT DilateObjectMorphologyImageFilter /** Type of the pixels in the Kernel. */ using KernelPixelType = typename TKernel::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: DilateObjectMorphologyImageFilter(); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkErodeObjectMorphologyImageFilter.h b/Modules/Filtering/BinaryMathematicalMorphology/include/itkErodeObjectMorphologyImageFilter.h index e860a29fa65..6eba37c371c 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkErodeObjectMorphologyImageFilter.h +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkErodeObjectMorphologyImageFilter.h @@ -101,11 +101,7 @@ class ITK_TEMPLATE_EXPORT ErodeObjectMorphologyImageFilter /** Type of the pixels in the Kernel. */ using KernelPixelType = typename TKernel::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: ErodeObjectMorphologyImageFilter(); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkObjectMorphologyImageFilter.h b/Modules/Filtering/BinaryMathematicalMorphology/include/itkObjectMorphologyImageFilter.h index ce0194ee747..e9c5f6a1441 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkObjectMorphologyImageFilter.h +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkObjectMorphologyImageFilter.h @@ -171,8 +171,6 @@ class ITK_TEMPLATE_EXPORT ObjectMorphologyImageFilter : public ImageToImageFilte * an object's boundary. */ itkGetConstMacro(UseBoundaryCondition, bool); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(OutputInputEqualityComparableCheck, @@ -181,8 +179,6 @@ class ITK_TEMPLATE_EXPORT ObjectMorphologyImageFilter : public ImageToImageFilte itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputEqualityComparable, (Concept::EqualityComparable)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ObjectMorphologyImageFilter(); diff --git a/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.h b/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.h index a46d23f7ccd..d94ad186f7d 100644 --- a/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.h +++ b/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.h @@ -216,11 +216,7 @@ class ITK_TEMPLATE_EXPORT MaskedFFTNormalizedCorrelationImageFilter /** Get the maximum number of overlapping pixels. */ itkGetMacro(MaximumNumberOfOverlappingPixels, SizeValueType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputPixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: MaskedFFTNormalizedCorrelationImageFilter() diff --git a/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h b/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h index c02a87aa527..64fb503abf8 100644 --- a/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h +++ b/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h @@ -125,15 +125,11 @@ class ITK_TEMPLATE_EXPORT NormalizedCorrelationImageFilter this->SetOperator(t); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OperatorHasNumericTraitsCheck, (Concept::HasNumericTraits)); // This filter can only operate on data types that are signed. itkConceptMacro(SignedOutputPixelType, (Concept::Signed)); - // End concept checking -#endif protected: NormalizedCorrelationImageFilter() = default; diff --git a/Modules/Filtering/CurvatureFlow/include/itkBinaryMinMaxCurvatureFlowImageFilter.h b/Modules/Filtering/CurvatureFlow/include/itkBinaryMinMaxCurvatureFlowImageFilter.h index 8589636805f..4d09dc914d1 100644 --- a/Modules/Filtering/CurvatureFlow/include/itkBinaryMinMaxCurvatureFlowImageFilter.h +++ b/Modules/Filtering/CurvatureFlow/include/itkBinaryMinMaxCurvatureFlowImageFilter.h @@ -111,12 +111,8 @@ class ITK_TEMPLATE_EXPORT BinaryMinMaxCurvatureFlowImageFilter itkSetMacro(Threshold, double); itkGetConstMacro(Threshold, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: protected: diff --git a/Modules/Filtering/CurvatureFlow/include/itkCurvatureFlowImageFilter.h b/Modules/Filtering/CurvatureFlow/include/itkCurvatureFlowImageFilter.h index 73c3d7ab0bc..14e262c5ab1 100644 --- a/Modules/Filtering/CurvatureFlow/include/itkCurvatureFlowImageFilter.h +++ b/Modules/Filtering/CurvatureFlow/include/itkCurvatureFlowImageFilter.h @@ -140,8 +140,6 @@ class ITK_TEMPLATE_EXPORT CurvatureFlowImageFilter : public DenseFiniteDifferenc /** Get the timestep parameter. */ itkGetConstMacro(TimeStep, TimeStepType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(OutputDivisionOperatorsCheck, (Concept::DivisionOperators)); @@ -149,8 +147,6 @@ class ITK_TEMPLATE_EXPORT CurvatureFlowImageFilter : public DenseFiniteDifferenc itkConceptMacro(IntOutputMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(OutputLessThanDoubleCheck, (Concept::LessThanComparable)); itkConceptMacro(OutputDoubleAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: CurvatureFlowImageFilter(); diff --git a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowImageFilter.h b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowImageFilter.h index ba3c79ac693..ad1177cd3d1 100644 --- a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowImageFilter.h +++ b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowImageFilter.h @@ -116,8 +116,6 @@ class ITK_TEMPLATE_EXPORT MinMaxCurvatureFlowImageFilter : public CurvatureFlowI itkSetMacro(StencilRadius, RadiusValueType); itkGetConstMacro(StencilRadius, RadiusValueType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(UnsignedLongConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputLessThanComparableCheck, (Concept::LessThanComparable)); @@ -129,8 +127,6 @@ class ITK_TEMPLATE_EXPORT MinMaxCurvatureFlowImageFilter : public CurvatureFlowI (Concept::GreaterThanComparable)); itkConceptMacro(UnsignedLongOutputAditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: MinMaxCurvatureFlowImageFilter(); diff --git a/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.h b/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.h index b2afda8499b..48626fe6f72 100644 --- a/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.h +++ b/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.h @@ -280,8 +280,6 @@ class ITK_TEMPLATE_EXPORT DiffusionTensor3DReconstructionImageFilter #endif itkGetConstReferenceMacro(BValue, TTensorPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(ReferenceEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(TensorEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(GradientConvertibleToDoubleCheck, (Concept::Convertible)); @@ -293,8 +291,6 @@ class ITK_TEMPLATE_EXPORT DiffusionTensor3DReconstructionImageFilter itkConceptMacro(ReferenceOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(TensorOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: DiffusionTensor3DReconstructionImageFilter(); diff --git a/Modules/Filtering/DiffusionTensorImage/include/itkTensorFractionalAnisotropyImageFilter.h b/Modules/Filtering/DiffusionTensorImage/include/itkTensorFractionalAnisotropyImageFilter.h index eea4d5087c6..b66d184e95e 100644 --- a/Modules/Filtering/DiffusionTensorImage/include/itkTensorFractionalAnisotropyImageFilter.h +++ b/Modules/Filtering/DiffusionTensorImage/include/itkTensorFractionalAnisotropyImageFilter.h @@ -102,11 +102,7 @@ class TensorFractionalAnisotropyImageFilter this->Superclass::PrintSelf(os, indent); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: TensorFractionalAnisotropyImageFilter() = default; diff --git a/Modules/Filtering/DiffusionTensorImage/include/itkTensorRelativeAnisotropyImageFilter.h b/Modules/Filtering/DiffusionTensorImage/include/itkTensorRelativeAnisotropyImageFilter.h index 539fa0fb0c7..f9d537f5a23 100644 --- a/Modules/Filtering/DiffusionTensorImage/include/itkTensorRelativeAnisotropyImageFilter.h +++ b/Modules/Filtering/DiffusionTensorImage/include/itkTensorRelativeAnisotropyImageFilter.h @@ -102,11 +102,7 @@ class TensorRelativeAnisotropyImageFilter this->Superclass::PrintSelf(os, indent); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: TensorRelativeAnisotropyImageFilter() = default; diff --git a/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.h b/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.h index d3b1e5b859a..2d6044bfe09 100644 --- a/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.h +++ b/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.h @@ -114,14 +114,10 @@ class ITK_TEMPLATE_EXPORT ExponentialDisplacementFieldImageFilter : public Image static constexpr unsigned int PixelDimension = InputPixelType::Dimension; static constexpr unsigned int OutputPixelDimension = OutputPixelType::Dimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck3, (Concept::SameDimension)); - // End concept checking -#endif protected: ExponentialDisplacementFieldImageFilter(); diff --git a/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.h b/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.h index 4f2849e4097..4fa8192c880 100644 --- a/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.h +++ b/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.h @@ -169,11 +169,7 @@ class ITK_TEMPLATE_EXPORT InverseDisplacementFieldImageFilter : public ImageToIm ModifiedTimeType GetMTime() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: InverseDisplacementFieldImageFilter(); diff --git a/Modules/Filtering/DisplacementField/include/itkIterativeInverseDisplacementFieldImageFilter.h b/Modules/Filtering/DisplacementField/include/itkIterativeInverseDisplacementFieldImageFilter.h index 237b64e6807..162160c6202 100644 --- a/Modules/Filtering/DisplacementField/include/itkIterativeInverseDisplacementFieldImageFilter.h +++ b/Modules/Filtering/DisplacementField/include/itkIterativeInverseDisplacementFieldImageFilter.h @@ -103,14 +103,10 @@ class ITK_TEMPLATE_EXPORT IterativeInverseDisplacementFieldImageFilter itkSetMacro(StopValue, double); itkGetConstMacro(StopValue, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: IterativeInverseDisplacementFieldImageFilter(); diff --git a/Modules/Filtering/DisplacementField/include/itkTransformToDisplacementFieldFilter.h b/Modules/Filtering/DisplacementField/include/itkTransformToDisplacementFieldFilter.h index 8aec91adb7d..7612a0fd7df 100644 --- a/Modules/Filtering/DisplacementField/include/itkTransformToDisplacementFieldFilter.h +++ b/Modules/Filtering/DisplacementField/include/itkTransformToDisplacementFieldFilter.h @@ -150,12 +150,8 @@ class ITK_TEMPLATE_EXPORT TransformToDisplacementFieldFilter : public ImageSourc itkBooleanMacro(UseReferenceImage); itkGetConstMacro(UseReferenceImage, bool); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking static constexpr unsigned int PixelDimension = PixelType::Dimension; itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: TransformToDisplacementFieldFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkApproximateSignedDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkApproximateSignedDistanceMapImageFilter.h index 4fd9c9f1916..e23411f9ce2 100644 --- a/Modules/Filtering/DistanceMap/include/itkApproximateSignedDistanceMapImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkApproximateSignedDistanceMapImageFilter.h @@ -123,11 +123,7 @@ class ITK_TEMPLATE_EXPORT ApproximateSignedDistanceMapImageFilter : public Image itkSetMacro(OutsideValue, InputPixelType); itkGetConstMacro(OutsideValue, InputPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); - // End concept checking -#endif protected: ApproximateSignedDistanceMapImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.h index 60011675f7d..ef276990e01 100644 --- a/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.h @@ -123,11 +123,7 @@ class ITK_TEMPLATE_EXPORT ContourDirectedMeanDistanceImageFilter : public ImageT itkGetConstMacro(UseImageSpacing, bool); itkBooleanMacro(UseImageSpacing); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ContourDirectedMeanDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkContourMeanDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkContourMeanDistanceImageFilter.h index 65a4b17f16b..1563f8dbb16 100644 --- a/Modules/Filtering/DistanceMap/include/itkContourMeanDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkContourMeanDistanceImageFilter.h @@ -129,11 +129,7 @@ class ITK_TEMPLATE_EXPORT ContourMeanDistanceImageFilter : public ImageToImageFi itkGetConstMacro(UseImageSpacing, bool); itkBooleanMacro(UseImageSpacing); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ContourMeanDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.h index 175a9d7fe4f..8e5e90e5c2b 100644 --- a/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.h @@ -174,17 +174,13 @@ class ITK_TEMPLATE_EXPORT DanielssonDistanceMapImageFilter : public ImageToImage DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override; -#ifdef ITK_USE_CONCEPT_CHECKING static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; static constexpr unsigned int VoronoiImageDimension = TVoronoiImage::ImageDimension; - // Begin concept checking itkConceptMacro(InputOutputSameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputVoronoiSameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: DanielssonDistanceMapImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h index e9e57b7f159..b92fe4afc04 100644 --- a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h @@ -134,11 +134,7 @@ class ITK_TEMPLATE_EXPORT DirectedHausdorffDistanceImageFilter : public ImageToI itkGetConstMacro(DirectedHausdorffDistance, RealType); itkGetConstMacro(AverageHausdorffDistance, RealType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: DirectedHausdorffDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.h index ca7c1565b27..a6e51b234d4 100644 --- a/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.h @@ -126,8 +126,6 @@ class ITK_TEMPLATE_EXPORT FastChamferDistanceImageFilter : public ImageToImageFi NarrowBandPointer GetNarrowBand() const; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); itkConceptMacro(FloatConvertibleToPixelTypeCheck, (Concept::Convertible)); @@ -137,8 +135,6 @@ class ITK_TEMPLATE_EXPORT FastChamferDistanceImageFilter : public ImageToImageFi itkConceptMacro(PixelTypeFloatAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(FloatGreaterThanPixelTypeCheck, (Concept::GreaterThanComparable)); itkConceptMacro(FloatLessThanPixelTypeCheck, (Concept::LessThanComparable)); - // End concept checking -#endif protected: FastChamferDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.h index 63feaafccbb..8c804746025 100644 --- a/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.h @@ -122,11 +122,7 @@ class ITK_TEMPLATE_EXPORT HausdorffDistanceImageFilter : public ImageToImageFilt itkGetConstMacro(HausdorffDistance, RealType); itkGetConstMacro(AverageHausdorffDistance, RealType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1HasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: HausdorffDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.h index d128087a398..367729e47b2 100644 --- a/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.h @@ -132,8 +132,6 @@ class ITK_TEMPLATE_EXPORT IsoContourDistanceImageFilter : public ImageToImageFil return m_NarrowBand; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); @@ -142,8 +140,6 @@ class ITK_TEMPLATE_EXPORT IsoContourDistanceImageFilter : public ImageToImageFil itkConceptMacro(OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: IsoContourDistanceImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h index 6febabe28a9..1270a791b8c 100644 --- a/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h @@ -204,14 +204,10 @@ class ITK_TEMPLATE_EXPORT SignedDanielssonDistanceMapImageFilter : public ImageT DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputImagePixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: SignedDanielssonDistanceMapImageFilter(); diff --git a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h index 3aceaad932e..4e8df2269ec 100644 --- a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h @@ -153,13 +153,9 @@ class ITK_TEMPLATE_EXPORT SignedMaurerDistanceMapImageFilter : public ImageToIma itkSetMacro(BackgroundValue, InputPixelType); itkGetConstReferenceMacro(BackgroundValue, InputPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputImagePixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: SignedMaurerDistanceMapImageFilter(); diff --git a/Modules/Filtering/FFT/include/itkVnlForwardFFTImageFilter.h b/Modules/Filtering/FFT/include/itkVnlForwardFFTImageFilter.h index 60f96898c79..826a01da78d 100644 --- a/Modules/Filtering/FFT/include/itkVnlForwardFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkVnlForwardFFTImageFilter.h @@ -75,11 +75,7 @@ class ITK_TEMPLATE_EXPORT VnlForwardFFTImageFilter : public ForwardFFTImageFilte SizeValueType GetSizeGreatestPrimeFactor() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(ImageDimensionsMatchCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: VnlForwardFFTImageFilter() = default; diff --git a/Modules/Filtering/FFT/include/itkVnlHalfHermitianToRealInverseFFTImageFilter.h b/Modules/Filtering/FFT/include/itkVnlHalfHermitianToRealInverseFFTImageFilter.h index 36587a4a711..6ebf8d5473e 100644 --- a/Modules/Filtering/FFT/include/itkVnlHalfHermitianToRealInverseFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkVnlHalfHermitianToRealInverseFFTImageFilter.h @@ -83,12 +83,8 @@ class ITK_TEMPLATE_EXPORT VnlHalfHermitianToRealInverseFFTImageFilter SizeValueType GetSizeGreatestPrimeFactor() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(PixelUnsignedIntDivisionOperatorsCheck, (Concept::DivisionOperators)); itkConceptMacro(ImageDimensionsMatchCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: VnlHalfHermitianToRealInverseFFTImageFilter() = default; diff --git a/Modules/Filtering/FFT/include/itkVnlInverseFFTImageFilter.h b/Modules/Filtering/FFT/include/itkVnlInverseFFTImageFilter.h index 74be717afc1..a0b646423e3 100644 --- a/Modules/Filtering/FFT/include/itkVnlInverseFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkVnlInverseFFTImageFilter.h @@ -79,12 +79,8 @@ class ITK_TEMPLATE_EXPORT VnlInverseFFTImageFilter : public InverseFFTImageFilte SizeValueType GetSizeGreatestPrimeFactor() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(PixelUnsignedIntDivisionOperatorsCheck, (Concept::DivisionOperators)); itkConceptMacro(ImageDimensionsMatchCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: VnlInverseFFTImageFilter() = default; diff --git a/Modules/Filtering/FFT/include/itkVnlRealToHalfHermitianForwardFFTImageFilter.h b/Modules/Filtering/FFT/include/itkVnlRealToHalfHermitianForwardFFTImageFilter.h index 8a56cf3688c..dc5ee6e4347 100644 --- a/Modules/Filtering/FFT/include/itkVnlRealToHalfHermitianForwardFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkVnlRealToHalfHermitianForwardFFTImageFilter.h @@ -78,11 +78,7 @@ class ITK_TEMPLATE_EXPORT VnlRealToHalfHermitianForwardFFTImageFilter SizeValueType GetSizeGreatestPrimeFactor() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(ImageDimensionsMatchCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: VnlRealToHalfHermitianForwardFFTImageFilter() = default; diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilter.h b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilter.h index a811a5ee17a..5d9c173a421 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilter.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilter.h @@ -127,11 +127,7 @@ class ITK_TEMPLATE_EXPORT FastMarchingExtensionImageFilter : public FastMarching return m_AuxTrialValues; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(AuxValueHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: FastMarchingExtensionImageFilter(); diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h index 4615ddf027b..8d190a7f711 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingExtensionImageFilterBase.h @@ -119,11 +119,7 @@ class ITK_TEMPLATE_EXPORT FastMarchingExtensionImageFilterBase : public FastMarc itkSetObjectMacro(AuxiliaryTrialValues, AuxValueContainerType); itkGetModifiableObjectMacro(AuxiliaryTrialValues, AuxValueContainerType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(AuxValueHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: FastMarchingExtensionImageFilterBase(); diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.h b/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.h index d4b5974e8b8..8885e203757 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.h @@ -374,14 +374,10 @@ class ITK_TEMPLATE_EXPORT FastMarchingImageFilter : public ImageToImageFilter)); itkConceptMacro(SpeedConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToLevelSetCheck, (Concept::Convertible)); itkConceptMacro(LevelSetOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: FastMarchingImageFilter(); diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h b/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h index f9f9c5a7801..9b38d914d3e 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingTraits.h @@ -92,11 +92,9 @@ class FastMarchingTraitsBase Topology }; -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(DoubleConvertibleOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); -#endif }; diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.h b/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.h index d2f6b80bda1..33774a55532 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.h +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.h @@ -230,14 +230,10 @@ class ITK_TEMPLATE_EXPORT FastMarchingUpwindGradientImageFilter : public FastMar */ itkGetConstReferenceMacro(TargetValue, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(LevelSetDoubleDivisionOperatorsCheck, (Concept::DivisionOperators)); itkConceptMacro(LevelSetDoubleDivisionAndAssignOperatorsCheck, (Concept::DivisionAndAssignOperators)); - // End concept checking -#endif protected: FastMarchingUpwindGradientImageFilter(); diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientAnisotropicDiffusionImageFilter.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientAnisotropicDiffusionImageFilter.h index 1202b166118..e9b3745e866 100644 --- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientAnisotropicDiffusionImageFilter.h +++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientAnisotropicDiffusionImageFilter.h @@ -71,11 +71,7 @@ class GPUGradientAnisotropicDiffusionImageFilter /** Extract information from the superclass. */ static constexpr unsigned int ImageDimension = GPUSuperclass::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(UpdateBufferHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GPUGradientAnisotropicDiffusionImageFilter() diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h index 44df15a150a..02513b9fecb 100644 --- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h +++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h @@ -135,7 +135,6 @@ class ITK_TEMPLATE_EXPORT GPUNeighborhoodOperatorImageFilter * \sa ProcessObject::GenerateInputRequestedRegion() virtual void GenerateInputRequestedRegion();*/ -#ifdef ITK_USE_CONCEPT_CHECKING // Begin concept checking // itkConceptMacro( SameDimensionCheck, // ( Concept::SameDimension< InputImageDimension, ImageDimension > ) ); @@ -148,7 +147,6 @@ class ITK_TEMPLATE_EXPORT GPUNeighborhoodOperatorImageFilter // itkConceptMacro( OperatorAdditiveOperatorsCheck, // ( Concept::AdditiveOperators< OperatorValueType > ) ); // End concept checking -#endif protected: GPUNeighborhoodOperatorImageFilter(); diff --git a/Modules/Filtering/ImageCompare/include/itkAbsoluteValueDifferenceImageFilter.h b/Modules/Filtering/ImageCompare/include/itkAbsoluteValueDifferenceImageFilter.h index d24653f7f70..af8b3d33363 100644 --- a/Modules/Filtering/ImageCompare/include/itkAbsoluteValueDifferenceImageFilter.h +++ b/Modules/Filtering/ImageCompare/include/itkAbsoluteValueDifferenceImageFilter.h @@ -104,13 +104,9 @@ class ITK_TEMPLATE_EXPORT AbsoluteValueDifferenceImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AbsoluteValueDifferenceImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1CovertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleCovertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: AbsoluteValueDifferenceImageFilter() diff --git a/Modules/Filtering/ImageCompare/include/itkSTAPLEImageFilter.h b/Modules/Filtering/ImageCompare/include/itkSTAPLEImageFilter.h index 2dd1ad6b87e..ca8ebc58ff7 100644 --- a/Modules/Filtering/ImageCompare/include/itkSTAPLEImageFilter.h +++ b/Modules/Filtering/ImageCompare/include/itkSTAPLEImageFilter.h @@ -220,11 +220,7 @@ class ITK_TEMPLATE_EXPORT STAPLEImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: STAPLEImageFilter() diff --git a/Modules/Filtering/ImageCompare/include/itkSimilarityIndexImageFilter.h b/Modules/Filtering/ImageCompare/include/itkSimilarityIndexImageFilter.h index 7955a8d9dfe..89788acf88b 100644 --- a/Modules/Filtering/ImageCompare/include/itkSimilarityIndexImageFilter.h +++ b/Modules/Filtering/ImageCompare/include/itkSimilarityIndexImageFilter.h @@ -121,12 +121,8 @@ class ITK_TEMPLATE_EXPORT SimilarityIndexImageFilter : public ImageToImageFilter /** Return the computed similarity index. */ itkGetConstMacro(SimilarityIndex, RealType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1HasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(Input2HasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SimilarityIndexImageFilter(); diff --git a/Modules/Filtering/ImageCompare/include/itkSquaredDifferenceImageFilter.h b/Modules/Filtering/ImageCompare/include/itkSquaredDifferenceImageFilter.h index 9874953594e..03893a982cf 100644 --- a/Modules/Filtering/ImageCompare/include/itkSquaredDifferenceImageFilter.h +++ b/Modules/Filtering/ImageCompare/include/itkSquaredDifferenceImageFilter.h @@ -101,13 +101,9 @@ class ITK_TEMPLATE_EXPORT SquaredDifferenceImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(SquaredDifferenceImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: SquaredDifferenceImageFilter() diff --git a/Modules/Filtering/ImageCompose/include/itkComposeImageFilter.h b/Modules/Filtering/ImageCompose/include/itkComposeImageFilter.h index b2329d432fd..d53e601a2e7 100644 --- a/Modules/Filtering/ImageCompose/include/itkComposeImageFilter.h +++ b/Modules/Filtering/ImageCompose/include/itkComposeImageFilter.h @@ -85,12 +85,8 @@ class ITK_TEMPLATE_EXPORT ComposeImageFilter : public ImageToImageFilter::ValueType>)); - // End concept checking -#endif protected: ComposeImageFilter(); diff --git a/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h b/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h index 550ed239e69..62de68a5bb7 100644 --- a/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h +++ b/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h @@ -232,15 +232,11 @@ class JoinImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(JoinImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1HasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(Input2HasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(Input1Input2HasJoinTraitsCheck, (Concept::HasJoinTraits::ValueType, typename PixelTraits::ValueType>)); - // End concept checking -#endif protected: JoinImageFilter() { Superclass::SetFunctor(FunctorType()); } diff --git a/Modules/Filtering/ImageCompose/include/itkJoinSeriesImageFilter.h b/Modules/Filtering/ImageCompose/include/itkJoinSeriesImageFilter.h index 555d3a57a15..d59db6636e6 100644 --- a/Modules/Filtering/ImageCompose/include/itkJoinSeriesImageFilter.h +++ b/Modules/Filtering/ImageCompose/include/itkJoinSeriesImageFilter.h @@ -85,12 +85,8 @@ class ITK_TEMPLATE_EXPORT JoinSeriesImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: JoinSeriesImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h index 911f81fe14f..92ccae0f145 100644 --- a/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkBilateralImageFilter.h @@ -169,11 +169,7 @@ class ITK_TEMPLATE_EXPORT BilateralImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: /** Constructor. */ diff --git a/Modules/Filtering/ImageFeature/include/itkCannyEdgeDetectionImageFilter.h b/Modules/Filtering/ImageFeature/include/itkCannyEdgeDetectionImageFilter.h index 8a1ebb27355..f449da51eb1 100644 --- a/Modules/Filtering/ImageFeature/include/itkCannyEdgeDetectionImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkCannyEdgeDetectionImageFilter.h @@ -195,15 +195,11 @@ class ITK_TEMPLATE_EXPORT CannyEdgeDetectionImageFilter : public ImageToImageFil return this->m_MultiplyImageFilter->GetOutput(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputIsFloatingPointCheck, (Concept::IsFloatingPoint)); itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: CannyEdgeDetectionImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkDerivativeImageFilter.h b/Modules/Filtering/ImageFeature/include/itkDerivativeImageFilter.h index 88988e36482..71dd7bb74fd 100644 --- a/Modules/Filtering/ImageFeature/include/itkDerivativeImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkDerivativeImageFilter.h @@ -80,11 +80,7 @@ class ITK_TEMPLATE_EXPORT DerivativeImageFilter : public ImageToImageFilter)); - // End concept checking -#endif /** Standard get/set macros for filter parameters. */ itkSetMacro(Order, unsigned int); diff --git a/Modules/Filtering/ImageFeature/include/itkDiscreteGaussianDerivativeImageFilter.h b/Modules/Filtering/ImageFeature/include/itkDiscreteGaussianDerivativeImageFilter.h index 609f52abef2..b5f5990cb0b 100644 --- a/Modules/Filtering/ImageFeature/include/itkDiscreteGaussianDerivativeImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkDiscreteGaussianDerivativeImageFilter.h @@ -172,11 +172,7 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianDerivativeImageFilter : public ImageTo itkGetConstMacro(NormalizeAcrossScale, bool); itkBooleanMacro(NormalizeAcrossScale); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: DiscreteGaussianDerivativeImageFilter() diff --git a/Modules/Filtering/ImageFeature/include/itkGradientVectorFlowImageFilter.h b/Modules/Filtering/ImageFeature/include/itkGradientVectorFlowImageFilter.h index 01c5b31ccaf..0b01761f872 100644 --- a/Modules/Filtering/ImageFeature/include/itkGradientVectorFlowImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkGradientVectorFlowImageFilter.h @@ -110,14 +110,10 @@ class ITK_TEMPLATE_EXPORT GradientVectorFlowImageFilter : public ImageToImageFil itkSetMacro(IterationNum, int); itkGetConstMacro(IterationNum, int); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GradientVectorFlowImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.h index 8489cac7c47..cf43d321e1d 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.h @@ -117,11 +117,7 @@ class ITK_TEMPLATE_EXPORT Hessian3DToVesselnessMeasureImageFilter itkSetMacro(Alpha2, double); itkGetConstMacro(Alpha2, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: Hessian3DToVesselnessMeasureImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.h index 43bea608ccf..16aaadb6b9d 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.h @@ -134,12 +134,8 @@ class ITK_TEMPLATE_EXPORT HessianRecursiveGaussianImageFilter : public ImageToIm void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasPixelTraitsCheck, (Concept::HasPixelTraits)); - // End concept checking -#endif protected: HessianRecursiveGaussianImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h index 450947ae454..8922c2e0707 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h @@ -122,11 +122,7 @@ class ITK_TEMPLATE_EXPORT HessianToObjectnessMeasureImageFilter : public ImageTo itkGetConstMacro(BrightObject, bool); itkBooleanMacro(BrightObject); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: HessianToObjectnessMeasureImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h index f12682fa9aa..e699dd64a86 100644 --- a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h @@ -175,15 +175,10 @@ class ITK_TEMPLATE_EXPORT HoughTransform2DCirclesImageFilter itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); - -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputGreaterThanDoubleCheck, (Concept::GreaterThanComparable)); itkConceptMacro(OutputPlusIntCheck, (Concept::AdditiveOperators)); itkConceptMacro(OutputDividedByIntCheck, (Concept::DivisionOperators)); - // End concept checking -#endif protected: HoughTransform2DCirclesImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h index 2d772ecb909..b6abb57610c 100644 --- a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h @@ -148,13 +148,9 @@ class ITK_TEMPLATE_EXPORT HoughTransform2DLinesImageFilter itkSetMacro(Variance, double); itkGetConstMacro(Variance, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputGreaterThanFloatCheck, (Concept::GreaterThanComparable)); itkConceptMacro(OutputPlusIntCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: HoughTransform2DLinesImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkLaplacianImageFilter.h b/Modules/Filtering/ImageFeature/include/itkLaplacianImageFilter.h index 9dd241029e9..73d78430114 100644 --- a/Modules/Filtering/ImageFeature/include/itkLaplacianImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkLaplacianImageFilter.h @@ -113,13 +113,9 @@ class ITK_TEMPLATE_EXPORT LaplacianImageFilter : public ImageToImageFilter)); itkConceptMacro(InputPixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); itkConceptMacro(OutputPixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: LaplacianImageFilter() { m_UseImageSpacing = true; } diff --git a/Modules/Filtering/ImageFeature/include/itkLaplacianSharpeningImageFilter.h b/Modules/Filtering/ImageFeature/include/itkLaplacianSharpeningImageFilter.h index 2d86b5daf83..b8f79f6a087 100644 --- a/Modules/Filtering/ImageFeature/include/itkLaplacianSharpeningImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkLaplacianSharpeningImageFilter.h @@ -90,11 +90,7 @@ class ITK_TEMPLATE_EXPORT LaplacianSharpeningImageFilter : public ImageToImageFi itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: LaplacianSharpeningImageFilter() { m_UseImageSpacing = true; } diff --git a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.h b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.h index 4ebafc8aa97..032b4e3a9d0 100644 --- a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.h @@ -133,13 +133,9 @@ class ITK_TEMPLATE_EXPORT MaskFeaturePointSelectionFilter : public ImageToMeshFi itkSetClampMacro(SelectFraction, double, 0, 1); itkGetMacro(SelectFraction, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(ImageDimensionShouldBe3, (Concept::SameDimension)); itkConceptMacro(MaskDimensionShouldBe3, (Concept::SameDimension)); itkConceptMacro(PointDimensionShouldBe3, (Concept::SameDimension)); - // End concept checking -#endif protected: MaskFeaturePointSelectionFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkSimpleContourExtractorImageFilter.h b/Modules/Filtering/ImageFeature/include/itkSimpleContourExtractorImageFilter.h index 47c58b7fcdf..7eb09c18d96 100644 --- a/Modules/Filtering/ImageFeature/include/itkSimpleContourExtractorImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkSimpleContourExtractorImageFilter.h @@ -117,12 +117,8 @@ class ITK_TEMPLATE_EXPORT SimpleContourExtractorImageFilter : public BoxImageFil * pixel in the output image. */ itkGetConstReferenceMacro(OutputBackgroundValue, OutputPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SimpleContourExtractorImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkSobelEdgeDetectionImageFilter.h b/Modules/Filtering/ImageFeature/include/itkSobelEdgeDetectionImageFilter.h index 5bd332e8699..21743dd7d6b 100644 --- a/Modules/Filtering/ImageFeature/include/itkSobelEdgeDetectionImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkSobelEdgeDetectionImageFilter.h @@ -104,13 +104,9 @@ class ITK_TEMPLATE_EXPORT SobelEdgeDetectionImageFilter : public ImageToImageFil void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputPixelIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: SobelEdgeDetectionImageFilter() = default; diff --git a/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h b/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h index 27842906ae7..9c20d1c7e13 100644 --- a/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h @@ -100,11 +100,9 @@ class ITK_TEMPLATE_EXPORT UnsharpMaskImageFilter : public ImageToImageFilter)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(InternalTypeIsFloatingPoint, (Concept::IsFloatingPoint)); -#endif using GaussianType = SmoothingRecursiveGaussianImageFilter>; diff --git a/Modules/Filtering/ImageFeature/include/itkZeroCrossingBasedEdgeDetectionImageFilter.h b/Modules/Filtering/ImageFeature/include/itkZeroCrossingBasedEdgeDetectionImageFilter.h index 67ca0e2819c..def6684c4a4 100644 --- a/Modules/Filtering/ImageFeature/include/itkZeroCrossingBasedEdgeDetectionImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkZeroCrossingBasedEdgeDetectionImageFilter.h @@ -141,15 +141,11 @@ class ITK_TEMPLATE_EXPORT ZeroCrossingBasedEdgeDetectionImageFilter m_MaximumError.Fill(v); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(PixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: ZeroCrossingBasedEdgeDetectionImageFilter(); diff --git a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h index 9d173d54b82..7005679ce29 100644 --- a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h @@ -114,14 +114,10 @@ class ITK_TEMPLATE_EXPORT ZeroCrossingImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputComparableCheck, (Concept::Comparable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ZeroCrossingImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkBinaryFunctorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkBinaryFunctorImageFilter.h index b41fb424cda..083727de742 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkBinaryFunctorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkBinaryFunctorImageFilter.h @@ -171,14 +171,10 @@ class ITK_TEMPLATE_EXPORT BinaryFunctorImageFilter : public InPlaceImageFilter)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); - // End concept checking -#endif protected: BinaryFunctorImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h index 8d3e60e1ce7..5f74a40a336 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h @@ -215,14 +215,10 @@ class ITK_TEMPLATE_EXPORT BinaryGeneratorImageFilter : public InPlaceImageFilter static constexpr unsigned int InputImage2Dimension = TInputImage2::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); - // End concept checking -#endif protected: BinaryGeneratorImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkMaskNeighborhoodOperatorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkMaskNeighborhoodOperatorImageFilter.h index f13e7e4f308..a7357b1499e 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkMaskNeighborhoodOperatorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkMaskNeighborhoodOperatorImageFilter.h @@ -134,16 +134,12 @@ class ITK_TEMPLATE_EXPORT MaskNeighborhoodOperatorImageFilter /** Turn on and off the UseDefaultValue flag. */ itkBooleanMacro(UseDefaultValue); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OperatorConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritable, (Concept::OStreamWritable)); - // End concept checking -#endif protected: MaskNeighborhoodOperatorImageFilter() diff --git a/Modules/Filtering/ImageFilterBase/include/itkNeighborhoodOperatorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkNeighborhoodOperatorImageFilter.h index b5b3194572e..30c18253e48 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkNeighborhoodOperatorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkNeighborhoodOperatorImageFilter.h @@ -143,15 +143,11 @@ class ITK_TEMPLATE_EXPORT NeighborhoodOperatorImageFilter : public ImageToImageF void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OperatorConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputConvertibleToOperatorCheck, (Concept::Convertible)); itkConceptMacro(OperatorMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(OperatorAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: NeighborhoodOperatorImageFilter() diff --git a/Modules/Filtering/ImageFilterBase/include/itkNoiseImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkNoiseImageFilter.h index a9d0530f692..40524464ee5 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkNoiseImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkNoiseImageFilter.h @@ -83,11 +83,7 @@ class ITK_TEMPLATE_EXPORT NoiseImageFilter : public BoxImageFilter)); - // End concept checking -#endif protected: NoiseImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkTernaryFunctorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkTernaryFunctorImageFilter.h index 05a9c14a2ec..960bf4d8b6e 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkTernaryFunctorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkTernaryFunctorImageFilter.h @@ -130,13 +130,9 @@ class ITK_TEMPLATE_EXPORT TernaryFunctorImageFilter : public InPlaceImageFilter< static constexpr unsigned int Input3ImageDimension = TInputImage3::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck3, (Concept::SameDimension)); - // End concept checking -#endif protected: TernaryFunctorImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkTernaryGeneratorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkTernaryGeneratorImageFilter.h index 2e373a33c61..d1cedf73b51 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkTernaryGeneratorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkTernaryGeneratorImageFilter.h @@ -231,13 +231,9 @@ class ITK_TEMPLATE_EXPORT TernaryGeneratorImageFilter : public InPlaceImageFilte static constexpr unsigned int Input3ImageDimension = TInputImage3::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck3, (Concept::SameDimension)); - // End concept checking -#endif protected: TernaryGeneratorImageFilter(); diff --git a/Modules/Filtering/ImageFilterBase/include/itkVectorNeighborhoodOperatorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkVectorNeighborhoodOperatorImageFilter.h index 78e59b74436..7d76aaae965 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkVectorNeighborhoodOperatorImageFilter.h +++ b/Modules/Filtering/ImageFilterBase/include/itkVectorNeighborhoodOperatorImageFilter.h @@ -126,13 +126,9 @@ class ITK_TEMPLATE_EXPORT VectorNeighborhoodOperatorImageFilter : public ImageTo void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorNeighborhoodOperatorImageFilter() diff --git a/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h b/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h index 3f9db77d090..9a6083d478a 100644 --- a/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h +++ b/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h @@ -87,9 +87,7 @@ class ITK_TEMPLATE_EXPORT UnaryFrequencyDomainFilter : public InPlaceImageFilter static constexpr unsigned int ImageDimension = TImageType::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(ImageTypeHasNumericTraitsCheck, (Concept::HasNumericTraits)); -#endif /** Frequency Iterator types */ using FrequencyIteratorType = TFrequencyIterator; diff --git a/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.h b/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.h index 766fe0d69db..74cbe15af5b 100644 --- a/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.h +++ b/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.h @@ -101,13 +101,9 @@ class ITK_TEMPLATE_EXPORT LabelOverlayImageFilter itkSetMacro(BackgroundValue, LabelPixelType); itkGetConstReferenceMacro(BackgroundValue, LabelPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputPixelShouldHaveValueType, (Concept::HasValueType)); itkConceptMacro(OutputPixelShouldHaveBracketOperator, (Concept::BracketOperator)); - // End concept checking -#endif /** Empty the color LUT container. */ void diff --git a/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.h b/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.h index 2fb2cf6c23c..2a10570b245 100644 --- a/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.h @@ -78,11 +78,7 @@ class ITK_TEMPLATE_EXPORT DifferenceOfGaussiansGradientImageFilter itkGetConstMacro(Width, unsigned int); itkSetMacro(Width, unsigned int); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DataTypeHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: DifferenceOfGaussiansGradientImageFilter(); diff --git a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h index 735dfbe694f..b0519e3e9ae 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h @@ -142,12 +142,8 @@ class ITK_TEMPLATE_EXPORT GradientImageFilter : public ImageToImageFilter * boundaryCondition); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif /** The UseImageDirection flag determines whether image derivatives are * computed with respect to the image grid or with respect to the physical diff --git a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeImageFilter.h index db25242c255..d29dac28ad2 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeImageFilter.h @@ -114,11 +114,7 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeImageFilter : public ImageToImageFilt } #endif -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GradientMagnitudeImageFilter(); diff --git a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h index 7b5726819c8..5e0c8f8a022 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h @@ -128,11 +128,7 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeRecursiveGaussianImageFilter void SetNumberOfWorkUnits(ThreadIdType nb) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GradientMagnitudeRecursiveGaussianImageFilter(); diff --git a/Modules/Filtering/ImageGradient/include/itkGradientRecursiveGaussianImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientRecursiveGaussianImageFilter.h index a6d4ac66047..aa5257a8cfd 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkGradientRecursiveGaussianImageFilter.h @@ -171,13 +171,9 @@ class ITK_TEMPLATE_EXPORT GradientRecursiveGaussianImageFilter : public ImageToI itkGetConstMacro(UseImageDirection, bool); itkBooleanMacro(UseImageDirection); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking // Does not seem to work with wrappings, disabled // itkConceptMacro( InputHasNumericTraitsCheck, // ( Concept::HasNumericTraits< PixelType > ) ); - // End concept checking -#endif protected: GradientRecursiveGaussianImageFilter(); diff --git a/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h b/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h index 4f41cf89cdf..56c29e2766c 100644 --- a/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h @@ -273,13 +273,9 @@ class ITK_TEMPLATE_EXPORT VectorGradientMagnitudeImageFilter : public ImageToIma static int CubicSolver(const double *, double *); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(RealTypeHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorGradientMagnitudeImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.h b/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.h index 3d0edb20cf4..f0ec79ec178 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.h @@ -126,11 +126,7 @@ class ITK_TEMPLATE_EXPORT BSplineDownsampleImageFilter : public ResamplerType void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: void diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.h b/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.h index fa77223620d..e2577cbb15f 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.h @@ -121,11 +121,7 @@ class ITK_TEMPLATE_EXPORT BSplineUpsampleImageFilter : public ResamplerType void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: void diff --git a/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.h b/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.h index 2d388df32c6..9cd95ebe6bb 100644 --- a/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.h @@ -115,13 +115,9 @@ class ITK_TEMPLATE_EXPORT BinShrinkImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - /** End concept checking */ -#endif protected: BinShrinkImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkConstantPadImageFilter.h b/Modules/Filtering/ImageGrid/include/itkConstantPadImageFilter.h index 8e33ae8774a..64e54c048d8 100644 --- a/Modules/Filtering/ImageGrid/include/itkConstantPadImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkConstantPadImageFilter.h @@ -97,14 +97,10 @@ class ITK_TEMPLATE_EXPORT ConstantPadImageFilter : public PadImageFilter)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ConstantPadImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkCropImageFilter.h b/Modules/Filtering/ImageGrid/include/itkCropImageFilter.h index cb86641a72b..cefb547a064 100644 --- a/Modules/Filtering/ImageGrid/include/itkCropImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkCropImageFilter.h @@ -90,12 +90,8 @@ class ITK_TEMPLATE_EXPORT CropImageFilter : public ExtractImageFilterSetLowerBoundaryCropSize(s); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: CropImageFilter() diff --git a/Modules/Filtering/ImageGrid/include/itkInterpolateImageFilter.h b/Modules/Filtering/ImageGrid/include/itkInterpolateImageFilter.h index f1ad4e37193..b1398cdfedc 100644 --- a/Modules/Filtering/ImageGrid/include/itkInterpolateImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkInterpolateImageFilter.h @@ -115,11 +115,7 @@ class ITK_TEMPLATE_EXPORT InterpolateImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: InterpolateImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkInterpolateImagePointsFilter.h b/Modules/Filtering/ImageGrid/include/itkInterpolateImagePointsFilter.h index 45c6b3e768a..1baeece9084 100644 --- a/Modules/Filtering/ImageGrid/include/itkInterpolateImagePointsFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkInterpolateImagePointsFilter.h @@ -154,11 +154,7 @@ class ITK_TEMPLATE_EXPORT InterpolateImagePointsFilter : public ImageToImageFilt void GenerateInputRequestedRegion() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: InterpolateImagePointsFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.h b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.h index df9f631ca31..37e34068aca 100644 --- a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.h @@ -97,11 +97,7 @@ class ITK_TEMPLATE_EXPORT MirrorPadImageFilter : public PadImageFilter::min(), 1.0); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: MirrorPadImageFilter() = default; diff --git a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.h b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.h index d24ea0129d7..6c874fe794f 100644 --- a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.h @@ -196,13 +196,9 @@ class ITK_TEMPLATE_EXPORT OrientImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimension, (Concept::SameDimension)); itkConceptMacro(DimensionShouldBe3, (Concept::SameDimension)); - // End concept checking -#endif protected: OrientImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkRegionOfInterestImageFilter.h b/Modules/Filtering/ImageGrid/include/itkRegionOfInterestImageFilter.h index 0e5778783d7..5a461a4d459 100644 --- a/Modules/Filtering/ImageGrid/include/itkRegionOfInterestImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkRegionOfInterestImageFilter.h @@ -86,12 +86,8 @@ class ITK_TEMPLATE_EXPORT RegionOfInterestImageFilter : public ImageToImageFilte static constexpr unsigned int ImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: RegionOfInterestImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkResampleImageFilter.h b/Modules/Filtering/ImageGrid/include/itkResampleImageFilter.h index 68fe832b5fb..93e027cd293 100644 --- a/Modules/Filtering/ImageGrid/include/itkResampleImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkResampleImageFilter.h @@ -270,11 +270,7 @@ class ITK_TEMPLATE_EXPORT ResampleImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: ResampleImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.h b/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.h index b112e1af117..98dcba6c1ec 100644 --- a/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.h @@ -131,13 +131,9 @@ class ITK_TEMPLATE_EXPORT ShrinkImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: ShrinkImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.h b/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.h index 72011c4f2d7..19d071c77c6 100644 --- a/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.h @@ -115,13 +115,9 @@ class ITK_TEMPLATE_EXPORT SliceImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - /** End concept checking */ -#endif protected: SliceImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkTileImageFilter.h b/Modules/Filtering/ImageGrid/include/itkTileImageFilter.h index 544aa347bd5..266a2fed933 100644 --- a/Modules/Filtering/ImageGrid/include/itkTileImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkTileImageFilter.h @@ -118,13 +118,9 @@ class ITK_TEMPLATE_EXPORT TileImageFilter : public ImageToImageFilter)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: TileImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h index eb179b7e2d1..32e036086d2 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h @@ -224,15 +224,11 @@ class ITK_TEMPLATE_EXPORT WarpImageFilter : public ImageToImageFilter)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(DisplacementFieldHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: WarpImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h index 1f70717528c..f9d4e954fa8 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h @@ -210,14 +210,10 @@ class ITK_TEMPLATE_EXPORT WarpVectorImageFilter : public ImageToImageFilter)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(DisplacementFieldHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: WarpVectorImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkWrapPadImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWrapPadImageFilter.h index 87ae8e8107d..14fa53aece7 100644 --- a/Modules/Filtering/ImageGrid/include/itkWrapPadImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWrapPadImageFilter.h @@ -91,11 +91,7 @@ class ITK_TEMPLATE_EXPORT WrapPadImageFilter : public PadImageFilter)); - // End concept checking -#endif protected: WrapPadImageFilter(); diff --git a/Modules/Filtering/ImageGrid/include/itkZeroFluxNeumannPadImageFilter.h b/Modules/Filtering/ImageGrid/include/itkZeroFluxNeumannPadImageFilter.h index af8eb3a3373..6e6b9d8709c 100644 --- a/Modules/Filtering/ImageGrid/include/itkZeroFluxNeumannPadImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkZeroFluxNeumannPadImageFilter.h @@ -97,14 +97,10 @@ class ITK_TEMPLATE_EXPORT ZeroFluxNeumannPadImageFilter : public PadImageFilter< static constexpr unsigned int ImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ZeroFluxNeumannPadImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h index af6d94d26cf..d904b38f726 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h @@ -85,12 +85,8 @@ class ITK_TEMPLATE_EXPORT AbsImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(InputGreaterThanIntCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: AbsImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAcosImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAcosImageFilter.h index f23c6aac84b..63ee92b8981 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAcosImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAcosImageFilter.h @@ -93,12 +93,8 @@ class ITK_TEMPLATE_EXPORT AcosImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: AcosImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAddImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAddImageFilter.h index 600263efcd9..6029aa5f9d5 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAddImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAddImageFilter.h @@ -101,14 +101,10 @@ class ITK_TEMPLATE_EXPORT AddImageFilter : public BinaryGeneratorImageFilter)); - // End concept checking -#endif protected: AddImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAndImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAndImageFilter.h index 78088b415ee..3b6541668f7 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAndImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAndImageFilter.h @@ -72,14 +72,10 @@ class ITK_TEMPLATE_EXPORT AndImageFilter : public BinaryGeneratorImageFilter)); - // End concept checking -#endif protected: AndImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAsinImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAsinImageFilter.h index 78ef2362062..e648de492c3 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAsinImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAsinImageFilter.h @@ -92,12 +92,8 @@ class ITK_TEMPLATE_EXPORT AsinImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: AsinImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAtan2ImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAtan2ImageFilter.h index 7d6ecefd9c3..52db3a66e14 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAtan2ImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAtan2ImageFilter.h @@ -94,13 +94,9 @@ class ITK_TEMPLATE_EXPORT Atan2ImageFilter : public BinaryGeneratorImageFilter)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: Atan2ImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkAtanImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAtanImageFilter.h index df2d270f806..80c19b16fb1 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAtanImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAtanImageFilter.h @@ -88,12 +88,8 @@ class ITK_TEMPLATE_EXPORT AtanImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: AtanImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkBinaryMagnitudeImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkBinaryMagnitudeImageFilter.h index d71dc55b30d..37065ee182b 100644 --- a/Modules/Filtering/ImageIntensity/include/itkBinaryMagnitudeImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkBinaryMagnitudeImageFilter.h @@ -99,13 +99,9 @@ class ITK_TEMPLATE_EXPORT BinaryMagnitudeImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(BinaryMagnitudeImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: BinaryMagnitudeImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkBoundedReciprocalImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkBoundedReciprocalImageFilter.h index 39cfbf1e54e..8301461325d 100644 --- a/Modules/Filtering/ImageIntensity/include/itkBoundedReciprocalImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkBoundedReciprocalImageFilter.h @@ -82,12 +82,8 @@ class ITK_TEMPLATE_EXPORT BoundedReciprocalImageFilter : public UnaryGeneratorIm /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(BoundedReciprocalImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: BoundedReciprocalImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkClampImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkClampImageFilter.h index c308d890252..5e41526953f 100644 --- a/Modules/Filtering/ImageIntensity/include/itkClampImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkClampImageFilter.h @@ -75,12 +75,10 @@ class ITK_TEMPLATE_EXPORT Clamp OutputType operator()(const InputType & A) const; -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleLessThanComparableToOutputCheck, (Concept::LessThanComparable)); itkConceptMacro(DoubleGreaterThanComparableToOutputCheck, (Concept::GreaterThanComparable)); -#endif private: OutputType m_LowerBound; diff --git a/Modules/Filtering/ImageIntensity/include/itkComplexToImaginaryImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkComplexToImaginaryImageFilter.h index 5ac9a9d5b9d..87bc6764a79 100644 --- a/Modules/Filtering/ImageIntensity/include/itkComplexToImaginaryImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkComplexToImaginaryImageFilter.h @@ -76,11 +76,7 @@ class ITK_TEMPLATE_EXPORT ComplexToImaginaryImageFilter : public UnaryGeneratorI using OutputPixelType = typename TOutputImage::PixelType; using InputPixelValueType = typename NumericTraits::ValueType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ComplexToImaginaryImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkComplexToModulusImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkComplexToModulusImageFilter.h index a4cec608049..41c878d9c3f 100644 --- a/Modules/Filtering/ImageIntensity/include/itkComplexToModulusImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkComplexToModulusImageFilter.h @@ -74,11 +74,7 @@ class ITK_TEMPLATE_EXPORT ComplexToModulusImageFilter : public UnaryGeneratorIma using OutputPixelType = typename TOutputImage::PixelType; using InputPixelValueType = typename NumericTraits::ValueType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputMultiplyOperatorCheck, (Concept::MultiplyOperator)); - // End concept checking -#endif protected: ComplexToModulusImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkComplexToPhaseImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkComplexToPhaseImageFilter.h index bf9fbb963e1..8160b401599 100644 --- a/Modules/Filtering/ImageIntensity/include/itkComplexToPhaseImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkComplexToPhaseImageFilter.h @@ -75,11 +75,7 @@ class ITK_TEMPLATE_EXPORT ComplexToPhaseImageFilter : public UnaryGeneratorImage using OutputPixelType = typename TOutputImage::PixelType; using InputPixelValueType = typename NumericTraits::ValueType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ComplexToPhaseImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkComplexToRealImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkComplexToRealImageFilter.h index e3dcc622c3e..e2df1c3a9cc 100644 --- a/Modules/Filtering/ImageIntensity/include/itkComplexToRealImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkComplexToRealImageFilter.h @@ -75,11 +75,7 @@ class ITK_TEMPLATE_EXPORT ComplexToRealImageFilter : public UnaryGeneratorImageF using OutputPixelType = typename TOutputImage::PixelType; using InputPixelValueType = typename NumericTraits::ValueType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ComplexToRealImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkConstrainedValueAdditionImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkConstrainedValueAdditionImageFilter.h index baf65606ced..e069ec1e3b1 100644 --- a/Modules/Filtering/ImageIntensity/include/itkConstrainedValueAdditionImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkConstrainedValueAdditionImageFilter.h @@ -109,14 +109,10 @@ class ITK_TEMPLATE_EXPORT ConstrainedValueAdditionImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ConstrainedValueAdditionImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCastCheck, (Concept::Convertible)); itkConceptMacro(DoubleLessThanOutputCheck, (Concept::LessThanComparable)); - // End concept checking -#endif protected: ConstrainedValueAdditionImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkConstrainedValueDifferenceImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkConstrainedValueDifferenceImageFilter.h index 2d9cb48f882..150c13ccb58 100644 --- a/Modules/Filtering/ImageIntensity/include/itkConstrainedValueDifferenceImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkConstrainedValueDifferenceImageFilter.h @@ -103,15 +103,11 @@ class ConstrainedValueDifferenceImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ConstrainedValueDifferenceImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(DoubleGreaterThanOutputCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: ConstrainedValueDifferenceImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkCosImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkCosImageFilter.h index 444c7b56096..ec05129a1c4 100644 --- a/Modules/Filtering/ImageIntensity/include/itkCosImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkCosImageFilter.h @@ -90,12 +90,8 @@ class ITK_TEMPLATE_EXPORT CosImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: CosImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkDivideImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkDivideImageFilter.h index 5ed5b8652ff..2ce2c785184 100644 --- a/Modules/Filtering/ImageIntensity/include/itkDivideImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkDivideImageFilter.h @@ -77,15 +77,11 @@ class ITK_TEMPLATE_EXPORT DivideImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(DivideImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToInput2Check, (Concept::Convertible)); itkConceptMacro(Input1Input2OutputDivisionOperatorsCheck, (Concept::DivisionOperators)); - // End concept checking -#endif protected: DivideImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkEdgePotentialImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkEdgePotentialImageFilter.h index d8ca3ead293..77042945b41 100644 --- a/Modules/Filtering/ImageIntensity/include/itkEdgePotentialImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkEdgePotentialImageFilter.h @@ -78,11 +78,7 @@ class ITK_TEMPLATE_EXPORT EdgePotentialImageFilter : public UnaryGeneratorImageF /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(EdgePotentialImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: EdgePotentialImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkExpImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkExpImageFilter.h index 2376293f7b8..a56a84e58eb 100644 --- a/Modules/Filtering/ImageIntensity/include/itkExpImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkExpImageFilter.h @@ -80,12 +80,8 @@ class ITK_TEMPLATE_EXPORT ExpImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ExpImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkExpNegativeImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkExpNegativeImageFilter.h index e7f9f946d45..e4cdb85b11a 100644 --- a/Modules/Filtering/ImageIntensity/include/itkExpNegativeImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkExpNegativeImageFilter.h @@ -125,12 +125,8 @@ class ExpNegativeImageFilter return this->GetFunctor().GetFactor(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ExpNegativeImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkHistogramMatchingImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkHistogramMatchingImageFilter.h index 42c876d6c24..889ba16b15f 100644 --- a/Modules/Filtering/ImageIntensity/include/itkHistogramMatchingImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkHistogramMatchingImageFilter.h @@ -170,8 +170,6 @@ class ITK_TEMPLATE_EXPORT HistogramMatchingImageFilter : public ImageToImageFilt itkGetModifiableObjectMacro(SourceHistogram, HistogramType); itkGetModifiableObjectMacro(OutputHistogram, HistogramType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(DoubleConvertibleToInputCheck, (Concept::Convertible)); @@ -179,8 +177,6 @@ class ITK_TEMPLATE_EXPORT HistogramMatchingImageFilter : public ImageToImageFilt itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(OutputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(SameTypeCheck, (Concept::SameType)); - // End concept checking -#endif protected: HistogramMatchingImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.h index 4187ffed753..3ce07d1832b 100644 --- a/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.h @@ -208,11 +208,7 @@ class ITK_TEMPLATE_EXPORT IntensityWindowingImageFilter void PrintSelf(std::ostream & os, Indent indent) const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: IntensityWindowingImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkInvertIntensityImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkInvertIntensityImageFilter.h index cabe5ee6639..877aae48db9 100644 --- a/Modules/Filtering/ImageIntensity/include/itkInvertIntensityImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkInvertIntensityImageFilter.h @@ -125,11 +125,7 @@ class ITK_TEMPLATE_EXPORT InvertIntensityImageFilter void BeforeThreadedGenerateData() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: InvertIntensityImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkLog10ImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkLog10ImageFilter.h index 78ae26b1268..00459e65094 100644 --- a/Modules/Filtering/ImageIntensity/include/itkLog10ImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkLog10ImageFilter.h @@ -79,12 +79,8 @@ class ITK_TEMPLATE_EXPORT Log10ImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: Log10ImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkLogImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkLogImageFilter.h index 4a52771b812..f1f002fe2a7 100644 --- a/Modules/Filtering/ImageIntensity/include/itkLogImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkLogImageFilter.h @@ -77,12 +77,8 @@ class ITK_TEMPLATE_EXPORT LogImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: LogImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h index eef6e732256..19b36457944 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMagnitudeAndPhaseToComplexImageFilter.h @@ -106,13 +106,9 @@ class MagnitudeAndPhaseToComplexImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(MagnitudeAndPhaseToComplexImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: MagnitudeAndPhaseToComplexImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkMaskImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMaskImageFilter.h index 2c5ebce01f6..fbb3c3746e0 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMaskImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMaskImageFilter.h @@ -218,13 +218,9 @@ class ITK_TEMPLATE_EXPORT MaskImageFilter : public BinaryGeneratorImageFilterGetFunctor().GetMaskingValue(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(MaskEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: MaskImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkMaskNegatedImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMaskNegatedImageFilter.h index 6fdb2f74888..7a499086be9 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMaskNegatedImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMaskNegatedImageFilter.h @@ -216,13 +216,9 @@ class ITK_TEMPLATE_EXPORT MaskNegatedImageFilter return static_cast(this->ProcessObject::GetInput(1)); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(MaskEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: MaskNegatedImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkMatrixIndexSelectionImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMatrixIndexSelectionImageFilter.h index 425e98a06db..10a31265862 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMatrixIndexSelectionImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMatrixIndexSelectionImageFilter.h @@ -120,11 +120,7 @@ class MatrixIndexSelectionImageFilter return this->GetFunctor().GetIndices(i, j); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: MatrixIndexSelectionImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkMaximumImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMaximumImageFilter.h index 35cf6390f7a..8d215adfb15 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMaximumImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMaximumImageFilter.h @@ -95,16 +95,12 @@ class ITK_TEMPLATE_EXPORT MaximumImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(MaximumImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(Input1GreaterThanInput2Check, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: MaximumImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkMinimumImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMinimumImageFilter.h index 511654867c4..50725efce9e 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMinimumImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMinimumImageFilter.h @@ -89,16 +89,12 @@ class ITK_TEMPLATE_EXPORT MinimumImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(MinimumImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1ConvertibleToInput2Check, (Concept::Convertible)); itkConceptMacro(Input2ConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(Input1LessThanInput2Check, (Concept::LessThanComparable)); - // End concept checking -#endif protected: MinimumImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkModulusImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkModulusImageFilter.h index f3d971d55d1..833d9cf4f1d 100644 --- a/Modules/Filtering/ImageIntensity/include/itkModulusImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkModulusImageFilter.h @@ -78,11 +78,7 @@ class ITK_TEMPLATE_EXPORT ModulusImageFilter } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ModulusImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkMultiplyImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkMultiplyImageFilter.h index ef153bfbf98..6306821f4db 100644 --- a/Modules/Filtering/ImageIntensity/include/itkMultiplyImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkMultiplyImageFilter.h @@ -61,14 +61,10 @@ class ITK_TEMPLATE_EXPORT MultiplyImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(MultiplyImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1Input2OutputMultiplyOperatorCheck, (Concept::MultiplyOperator)); - // End concept checking -#endif protected: MultiplyImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkNaryAddImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkNaryAddImageFilter.h index 9b160134fec..8cb840718ca 100644 --- a/Modules/Filtering/ImageIntensity/include/itkNaryAddImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkNaryAddImageFilter.h @@ -116,13 +116,9 @@ class NaryAddImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(NaryAddImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputHasZeroCheck, (Concept::HasZero)); - // End concept checking -#endif protected: NaryAddImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkNaryFunctorImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkNaryFunctorImageFilter.h index 96fc3d8f594..eb30eaa6fb9 100644 --- a/Modules/Filtering/ImageIntensity/include/itkNaryFunctorImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkNaryFunctorImageFilter.h @@ -98,12 +98,8 @@ class ITK_TEMPLATE_EXPORT NaryFunctorImageFilter : public InPlaceImageFilter)); itkConceptMacro(OutputHasZeroCheck, (Concept::HasZero)); - // End concept checking -#endif protected: NaryFunctorImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkNaryMaximumImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkNaryMaximumImageFilter.h index 33fb67d9305..d581e173480 100644 --- a/Modules/Filtering/ImageIntensity/include/itkNaryMaximumImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkNaryMaximumImageFilter.h @@ -121,14 +121,10 @@ class NaryMaximumImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(NaryMaximumImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputLessThanComparableCheck, (Concept::LessThanComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: NaryMaximumImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkNormalizeToConstantImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkNormalizeToConstantImageFilter.h index 0d08ff128a0..5b9b9044e66 100644 --- a/Modules/Filtering/ImageIntensity/include/itkNormalizeToConstantImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkNormalizeToConstantImageFilter.h @@ -96,12 +96,8 @@ class ITK_TEMPLATE_EXPORT NormalizeToConstantImageFilter : public ImageToImageFi itkSetMacro(Constant, RealType); itkGetConstMacro(Constant, RealType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: NormalizeToConstantImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkNotImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkNotImageFilter.h index cf2956803c1..f845a80225e 100644 --- a/Modules/Filtering/ImageIntensity/include/itkNotImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkNotImageFilter.h @@ -116,13 +116,9 @@ class NotImageFilter } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputNotOperatorCheck, (Concept::NotOperator)); - // End concept checking -#endif protected: NotImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkOrImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkOrImageFilter.h index 3eaabc7f173..f37e180a864 100644 --- a/Modules/Filtering/ImageIntensity/include/itkOrImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkOrImageFilter.h @@ -73,14 +73,10 @@ class ITK_TEMPLATE_EXPORT OrImageFilter : public BinaryGeneratorImageFilter)); - // End concept checking -#endif protected: OrImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.h index 9a66c521916..48f33fba84f 100644 --- a/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.h @@ -90,14 +90,10 @@ class ITK_TEMPLATE_EXPORT PolylineMask2DImageFilter : public ImageToImageFilter< void SetInput2(const PolylineType * input); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: PolylineMask2DImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.h index 4baa65819bc..0cf525c8ab9 100644 --- a/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.h @@ -116,11 +116,7 @@ class ITK_TEMPLATE_EXPORT PolylineMaskImageFilter : public ImageToImageFilter)); - // End concept checking -#endif protected: PolylineMaskImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkPowImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkPowImageFilter.h index aafe764a435..9c8d29c058c 100644 --- a/Modules/Filtering/ImageIntensity/include/itkPowImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkPowImageFilter.h @@ -111,11 +111,6 @@ class ITK_TEMPLATE_EXPORT PowImageFilter : public BinaryGeneratorImageFilter)); - // End concept checking -#endif protected: RGBToLuminanceImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkRescaleIntensityImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkRescaleIntensityImageFilter.h index bc6208edbdc..22b8475f406 100644 --- a/Modules/Filtering/ImageIntensity/include/itkRescaleIntensityImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkRescaleIntensityImageFilter.h @@ -183,14 +183,10 @@ class ITK_TEMPLATE_EXPORT RescaleIntensityImageFilter void PrintSelf(std::ostream & os, Indent indent) const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(RealTypeMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(RealTypeAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: RescaleIntensityImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkShiftScaleImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkShiftScaleImageFilter.h index b73ea509a1a..723af7aa6cd 100644 --- a/Modules/Filtering/ImageIntensity/include/itkShiftScaleImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkShiftScaleImageFilter.h @@ -94,13 +94,9 @@ class ITK_TEMPLATE_EXPORT ShiftScaleImageFilter : public ImageToImageFilter)); itkConceptMacro(InputPlusRealTypeCheck, (Concept::AdditiveOperators)); itkConceptMacro(RealTypeMultiplyOperatorCheck, (Concept::MultiplyOperator)); - // End concept checking -#endif protected: ShiftScaleImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkSigmoidImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSigmoidImageFilter.h index 728b0fdbd41..08883f0b0ca 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSigmoidImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSigmoidImageFilter.h @@ -234,16 +234,12 @@ class SigmoidImageFilter return this->GetFunctor().GetOutputMaximum(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputTimesDoubleCheck, (Concept::MultiplyOperator)); itkConceptMacro(OutputDoubleAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: SigmoidImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkSinImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSinImageFilter.h index 828fde82f6e..58afb6220ae 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSinImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSinImageFilter.h @@ -82,12 +82,8 @@ class ITK_TEMPLATE_EXPORT SinImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: SinImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkSqrtImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSqrtImageFilter.h index a4c8ce7a23d..58ca795905c 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSqrtImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSqrtImageFilter.h @@ -79,12 +79,8 @@ class ITK_TEMPLATE_EXPORT SqrtImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: SqrtImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkSquareImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSquareImageFilter.h index ba69bfaadb4..df3e28e62f5 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSquareImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSquareImageFilter.h @@ -77,13 +77,9 @@ class ITK_TEMPLATE_EXPORT SquareImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(RealTypeMultiplyOperatorCheck, (Concept::MultiplyOperator::RealType>)); - // End concept checking -#endif protected: SquareImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkSubtractImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSubtractImageFilter.h index 947637d1ffc..4c15da3e47d 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSubtractImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSubtractImageFilter.h @@ -85,14 +85,10 @@ class ITK_TEMPLATE_EXPORT SubtractImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(SubtractImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1Input2OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: SubtractImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h index 825dc1ed92a..1d30c05fca0 100644 --- a/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h @@ -284,11 +284,7 @@ class SymmetricEigenAnalysisImageFilter return this->GetFunctor().GetDimension(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SymmetricEigenAnalysisImageFilter() { this->SetDimension(TInputImage::ImageDimension); } @@ -374,11 +370,7 @@ class SymmetricEigenAnalysisFixedDimensionImageFilter return this->GetFunctor().GetDimension(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SymmetricEigenAnalysisFixedDimensionImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkTanImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkTanImageFilter.h index ae78b32a777..9a0d87d43fc 100644 --- a/Modules/Filtering/ImageIntensity/include/itkTanImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkTanImageFilter.h @@ -79,12 +79,8 @@ class ITK_TEMPLATE_EXPORT TanImageFilter : public UnaryGeneratorImageFilter)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: TanImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h index e82cb4c862b..663af910bd3 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h @@ -157,12 +157,8 @@ class ITK_TEMPLATE_EXPORT VectorExpandImageFilter : public ImageToImageFilter)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -# endif protected: VectorExpandImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorIndexSelectionCastImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorIndexSelectionCastImageFilter.h index 35538ab12ad..151ef706674 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorIndexSelectionCastImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorIndexSelectionCastImageFilter.h @@ -126,11 +126,7 @@ class VectorIndexSelectionCastImageFilter return this->GetFunctor().GetIndex(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorIndexSelectionCastImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorMagnitudeImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorMagnitudeImageFilter.h index bf558c715fb..8cad9a5c073 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorMagnitudeImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorMagnitudeImageFilter.h @@ -83,11 +83,7 @@ class ITK_TEMPLATE_EXPORT VectorMagnitudeImageFilter : public UnaryGeneratorImag /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(VectorMagnitudeImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorMagnitudeImageFilter() diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.h index b9eca3c1f33..4b541f0aa8d 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.h @@ -148,12 +148,8 @@ class ITK_TEMPLATE_EXPORT VectorRescaleIntensityImageFilter void PrintSelf(std::ostream & os, Indent indent) const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: VectorRescaleIntensityImageFilter(); diff --git a/Modules/Filtering/ImageIntensity/include/itkWeightedAddImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkWeightedAddImageFilter.h index 364335426d3..bd263b425fe 100644 --- a/Modules/Filtering/ImageIntensity/include/itkWeightedAddImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkWeightedAddImageFilter.h @@ -154,15 +154,11 @@ class ITK_TEMPLATE_EXPORT WeightedAddImageFilter return this->GetFunctor().GetAlpha(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(Input1HasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(Input1RealTypeMultiplyCheck, (Concept::MultiplyOperator)); itkConceptMacro(Input2RealTypeMultiplyCheck, (Concept::MultiplyOperator)); - // End concept checking -#endif protected: WeightedAddImageFilter() = default; diff --git a/Modules/Filtering/ImageIntensity/include/itkXorImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkXorImageFilter.h index 1a43f14e1c3..7e09db6e131 100644 --- a/Modules/Filtering/ImageIntensity/include/itkXorImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkXorImageFilter.h @@ -73,14 +73,10 @@ class ITK_TEMPLATE_EXPORT XorImageFilter : public BinaryGeneratorImageFilter)); - // End concept checking -#endif protected: XorImageFilter() diff --git a/Modules/Filtering/ImageLabel/include/itkChangeLabelImageFilter.h b/Modules/Filtering/ImageLabel/include/itkChangeLabelImageFilter.h index 93728f896d0..4146fae10cd 100644 --- a/Modules/Filtering/ImageLabel/include/itkChangeLabelImageFilter.h +++ b/Modules/Filtering/ImageLabel/include/itkChangeLabelImageFilter.h @@ -150,12 +150,8 @@ class ITK_TEMPLATE_EXPORT ChangeLabelImageFilter void ClearChangeMap(); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(PixelTypeComparable, (Concept::Comparable)); - // End concept checking -#endif protected: ChangeLabelImageFilter() = default; diff --git a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h index a71a923325d..92fa642c930 100644 --- a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h +++ b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h @@ -94,10 +94,7 @@ class ScanlineFilterCommon using OutputOffsetType = typename TOutputImage::OffsetType; using OutputImagePixelType = typename TOutputImage::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Concept checking -- input and output dimensions must be the same itkConceptMacro(SameDimension, (Concept::SameDimension)); -#endif using EnclosingFilter = ImageToImageFilter; diff --git a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h index f003b1a3a20..b28247daee0 100644 --- a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h +++ b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.h @@ -91,12 +91,8 @@ class ITK_TEMPLATE_EXPORT AdditiveGaussianNoiseImageFilter : public NoiseBaseIma itkGetConstMacro(StandardDeviation, double); itkSetMacro(StandardDeviation, double); -#ifdef ITK_USE_CONCEPT_CHECKING - /** Begin concept checking */ itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - /** End concept checking */ -#endif protected: AdditiveGaussianNoiseImageFilter(); diff --git a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h index b51a45132dd..45c08150ae3 100644 --- a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h +++ b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.h @@ -111,12 +111,8 @@ class ITK_TEMPLATE_EXPORT SaltAndPepperNoiseImageFilter : public NoiseBaseImageF itkGetConstMacro(PepperValue, OutputImagePixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - /** Begin concept checking */ itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - /** End concept checking */ -#endif protected: SaltAndPepperNoiseImageFilter(); diff --git a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h index cc5c2700696..a2f8672aece 100644 --- a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h +++ b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.h @@ -128,12 +128,8 @@ class ITK_TEMPLATE_EXPORT ShotNoiseImageFilter : public NoiseBaseImageFilter)); - /** End concept checking */ -#endif protected: ShotNoiseImageFilter(); diff --git a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h index ab4912a2862..810fbb8f410 100644 --- a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h +++ b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.h @@ -87,12 +87,8 @@ class ITK_TEMPLATE_EXPORT SpeckleNoiseImageFilter : public NoiseBaseImageFilter< itkGetConstMacro(StandardDeviation, double); itkSetMacro(StandardDeviation, double); -#ifdef ITK_USE_CONCEPT_CHECKING - /** Begin concept checking */ itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - /** End concept checking */ -#endif protected: SpeckleNoiseImageFilter(); diff --git a/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h index 835d0c2d58b..5c896371975 100644 --- a/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h @@ -85,11 +85,7 @@ class ITK_TEMPLATE_EXPORT AccumulateImageFilter : public ImageToImageFilter)); - // End concept checking -#endif /** Set the direction in which to accumulate the data. It must be * set before the update of the filter. Defaults to the last diff --git a/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h index bbeeac897fd..bbc7042e28b 100644 --- a/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkBinaryProjectionImageFilter.h @@ -143,12 +143,8 @@ class BinaryProjectionImageFilter * NumericTraits::NonpositiveMin(). */ itkGetConstMacro(BackgroundValue, OutputPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeGreaterThanComparable, (Concept::EqualityComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: BinaryProjectionImageFilter() diff --git a/Modules/Filtering/ImageStatistics/include/itkLabelOverlapMeasuresImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkLabelOverlapMeasuresImageFilter.h index 1a7c783ab33..9f0eb2cc01b 100644 --- a/Modules/Filtering/ImageStatistics/include/itkLabelOverlapMeasuresImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkLabelOverlapMeasuresImageFilter.h @@ -187,11 +187,7 @@ class ITK_TEMPLATE_EXPORT LabelOverlapMeasuresImageFilter : public ImageSink)); - // End concept checking -#endif protected: LabelOverlapMeasuresImageFilter(); diff --git a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h index 39e33b8f9c8..438f0874425 100644 --- a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h @@ -377,12 +377,7 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsImageFilter : public ImageSink)); - // End concept checking -#endif protected: LabelStatisticsImageFilter(); diff --git a/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h index c676b638483..807c9b18d77 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMaximumProjectionImageFilter.h @@ -99,12 +99,8 @@ class MaximumProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeGreaterThanComparable, (Concept::GreaterThanComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: MaximumProjectionImageFilter() = default; diff --git a/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h index fee3ceb34da..57412bf36b4 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMeanProjectionImageFilter.h @@ -109,14 +109,10 @@ class MeanProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelToOutputPixelTypeGreaterAdditiveOperatorCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: MeanProjectionImageFilter() = default; diff --git a/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h index e57198fae59..312ab928c58 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMedianProjectionImageFilter.h @@ -100,11 +100,6 @@ class MedianProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking - // End concept checking -#endif - protected: MedianProjectionImageFilter() = default; ~MedianProjectionImageFilter() override = default; diff --git a/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h index d42a93ae5a4..16404093388 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h @@ -109,13 +109,9 @@ class ITK_TEMPLATE_EXPORT MinimumMaximumImageFilter : public ImageSink)); itkConceptMacro(GreaterThanComparableCheck, (Concept::GreaterThanComparable)); itkConceptMacro(OStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: MinimumMaximumImageFilter(); diff --git a/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h index 07e8fedd2ab..1d374d1dcdd 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMinimumProjectionImageFilter.h @@ -98,12 +98,8 @@ class MinimumProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeGreaterThanComparable, (Concept::LessThanComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: MinimumProjectionImageFilter() = default; diff --git a/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h index 27f26bc216f..1a444b9891e 100644 --- a/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkProjectionImageFilter.h @@ -89,12 +89,8 @@ class ITK_TEMPLATE_EXPORT ProjectionImageFilter : public ImageToImageFilter)); - // End concept checking -#endif /** Set/Get the direction in which to accumulate the data. It must be set * before the update of the filter. Defaults to the last dimension. */ diff --git a/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h index b0dd43f2fec..85ace20482f 100644 --- a/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkStandardDeviationProjectionImageFilter.h @@ -129,17 +129,12 @@ class StandardDeviationProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelToOutputPixelTypeGreaterAdditiveOperatorCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(AccumulateHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif - protected: StandardDeviationProjectionImageFilter() = default; ~StandardDeviationProjectionImageFilter() override = default; diff --git a/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.h index 5588d7eb243..a2708ec68bb 100644 --- a/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.h @@ -131,11 +131,7 @@ class ITK_TEMPLATE_EXPORT StatisticsImageFilter : public ImageSink DataObjectPointer MakeOutput(const DataObjectIdentifierType & name) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: StatisticsImageFilter(); diff --git a/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h index 846be4992f9..cfcb44c510c 100644 --- a/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkSumProjectionImageFilter.h @@ -106,13 +106,9 @@ class SumProjectionImageFilter /** Method for creation through the object factory. */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelToOutputPixelTypeGreaterAdditiveOperatorCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SumProjectionImageFilter() = default; diff --git a/Modules/Filtering/LabelMap/include/itkAggregateLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAggregateLabelMapFilter.h index cfe1e3d99a8..ccb508b25bf 100644 --- a/Modules/Filtering/LabelMap/include/itkAggregateLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAggregateLabelMapFilter.h @@ -69,16 +69,12 @@ class ITK_TEMPLATE_EXPORT AggregateLabelMapFilter : public InPlaceLabelMapFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AggregateLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: AggregateLabelMapFilter() = default; diff --git a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h index faa5471243f..af731cafe64 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h @@ -73,16 +73,12 @@ class ITK_TEMPLATE_EXPORT AttributeKeepNObjectsLabelMapFilter : public InPlaceLa /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributeKeepNObjectsLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking - /* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the ordering of the objects. By default, the ones with the diff --git a/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h index dde0999ccbe..d0c6fb2c7c1 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h @@ -75,16 +75,12 @@ class ITK_TEMPLATE_EXPORT AttributeOpeningLabelMapFilter : public InPlaceLabelMa /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributeOpeningLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the threshold used to keep or remove the objects. diff --git a/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h index 092402fc11a..c8304c5ab81 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h @@ -75,16 +75,12 @@ class ITK_TEMPLATE_EXPORT AttributePositionLabelMapFilter : public InPlaceLabelM /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributePositionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif protected: AttributePositionLabelMapFilter() = default; diff --git a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h index a868afebf8c..54c883aa0d6 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h @@ -74,16 +74,12 @@ class ITK_TEMPLATE_EXPORT AttributeRelabelLabelMapFilter : public InPlaceLabelMa /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributeRelabelLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the order of labeling of the objects. By default, the objects with diff --git a/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h index 531ace18267..8c8a2050468 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h @@ -83,16 +83,12 @@ class ITK_TEMPLATE_EXPORT AttributeSelectionLabelMapFilter : public InPlaceLabel /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributeSelectionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the threshold used to keep or remove the objects. diff --git a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h index 9cbec5b34d9..7be12ebcfab 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h @@ -79,16 +79,12 @@ class ITK_TEMPLATE_EXPORT AttributeUniqueLabelMapFilter : public InPlaceLabelMap /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(AttributeUniqueLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the order of labeling of the objects. By default, the objects with diff --git a/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.h index bdcaaeb1709..1f84b2ffd43 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.h @@ -86,11 +86,7 @@ class ITK_TEMPLATE_EXPORT BinaryFillholeImageFilter : public ImageToImageFilter< itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the value in the image to consider as "foreground". Defaults to * maximum value of InputPixelType. */ diff --git a/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.h index 947e69b760a..1c4ffa23d57 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.h @@ -86,11 +86,7 @@ class ITK_TEMPLATE_EXPORT BinaryGrindPeakImageFilter : public ImageToImageFilter itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the value in the image to consider as "foreground". Defaults to * maximum value of InputPixelType. */ diff --git a/Modules/Filtering/LabelMap/include/itkBinaryImageToShapeLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryImageToShapeLabelMapFilter.h index 6f7d2694b2d..fe5536108f3 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryImageToShapeLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryImageToShapeLabelMapFilter.h @@ -108,13 +108,9 @@ class ITK_TEMPLATE_EXPORT BinaryImageToShapeLabelMapFilter : public ImageToImage itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryImageToStatisticsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryImageToStatisticsLabelMapFilter.h index ee981e09ff1..0c0ee89dc71 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryImageToStatisticsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryImageToStatisticsLabelMapFilter.h @@ -94,13 +94,9 @@ class ITK_TEMPLATE_EXPORT BinaryImageToStatisticsLabelMapFilter : public ImageTo itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByDilationImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByDilationImageFilter.h index 15540506c09..89c42167a12 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByDilationImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByDilationImageFilter.h @@ -105,13 +105,9 @@ class ITK_TEMPLATE_EXPORT BinaryReconstructionByDilationImageFilter itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByErosionImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByErosionImageFilter.h index f65092e7e7d..1d90e14f1d0 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByErosionImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionByErosionImageFilter.h @@ -105,13 +105,9 @@ class ITK_TEMPLATE_EXPORT BinaryReconstructionByErosionImageFilter : public Imag itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h index 6030cb9cc80..d246814e362 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h @@ -80,16 +80,12 @@ class ITK_TEMPLATE_EXPORT BinaryReconstructionLabelMapFilter : public InPlaceLab /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(BinaryReconstructionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** Set/Get the marker image */ itkSetInputMacro(MarkerImage, MarkerImageType); diff --git a/Modules/Filtering/LabelMap/include/itkBinaryShapeKeepNObjectsImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryShapeKeepNObjectsImageFilter.h index 4b44d5d1ba5..8f88c3fd85a 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryShapeKeepNObjectsImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryShapeKeepNObjectsImageFilter.h @@ -99,13 +99,9 @@ class ITK_TEMPLATE_EXPORT BinaryShapeKeepNObjectsImageFilter : public ImageToIma itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryShapeOpeningImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryShapeOpeningImageFilter.h index 04b1f154918..a90b8427ddd 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryShapeOpeningImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryShapeOpeningImageFilter.h @@ -99,13 +99,9 @@ class ITK_TEMPLATE_EXPORT BinaryShapeOpeningImageFilter : public ImageToImageFil itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryStatisticsKeepNObjectsImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryStatisticsKeepNObjectsImageFilter.h index fc8fbc32f17..6cd59527355 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryStatisticsKeepNObjectsImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryStatisticsKeepNObjectsImageFilter.h @@ -102,13 +102,9 @@ class ITK_TEMPLATE_EXPORT BinaryStatisticsKeepNObjectsImageFilter : public Image itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkBinaryStatisticsOpeningImageFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryStatisticsOpeningImageFilter.h index b629276480c..a3b93d8362b 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryStatisticsOpeningImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryStatisticsOpeningImageFilter.h @@ -106,13 +106,9 @@ class ITK_TEMPLATE_EXPORT BinaryStatisticsOpeningImageFilter : public ImageToIma itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h index 3ccc2189222..0b3ddd1a2c5 100644 --- a/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h @@ -77,16 +77,12 @@ class ITK_TEMPLATE_EXPORT ChangeLabelLabelMapFilter : public InPlaceLabelMapFilt using ChangeMapType = typename std::map; using ChangeMapIterator = typename ChangeMapType::const_iterator; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** */ diff --git a/Modules/Filtering/LabelMap/include/itkLabelImageToLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkLabelImageToLabelMapFilter.h index 6be0307d746..c4e97a67e5d 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelImageToLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelImageToLabelMapFilter.h @@ -90,9 +90,7 @@ class ITK_TEMPLATE_EXPORT LabelImageToLabelMapFilter : public ImageToImageFilter itkSetMacro(BackgroundValue, OutputImagePixelType); itkGetConstMacro(BackgroundValue, OutputImagePixelType); -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); -#endif protected: LabelImageToLabelMapFilter(); diff --git a/Modules/Filtering/LabelMap/include/itkLabelImageToShapeLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkLabelImageToShapeLabelMapFilter.h index 4e8313d0d49..df1a517c2df 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelImageToShapeLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelImageToShapeLabelMapFilter.h @@ -87,13 +87,9 @@ class ITK_TEMPLATE_EXPORT LabelImageToShapeLabelMapFilter : public ImageToImageF /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelImageToShapeLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelImageToStatisticsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkLabelImageToStatisticsLabelMapFilter.h index a84791491e5..e8fb003bdf4 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelImageToStatisticsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelImageToStatisticsLabelMapFilter.h @@ -85,13 +85,9 @@ class ITK_TEMPLATE_EXPORT LabelImageToStatisticsLabelMapFilter : public ImageToI /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelImageToStatisticsLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelMapToLabelImageFilter.h b/Modules/Filtering/LabelMap/include/itkLabelMapToLabelImageFilter.h index f9eb92644e8..fe6403021f5 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelMapToLabelImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelMapToLabelImageFilter.h @@ -79,9 +79,7 @@ class ITK_TEMPLATE_EXPORT LabelMapToLabelImageFilter : public LabelMapFilter)); -#endif protected: LabelMapToLabelImageFilter() = default; diff --git a/Modules/Filtering/LabelMap/include/itkLabelSelectionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkLabelSelectionLabelMapFilter.h index 8b1ac794d5c..593303ff519 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelSelectionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelSelectionLabelMapFilter.h @@ -88,16 +88,12 @@ class LabelSelectionLabelMapFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelSelectionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif const AttributeSetType & GetLabelSet() const diff --git a/Modules/Filtering/LabelMap/include/itkLabelShapeKeepNObjectsImageFilter.h b/Modules/Filtering/LabelMap/include/itkLabelShapeKeepNObjectsImageFilter.h index 99275f7b8f7..f08079c2b96 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelShapeKeepNObjectsImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelShapeKeepNObjectsImageFilter.h @@ -91,13 +91,9 @@ class ITK_TEMPLATE_EXPORT LabelShapeKeepNObjectsImageFilter : public ImageToImag /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelShapeKeepNObjectsImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelShapeOpeningImageFilter.h b/Modules/Filtering/LabelMap/include/itkLabelShapeOpeningImageFilter.h index 4f574a438fa..c17c96d3993 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelShapeOpeningImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelShapeOpeningImageFilter.h @@ -87,13 +87,9 @@ class ITK_TEMPLATE_EXPORT LabelShapeOpeningImageFilter : public ImageToImageFilt /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelShapeOpeningImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelStatisticsKeepNObjectsImageFilter.h b/Modules/Filtering/LabelMap/include/itkLabelStatisticsKeepNObjectsImageFilter.h index 9551773509b..689297fc1b2 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelStatisticsKeepNObjectsImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelStatisticsKeepNObjectsImageFilter.h @@ -90,13 +90,9 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsKeepNObjectsImageFilter : public ImageT /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelStatisticsKeepNObjectsImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelStatisticsOpeningImageFilter.h b/Modules/Filtering/LabelMap/include/itkLabelStatisticsOpeningImageFilter.h index 8883c25b5bc..0da49d7ffc2 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelStatisticsOpeningImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelStatisticsOpeningImageFilter.h @@ -90,13 +90,9 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsOpeningImageFilter : public ImageToImag /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelStatisticsOpeningImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkLabelUniqueLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkLabelUniqueLabelMapFilter.h index ff3433489e6..672c354e56a 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelUniqueLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkLabelUniqueLabelMapFilter.h @@ -77,16 +77,12 @@ class LabelUniqueLabelMapFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(LabelUniqueLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif protected: LabelUniqueLabelMapFilter() = default; diff --git a/Modules/Filtering/LabelMap/include/itkMergeLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkMergeLabelMapFilter.h index 15661b49d70..df8244a4421 100644 --- a/Modules/Filtering/LabelMap/include/itkMergeLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkMergeLabelMapFilter.h @@ -132,16 +132,12 @@ class ITK_TEMPLATE_EXPORT MergeLabelMapFilter : public InPlaceLabelMapFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif #ifdef STRICT # undef STRICT diff --git a/Modules/Filtering/LabelMap/include/itkRelabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkRelabelLabelMapFilter.h index 5a2a461a380..f8c98d48da6 100644 --- a/Modules/Filtering/LabelMap/include/itkRelabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkRelabelLabelMapFilter.h @@ -75,16 +75,12 @@ class RelabelLabelMapFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(RelabelLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: RelabelLabelMapFilter() { this->SetReverseOrdering(true); } diff --git a/Modules/Filtering/LabelMap/include/itkShapeKeepNObjectsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapeKeepNObjectsLabelMapFilter.h index 09070300be7..633225e52e1 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeKeepNObjectsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeKeepNObjectsLabelMapFilter.h @@ -71,16 +71,12 @@ class ITK_TEMPLATE_EXPORT ShapeKeepNObjectsLabelMapFilter : public InPlaceLabelM /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShapeKeepNObjectsLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** * Set/Get the ordering of the objects. By default, the ones with the diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.h index cba15d1d589..ef440359098 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.h @@ -88,16 +88,12 @@ class ITK_TEMPLATE_EXPORT ShapeLabelMapFilter : public InPlaceLabelMapFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** * Set/Get whether the maximum Feret diameter should be computed or not. diff --git a/Modules/Filtering/LabelMap/include/itkShapeOpeningLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapeOpeningLabelMapFilter.h index 762873ffc03..5e9a039a0a2 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeOpeningLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeOpeningLabelMapFilter.h @@ -76,16 +76,12 @@ class ITK_TEMPLATE_EXPORT ShapeOpeningLabelMapFilter : public InPlaceLabelMapFil /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShapeOpeningLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** * Set/Get the threshold used to keep or remove the objects. diff --git a/Modules/Filtering/LabelMap/include/itkShapePositionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapePositionLabelMapFilter.h index 594ce35c2b0..cb3b6b6947b 100644 --- a/Modules/Filtering/LabelMap/include/itkShapePositionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapePositionLabelMapFilter.h @@ -66,16 +66,12 @@ class ITK_TEMPLATE_EXPORT ShapePositionLabelMapFilter : public InPlaceLabelMapFi /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShapePositionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif /** * Set/Get the attribute to use to get the object position. The default diff --git a/Modules/Filtering/LabelMap/include/itkShapeRelabelImageFilter.h b/Modules/Filtering/LabelMap/include/itkShapeRelabelImageFilter.h index 5dc7f4e060b..c98e225bae6 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeRelabelImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeRelabelImageFilter.h @@ -86,13 +86,9 @@ class ITK_TEMPLATE_EXPORT ShapeRelabelImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkShapeRelabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapeRelabelLabelMapFilter.h index c6ab29b86ac..9574a876c6e 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeRelabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeRelabelLabelMapFilter.h @@ -73,16 +73,12 @@ class ITK_TEMPLATE_EXPORT ShapeRelabelLabelMapFilter : public InPlaceLabelMapFil /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShapeRelabelLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** * Set/Get the order of labeling of the objects. By default, the objects with diff --git a/Modules/Filtering/LabelMap/include/itkShapeUniqueLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShapeUniqueLabelMapFilter.h index d64898e0b86..3b4685aa7a6 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeUniqueLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShapeUniqueLabelMapFilter.h @@ -72,16 +72,12 @@ class ITK_TEMPLATE_EXPORT ShapeUniqueLabelMapFilter : public InPlaceLabelMapFilt /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShapeUniqueLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** * Set/Get the ordering of the objects. By default, the objects with diff --git a/Modules/Filtering/LabelMap/include/itkShiftScaleLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkShiftScaleLabelMapFilter.h index f088b8fa302..f626466a634 100644 --- a/Modules/Filtering/LabelMap/include/itkShiftScaleLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkShiftScaleLabelMapFilter.h @@ -68,16 +68,12 @@ class ITK_TEMPLATE_EXPORT ShiftScaleLabelMapFilter : public InPlaceLabelMapFilte /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ShiftScaleLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif itkSetMacro(Shift, double); itkGetConstReferenceMacro(Shift, double); diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsKeepNObjectsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsKeepNObjectsLabelMapFilter.h index 389b396c091..6b76f686df6 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsKeepNObjectsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsKeepNObjectsLabelMapFilter.h @@ -72,16 +72,12 @@ class ITK_TEMPLATE_EXPORT StatisticsKeepNObjectsLabelMapFilter : public ShapeKee /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsKeepNObjectsLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: StatisticsKeepNObjectsLabelMapFilter(); diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.h index 4476f394329..7f3c2b35b58 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.h @@ -75,16 +75,12 @@ class ITK_TEMPLATE_EXPORT StatisticsLabelMapFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif /** Set the feature image */ void diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsOpeningLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsOpeningLabelMapFilter.h index 8e493bd3f7f..3509bb0153d 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsOpeningLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsOpeningLabelMapFilter.h @@ -72,16 +72,12 @@ class ITK_TEMPLATE_EXPORT StatisticsOpeningLabelMapFilter : public ShapeOpeningL /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsOpeningLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: StatisticsOpeningLabelMapFilter(); diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsPositionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsPositionLabelMapFilter.h index ab1e7d15083..1c45140b270 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsPositionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsPositionLabelMapFilter.h @@ -70,16 +70,12 @@ class ITK_TEMPLATE_EXPORT StatisticsPositionLabelMapFilter : public ShapePositio /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsPositionLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ - // End concept checking -#endif protected: StatisticsPositionLabelMapFilter(); diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsRelabelImageFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsRelabelImageFilter.h index abdb4445ec3..d94ce73f6a4 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsRelabelImageFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsRelabelImageFilter.h @@ -89,13 +89,9 @@ class ITK_TEMPLATE_EXPORT StatisticsRelabelImageFilter : public ImageToImageFilt /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsRelabelImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** * Set/Get the value used as "background" in the output image. diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsRelabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsRelabelLabelMapFilter.h index 66295301513..4d065fd0409 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsRelabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsRelabelLabelMapFilter.h @@ -71,16 +71,12 @@ class ITK_TEMPLATE_EXPORT StatisticsRelabelLabelMapFilter : public ShapeRelabelL /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsRelabelLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: StatisticsRelabelLabelMapFilter(); diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsUniqueLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkStatisticsUniqueLabelMapFilter.h index 5a5a6845339..2931737d2cb 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsUniqueLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsUniqueLabelMapFilter.h @@ -69,16 +69,12 @@ class ITK_TEMPLATE_EXPORT StatisticsUniqueLabelMapFilter : public ShapeUniqueLab /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(StatisticsUniqueLabelMapFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -/* itkConceptMacro(InputEqualityComparableCheck, + /*itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable));*/ -// End concept checking -#endif protected: StatisticsUniqueLabelMapFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkBasicDilateImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkBasicDilateImageFilter.h index b12d60fef7e..4b960d283f0 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkBasicDilateImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkBasicDilateImageFilter.h @@ -85,15 +85,11 @@ class ITK_TEMPLATE_EXPORT BasicDilateImageFilter : public MorphologyImageFilter< /** Type of the pixels in the Kernel. */ using KernelPixelType = typename TKernel::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputGreaterThanComparableCheck, (Concept::GreaterThanComparable)); itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: BasicDilateImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkBasicErodeImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkBasicErodeImageFilter.h index 7693fef26a9..7acc687a44d 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkBasicErodeImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkBasicErodeImageFilter.h @@ -83,15 +83,11 @@ class ITK_TEMPLATE_EXPORT BasicErodeImageFilter : public MorphologyImageFilter)); itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputLessThanComparableCheck, (Concept::LessThanComparable)); itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: BasicErodeImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkClosingByReconstructionImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkClosingByReconstructionImageFilter.h index 62eefd0c58a..706c2c6041c 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkClosingByReconstructionImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkClosingByReconstructionImageFilter.h @@ -110,11 +110,7 @@ class ITK_TEMPLATE_EXPORT ClosingByReconstructionImageFilter : public ImageToIma itkGetConstReferenceMacro(PreserveIntensities, bool); itkBooleanMacro(PreserveIntensities); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: ClosingByReconstructionImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkDoubleThresholdImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkDoubleThresholdImageFilter.h index 102450828a6..6dbf96ba052 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkDoubleThresholdImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkDoubleThresholdImageFilter.h @@ -116,14 +116,10 @@ class ITK_TEMPLATE_EXPORT DoubleThresholdImageFilter : public ImageToImageFilter itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputComparableCheck, (Concept::Comparable)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: DoubleThresholdImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedClosingImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedClosingImageFilter.h index 130ba7b1b64..2e96daab255 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedClosingImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedClosingImageFilter.h @@ -90,13 +90,9 @@ class ITK_TEMPLATE_EXPORT GrayscaleConnectedClosingImageFilter : public ImageToI itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: GrayscaleConnectedClosingImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedOpeningImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedOpeningImageFilter.h index e87a8d4a2f1..e5a57c50bc4 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedOpeningImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleConnectedOpeningImageFilter.h @@ -91,13 +91,9 @@ class ITK_TEMPLATE_EXPORT GrayscaleConnectedOpeningImageFilter : public ImageToI itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: GrayscaleConnectedOpeningImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFillholeImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFillholeImageFilter.h index 0850bf62cce..9cdafa1e8e0 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFillholeImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFillholeImageFilter.h @@ -96,11 +96,7 @@ class ITK_TEMPLATE_EXPORT GrayscaleFillholeImageFilter : public ImageToImageFilt itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: GrayscaleFillholeImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionDilateImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionDilateImageFilter.h index be11218bed5..b2b1d34845e 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionDilateImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionDilateImageFilter.h @@ -88,8 +88,6 @@ class ITK_TEMPLATE_EXPORT GrayscaleFunctionDilateImageFilter /** Type of the pixels in the Kernel. */ using KernelPixelType = typename TKernel::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); @@ -97,8 +95,6 @@ class ITK_TEMPLATE_EXPORT GrayscaleFunctionDilateImageFilter itkConceptMacro(InputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputGreaterThanComparableCheck, (Concept::GreaterThanComparable)); itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: GrayscaleFunctionDilateImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionErodeImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionErodeImageFilter.h index 85c1f41aea4..4ad0eba7d56 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionErodeImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleFunctionErodeImageFilter.h @@ -88,8 +88,6 @@ class ITK_TEMPLATE_EXPORT GrayscaleFunctionErodeImageFilter /** Type of the pixels in the Kernel. */ using KernelPixelType = typename TKernel::PixelType; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); @@ -97,8 +95,6 @@ class ITK_TEMPLATE_EXPORT GrayscaleFunctionErodeImageFilter itkConceptMacro(InputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputLessThanComparableCheck, (Concept::LessThanComparable)); itkConceptMacro(KernelGreaterThanComparableCheck, (Concept::GreaterThanComparable)); - // End concept checking -#endif protected: GrayscaleFunctionErodeImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicDilateImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicDilateImageFilter.h index e38644d1a0d..7855748509c 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicDilateImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicDilateImageFilter.h @@ -139,13 +139,9 @@ class ITK_TEMPLATE_EXPORT GrayscaleGeodesicDilateImageFilter : public ImageToIma itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputComparableCheck, (Concept::Comparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: GrayscaleGeodesicDilateImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicErodeImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicErodeImageFilter.h index b046b092556..2d174cb98ba 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicErodeImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGeodesicErodeImageFilter.h @@ -140,13 +140,9 @@ class ITK_TEMPLATE_EXPORT GrayscaleGeodesicErodeImageFilter : public ImageToImag itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputComparableCheck, (Concept::Comparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: GrayscaleGeodesicErodeImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGrindPeakImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGrindPeakImageFilter.h index 6b66a333c54..d91811a73fc 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGrindPeakImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkGrayscaleGrindPeakImageFilter.h @@ -110,11 +110,7 @@ class ITK_TEMPLATE_EXPORT GrayscaleGrindPeakImageFilter : public ImageToImageFil itkGetConstReferenceMacro(FullyConnected, bool); itkBooleanMacro(FullyConnected); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: GrayscaleGrindPeakImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkHConcaveImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkHConcaveImageFilter.h index 65859323eeb..44635d88037 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkHConcaveImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkHConcaveImageFilter.h @@ -92,13 +92,9 @@ class ITK_TEMPLATE_EXPORT HConcaveImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: HConcaveImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkHConvexImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkHConvexImageFilter.h index b9b133ce57c..6677dba4f05 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkHConvexImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkHConvexImageFilter.h @@ -92,13 +92,9 @@ class ITK_TEMPLATE_EXPORT HConvexImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: HConvexImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkHMaximaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkHMaximaImageFilter.h index 2b23e95c1b8..04a1dcf2bbe 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkHMaximaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkHMaximaImageFilter.h @@ -104,13 +104,9 @@ class ITK_TEMPLATE_EXPORT HMaximaImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: HMaximaImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkHMinimaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkHMinimaImageFilter.h index 767bf026ed3..2bcbcb1e9d1 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkHMinimaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkHMinimaImageFilter.h @@ -102,13 +102,9 @@ class ITK_TEMPLATE_EXPORT HMinimaImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: HMinimaImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkOpeningByReconstructionImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkOpeningByReconstructionImageFilter.h index f7dc1d665c7..da82951dc61 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkOpeningByReconstructionImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkOpeningByReconstructionImageFilter.h @@ -112,11 +112,7 @@ class ITK_TEMPLATE_EXPORT OpeningByReconstructionImageFilter : public ImageToIma itkGetConstReferenceMacro(PreserveIntensities, bool); itkBooleanMacro(PreserveIntensities); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); - // End concept checking -#endif protected: OpeningByReconstructionImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkRegionalMaximaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkRegionalMaximaImageFilter.h index a8667e6cd0a..a97c2df8590 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkRegionalMaximaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkRegionalMaximaImageFilter.h @@ -116,12 +116,8 @@ class ITK_TEMPLATE_EXPORT RegionalMaximaImageFilter : public ImageToImageFilter< itkGetConstMacro(FlatIsMaxima, bool); itkBooleanMacro(FlatIsMaxima); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: RegionalMaximaImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkRegionalMinimaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkRegionalMinimaImageFilter.h index 1474470439f..05bc45fce9c 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkRegionalMinimaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkRegionalMinimaImageFilter.h @@ -114,12 +114,8 @@ class ITK_TEMPLATE_EXPORT RegionalMinimaImageFilter : public ImageToImageFilter< itkGetConstMacro(FlatIsMinima, bool); itkBooleanMacro(FlatIsMinima); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: RegionalMinimaImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalExtremaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalExtremaImageFilter.h index 5614c3e097e..53bdfc333c5 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalExtremaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalExtremaImageFilter.h @@ -129,12 +129,8 @@ class ITK_TEMPLATE_EXPORT ValuedRegionalExtremaImageFilter : public ImageToImage */ itkGetConstMacro(Flat, bool); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ValuedRegionalExtremaImageFilter(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMaximaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMaximaImageFilter.h index ff26f71cd82..e8ee5ab0ac2 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMaximaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMaximaImageFilter.h @@ -83,13 +83,9 @@ class ValuedRegionalMaximaImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ValuedRegionalMaximaImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeComparable, (Concept::GreaterThanComparable)); itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ValuedRegionalMaximaImageFilter() diff --git a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMinimaImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMinimaImageFilter.h index f3fb097ad72..641ea390ba2 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMinimaImageFilter.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkValuedRegionalMinimaImageFilter.h @@ -79,13 +79,9 @@ class ValuedRegionalMinimaImageFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ValuedRegionalMinimaImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeComparable, (Concept::LessThanComparable)); itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ValuedRegionalMinimaImageFilter() { this->SetMarkerValue(NumericTraits::max()); } diff --git a/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h b/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h index 8f089fd3939..d824eae341d 100644 --- a/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h +++ b/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h @@ -185,14 +185,10 @@ class ITK_TEMPLATE_EXPORT ContourExtractor2DImageFilter itkSetMacro(ContourValue, InputRealType); itkGetConstReferenceMacro(ContourValue, InputRealType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(DimensionShouldBe2, (Concept::SameDimension)); itkConceptMacro(InputPixelTypeComparable, (Concept::Comparable)); itkConceptMacro(InputHasPixelTraitsCheck, (Concept::HasPixelTraits)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ContourExtractor2DImageFilter(); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureQuadEdgeMeshFilter.h index c4c66bc3ffa..5a2815fdb0a 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureQuadEdgeMeshFilter.h @@ -63,11 +63,7 @@ class ITK_TEMPLATE_EXPORT DiscreteCurvatureQuadEdgeMeshFilter /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(DiscreteCurvatureQuadEdgeMeshFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscreteCurvatureQuadEdgeMeshFilter() diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureTensorQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureTensorQuadEdgeMeshFilter.h index 0335d80f706..96236740e0e 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureTensorQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteCurvatureTensorQuadEdgeMeshFilter.h @@ -47,12 +47,8 @@ class ITK_TEMPLATE_EXPORT DiscreteCurvatureTensorQuadEdgeMeshFilter /** New macro for creation of through a Smart Pointer */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -// itkConceptMacro( OutputIsFloatingPointCheck, -// ( Concept::IsFloatingPoint< OutputCurvatureType > ) ); -// End concept checking -#endif + // itkConceptMacro( OutputIsFloatingPointCheck, + // ( Concept::IsFloatingPoint< OutputCurvatureType > ) ); protected: DiscreteCurvatureTensorQuadEdgeMeshFilter() = default; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteGaussianCurvatureQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteGaussianCurvatureQuadEdgeMeshFilter.h index a24dacdc010..733d2fd4e4d 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteGaussianCurvatureQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteGaussianCurvatureQuadEdgeMeshFilter.h @@ -69,11 +69,7 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianCurvatureQuadEdgeMeshFilter /** New macro for creation of through a Smart Pointer */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscreteGaussianCurvatureQuadEdgeMeshFilter() = default; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMaximumCurvatureQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMaximumCurvatureQuadEdgeMeshFilter.h index 602a6d767f6..6e03d880a1b 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMaximumCurvatureQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMaximumCurvatureQuadEdgeMeshFilter.h @@ -65,11 +65,7 @@ class DiscreteMaximumCurvatureQuadEdgeMeshFilter /** New macro for creation of through a Smart Pointer */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscreteMaximumCurvatureQuadEdgeMeshFilter() = default; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMeanCurvatureQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMeanCurvatureQuadEdgeMeshFilter.h index 7711298bbc8..e6a7663bcf5 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMeanCurvatureQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMeanCurvatureQuadEdgeMeshFilter.h @@ -70,11 +70,7 @@ class ITK_TEMPLATE_EXPORT DiscreteMeanCurvatureQuadEdgeMeshFilter using CoefficientType = ConformalMatrixCoefficients; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscreteMeanCurvatureQuadEdgeMeshFilter() = default; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMinimumCurvatureQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMinimumCurvatureQuadEdgeMeshFilter.h index 3613d7449a9..cde4ac8380f 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMinimumCurvatureQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscreteMinimumCurvatureQuadEdgeMeshFilter.h @@ -65,11 +65,7 @@ class DiscreteMinimumCurvatureQuadEdgeMeshFilter /** New macro for creation of through a Smart Pointer */ itkNewMacro(Self); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscreteMinimumCurvatureQuadEdgeMeshFilter() = default; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h index 2d6d39d5224..9646e45a2da 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDiscretePrincipalCurvaturesQuadEdgeMeshFilter.h @@ -64,11 +64,7 @@ class DiscretePrincipalCurvaturesQuadEdgeMeshFilter using CoefficientType = ConformalMatrixCoefficients; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputIsFloatingPointCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: DiscretePrincipalCurvaturesQuadEdgeMeshFilter() diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h index 2f06d1c8f14..d848f637a1c 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h @@ -193,10 +193,8 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter itkSetEnumMacro(AreaComputationType, AreaEnum); itkGetMacro(AreaComputationType, AreaEnum); -#ifdef ITK_USE_CONCEPT_CHECKING itkConceptMacro(SameDimensionCheck1, (Concept::SameDimension)); itkConceptMacro(SameDimensionCheck2, (Concept::SameDimension)); -#endif protected: /** Default constructor*/ diff --git a/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.h b/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.h index f999f4553e1..c02d6149c0e 100644 --- a/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.h @@ -92,13 +92,9 @@ class ITK_TEMPLATE_EXPORT BinomialBlurImageFilter : public ImageToImageFilter)); itkConceptMacro(InputConvertibleToDoubleCheck, (Concept::Convertible)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: BinomialBlurImageFilter(); diff --git a/Modules/Filtering/Smoothing/include/itkBoxMeanImageFilter.h b/Modules/Filtering/Smoothing/include/itkBoxMeanImageFilter.h index e1f73c40aaf..5b8be5f2e7d 100644 --- a/Modules/Filtering/Smoothing/include/itkBoxMeanImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkBoxMeanImageFilter.h @@ -71,13 +71,8 @@ class ITK_TEMPLATE_EXPORT BoxMeanImageFilter : public BoxImageFilter)); - // End concept checking -#endif - protected: BoxMeanImageFilter(); ~BoxMeanImageFilter() override = default; diff --git a/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.h b/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.h index 9f18a9a6c09..94e8eae7e67 100644 --- a/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.h @@ -69,13 +69,8 @@ class ITK_TEMPLATE_EXPORT BoxSigmaImageFilter : public BoxImageFilter)); - // End concept checking -#endif - protected: BoxSigmaImageFilter(); ~BoxSigmaImageFilter() override = default; diff --git a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h index 193bffe558e..25d61059cb6 100644 --- a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h @@ -319,14 +319,8 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte itkLegacyMacro(unsigned int GetInternalNumberOfStreamDivisions() const;) itkLegacyMacro(void SetInternalNumberOfStreamDivisions(unsigned int);) -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking - itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif - protected: DiscreteGaussianImageFilter() { diff --git a/Modules/Filtering/Smoothing/include/itkMeanImageFilter.h b/Modules/Filtering/Smoothing/include/itkMeanImageFilter.h index d2cf4e11bf0..af6aca50f30 100644 --- a/Modules/Filtering/Smoothing/include/itkMeanImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkMeanImageFilter.h @@ -84,11 +84,7 @@ class ITK_TEMPLATE_EXPORT MeanImageFilter : public BoxImageFilter)); - // End concept checking -#endif protected: MeanImageFilter(); diff --git a/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h b/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h index 304a3498822..b71ca2e3da7 100644 --- a/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h @@ -84,13 +84,9 @@ class ITK_TEMPLATE_EXPORT MedianImageFilter : public BoxImageFilter)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(InputLessThanComparableCheck, (Concept::LessThanComparable)); - // End concept checking -#endif protected: MedianImageFilter(); diff --git a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h index afc687e7ecc..4a7d038920d 100644 --- a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h @@ -138,13 +138,9 @@ class ITK_TEMPLATE_EXPORT SmoothingRecursiveGaussianImageFilter : public InPlace bool CanRunInPlace() const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking // This concept does not work with variable length vector images // itkConceptMacro( InputHasNumericTraitsCheck, //( Concept::HasNumericTraits< PixelType > ) ); - // End concept checking -#endif protected: SmoothingRecursiveGaussianImageFilter(); diff --git a/Modules/Filtering/Thresholding/include/itkBinaryThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkBinaryThresholdImageFilter.h index 27334016f92..0e02b2d10fa 100644 --- a/Modules/Filtering/Thresholding/include/itkBinaryThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkBinaryThresholdImageFilter.h @@ -208,14 +208,10 @@ class ITK_TEMPLATE_EXPORT BinaryThresholdImageFilter virtual const InputPixelObjectType * GetLowerThresholdInput() const; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputPixelTypeComparable, (Concept::Comparable)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: BinaryThresholdImageFilter(); diff --git a/Modules/Filtering/Thresholding/include/itkBinaryThresholdProjectionImageFilter.h b/Modules/Filtering/Thresholding/include/itkBinaryThresholdProjectionImageFilter.h index fe6faad3966..a3b50ce4b04 100644 --- a/Modules/Filtering/Thresholding/include/itkBinaryThresholdProjectionImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkBinaryThresholdProjectionImageFilter.h @@ -140,12 +140,8 @@ class BinaryThresholdProjectionImageFilter itkSetMacro(ThresholdValue, InputPixelType); itkGetConstMacro(ThresholdValue, InputPixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputPixelTypeGreaterThanComparable, (Concept::GreaterThanComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: BinaryThresholdProjectionImageFilter() diff --git a/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h index d2e9fb79676..2a02009ace1 100644 --- a/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h @@ -181,13 +181,9 @@ class ITK_TEMPLATE_EXPORT HistogramThresholdImageFilter : public ImageToImageFil itkSetObjectMacro(Calculator, CalculatorType); itkGetModifiableObjectMacro(Calculator, CalculatorType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: HistogramThresholdImageFilter(); diff --git a/Modules/Filtering/Thresholding/include/itkKappaSigmaThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkKappaSigmaThresholdImageFilter.h index e0ed33e8810..4ca2147c95b 100644 --- a/Modules/Filtering/Thresholding/include/itkKappaSigmaThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkKappaSigmaThresholdImageFilter.h @@ -107,12 +107,8 @@ class ITK_TEMPLATE_EXPORT KappaSigmaThresholdImageFilter : public ImageToImageFi itkSetMacro(NumberOfIterations, unsigned int); itkGetConstMacro(NumberOfIterations, unsigned int); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputComparableCheck, (Concept::Comparable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the mask image */ void diff --git a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h index 4bc4165bf29..ad4f1296125 100644 --- a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h @@ -130,12 +130,8 @@ class ITK_TEMPLATE_EXPORT OtsuMultipleThresholdsImageFilter : public ImageToImag return m_Thresholds; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputComparableCheck, (Concept::Comparable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: OtsuMultipleThresholdsImageFilter(); diff --git a/Modules/Filtering/Thresholding/include/itkThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkThresholdImageFilter.h index f9ad2476a03..83368ca0936 100644 --- a/Modules/Filtering/Thresholding/include/itkThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkThresholdImageFilter.h @@ -89,12 +89,8 @@ class ITK_TEMPLATE_EXPORT ThresholdImageFilter : public InPlaceImageFilter)); itkConceptMacro(PixelTypeOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the "outside" pixel value. The default value * PixelType{}. */ diff --git a/Modules/Filtering/Thresholding/include/itkThresholdLabelerImageFilter.h b/Modules/Filtering/Thresholding/include/itkThresholdLabelerImageFilter.h index 95f143fa3b0..6449c82836b 100644 --- a/Modules/Filtering/Thresholding/include/itkThresholdLabelerImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkThresholdLabelerImageFilter.h @@ -144,13 +144,9 @@ class ITK_TEMPLATE_EXPORT ThresholdLabelerImageFilter using RealThresholdVector = std::vector; /** The input and output pixel types must support comparison operators. */ -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(PixelTypeComparable, (Concept::Comparable)); itkConceptMacro(OutputPixelTypeComparable, (Concept::Comparable)); itkConceptMacro(OutputPixelTypeOStreamWritable, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the vector of thresholds. */ void diff --git a/Modules/Nonunit/Review/include/itkGridForwardWarpImageFilter.h b/Modules/Nonunit/Review/include/itkGridForwardWarpImageFilter.h index 6f799d2291a..e176126397d 100644 --- a/Modules/Nonunit/Review/include/itkGridForwardWarpImageFilter.h +++ b/Modules/Nonunit/Review/include/itkGridForwardWarpImageFilter.h @@ -105,13 +105,9 @@ class ITK_TEMPLATE_EXPORT GridForwardWarpImageFilter : public ImageToImageFilter /** Get the foreground value */ itkGetConstMacro(ForegroundValue, PixelType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(DisplacementFieldHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: GridForwardWarpImageFilter(); diff --git a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h index f53edd99fd4..c26b104765a 100644 --- a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h +++ b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h @@ -489,11 +489,7 @@ class ITK_TEMPLATE_EXPORT TIntensityImage * GetOrientedIntensityImage(LabelPixelType label) const; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: LabelGeometryImageFilter(); diff --git a/Modules/Nonunit/Review/include/itkMultiphaseDenseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseDenseFiniteDifferenceImageFilter.h index c903dc55395..a42133a66e6 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseDenseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseDenseFiniteDifferenceImageFilter.h @@ -170,13 +170,9 @@ class ITK_TEMPLATE_EXPORT MultiphaseDenseFiniteDifferenceImageFilter void SetFunctionCount(const IdCellType & n); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputTimesDoubleCheck, (Concept::MultiplyOperator)); itkConceptMacro(OutputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif itkSetMacro(ReinitializeCounter, unsigned int); itkGetMacro(ReinitializeCounter, unsigned int); diff --git a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h index 28a420256ad..7a3beab15fe 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h @@ -304,13 +304,9 @@ class ITK_TEMPLATE_EXPORT MultiphaseSparseFiniteDifferenceImageFilter } } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: MultiphaseSparseFiniteDifferenceImageFilter(); diff --git a/Modules/Nonunit/Review/include/itkRobustAutomaticThresholdImageFilter.h b/Modules/Nonunit/Review/include/itkRobustAutomaticThresholdImageFilter.h index 6c456015d93..18d23f78721 100644 --- a/Modules/Nonunit/Review/include/itkRobustAutomaticThresholdImageFilter.h +++ b/Modules/Nonunit/Review/include/itkRobustAutomaticThresholdImageFilter.h @@ -111,12 +111,8 @@ class ITK_TEMPLATE_EXPORT RobustAutomaticThresholdImageFilter : public ImageToIm itkSetMacro(Pow, double); itkGetConstMacro(Pow, double); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputComparableCheck, (Concept::Comparable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif /** Set the gradient image */ void diff --git a/Modules/Nonunit/Review/include/itkScalarChanAndVeseDenseLevelSetImageFilter.h b/Modules/Nonunit/Review/include/itkScalarChanAndVeseDenseLevelSetImageFilter.h index 20513401042..c6368669da2 100644 --- a/Modules/Nonunit/Review/include/itkScalarChanAndVeseDenseLevelSetImageFilter.h +++ b/Modules/Nonunit/Review/include/itkScalarChanAndVeseDenseLevelSetImageFilter.h @@ -107,11 +107,7 @@ class ITK_TEMPLATE_EXPORT ScalarChanAndVeseDenseLevelSetImageFilter using ROIFilterType = RegionOfInterestImageFilter; using ROIFilterPointer = typename ROIFilterType::Pointer; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif /** Set/Get the feature image to be used for speed function of the level set * equation. Equivalent to calling Set/GetInput(1, ..) */ diff --git a/Modules/Nonunit/Review/include/itkScalarChanAndVeseSparseLevelSetImageFilter.h b/Modules/Nonunit/Review/include/itkScalarChanAndVeseSparseLevelSetImageFilter.h index 3e46899fb49..a3a283ccda6 100644 --- a/Modules/Nonunit/Review/include/itkScalarChanAndVeseSparseLevelSetImageFilter.h +++ b/Modules/Nonunit/Review/include/itkScalarChanAndVeseSparseLevelSetImageFilter.h @@ -117,11 +117,7 @@ class ITK_TEMPLATE_EXPORT ScalarChanAndVeseSparseLevelSetImageFilter using ROIFilterType = RegionOfInterestImageFilter; using ROIFilterPointer = typename ROIFilterType::Pointer; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif /** Set/Get the feature image to be used for speed function of the level set * equation. Equivalent to calling Set/GetInput(1, ..) */ diff --git a/Modules/Numerics/Eigen/include/itkEigenAnalysis2DImageFilter.h b/Modules/Numerics/Eigen/include/itkEigenAnalysis2DImageFilter.h index a315a61ff4b..af2c36fdf98 100644 --- a/Modules/Numerics/Eigen/include/itkEigenAnalysis2DImageFilter.h +++ b/Modules/Numerics/Eigen/include/itkEigenAnalysis2DImageFilter.h @@ -127,11 +127,7 @@ class ITK_TEMPLATE_EXPORT EigenAnalysis2DImageFilter : public ImageToImageFilter DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType idx) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(VectorComponentHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: EigenAnalysis2DImageFilter(); diff --git a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h index 66622c79e21..7c46ea93673 100644 --- a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h +++ b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h @@ -82,12 +82,8 @@ class ITK_TEMPLATE_EXPORT ImageToRectilinearFEMObjectFilter : public ProcessObje using ElementBaseType = itk::fem::Element; using ElementBasePointerType = itk::fem::Element::ConstPointer; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking -// itkConceptMacro(SameDimensionOrMinusOne, -// (Concept::SameDimensionOrMinusOne)); -// End concept checking -#endif + // itkConceptMacro(SameDimensionOrMinusOne, + // (Concept::SameDimensionOrMinusOne)); /**Get/Set the number of voxels/pixels in each dimension used *during the mesh generation diff --git a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h index 7661d11045e..9867374dd79 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h +++ b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h @@ -213,12 +213,8 @@ class ITK_TEMPLATE_EXPORT MultiResolutionPyramidImageFilter : public ImageToImag itkGetConstMacro(UseShrinkImageFilter, bool); itkBooleanMacro(UseShrinkImageFilter); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: MultiResolutionPyramidImageFilter(); diff --git a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h index 8aedfb8a80d..2dc53a05f43 100644 --- a/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h +++ b/Modules/Registration/FEM/include/itkPhysicsBasedNonRigidRegistrationMethod.h @@ -142,8 +142,6 @@ class ITK_TEMPLATE_EXPORT PhysicsBasedNonRigidRegistrationMethod /** get FEMFilter */ itkGetConstObjectMacro(FEMFilter, FEMFilterType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking /* Currently only the 3D implementation is available due to a narrow definition of the filter in the original proposal and lack of available resources. */ @@ -153,8 +151,6 @@ class ITK_TEMPLATE_EXPORT PhysicsBasedNonRigidRegistrationMethod itkConceptMacro(MeshDimensionShouldBe3, (Concept::SameDimension)); itkConceptMacro(DeformationFieldImageDimensionShouldBe3, (Concept::SameDimension)); - // End concept checking -#endif protected: PhysicsBasedNonRigidRegistrationMethod(); diff --git a/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h b/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h index cce4c7b7de1..c18f9785d34 100644 --- a/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h +++ b/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h @@ -106,13 +106,11 @@ class DefaultImageToImageMetricTraitsv4 using DefaultMovingImageGradientCalculator = CentralDifferenceImageFunction; -/** Only floating-point images are currently supported. To support integer images, - * several small changes must be made to use an internal floating-point type for - * computations rather than the image pixel type itself. */ -#ifdef ITK_USE_CONCEPT_CHECKING + /** Only floating-point images are currently supported. To support integer images, + * several small changes must be made to use an internal floating-point type for + * computations rather than the image pixel type itself. */ itkConceptMacro(OnlyDefinedForFloatingPointTypes0, (itk::Concept::IsFloatingPoint)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); -#endif // ITK_USE_CONCEPT_CHECKING }; } // end namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h index 9bdbb72f843..5219150ebc0 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h @@ -865,14 +865,12 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4 /** Flag to know if derivative should be calculated */ mutable bool m_ComputeDerivative{}; -/** Only floating-point images are currently supported. To support integer images, - * several small changes must be made */ -#ifdef ITK_USE_CONCEPT_CHECKING + /** Only floating-point images are currently supported. To support integer images, + * several small changes must be made */ using FixedImagePixelValueType = typename PixelTraits::ValueType; using MovingImagePixelValueType = typename PixelTraits::ValueType; itkConceptMacro(OnlyDefinedForFloatingPointTypes0, (itk::Concept::IsFloatingPoint)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); -#endif // ITK_USE_CONCEPT_CHECKING }; } // namespace itk diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.h b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.h index eb71b113bf3..638d5486d4a 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.h +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.h @@ -179,8 +179,6 @@ class ITK_TEMPLATE_EXPORT BayesianClassifierImageFilter DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(UnsignedIntConvertibleToLabelsCheck, (Concept::Convertible)); itkConceptMacro(PosteriorsAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(IntConvertibleToPosteriorsCheck, (Concept::Convertible)); @@ -190,8 +188,6 @@ class ITK_TEMPLATE_EXPORT BayesianClassifierImageFilter itkConceptMacro( InputPriorsPosteriorsMultiplyOperatorCheck, (Concept::MultiplyOperator)); - // End concept checking -#endif protected: BayesianClassifierImageFilter(); diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.h b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.h index 71d7e9417b9..11d767f57ca 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.h +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.h @@ -141,15 +141,11 @@ class ITK_TEMPLATE_EXPORT BayesianClassifierInitializationImageFilter void GenerateOutputInformation() override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(DoubleConvertibleToProbabilityCheck, (Concept::Convertible)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(ProbabilityHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(DoublePlusInputCheck, (Concept::AdditiveOperators)); - // End concept checking -#endif protected: BayesianClassifierInitializationImageFilter(); diff --git a/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h b/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h index c38175c4351..ac62dff05d2 100644 --- a/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h +++ b/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h @@ -144,11 +144,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageKmeansImageFilter : public ImageToImageFilt /** Get the region over which the statistics will be computed */ itkGetConstReferenceMacro(ImageRegion, ImageRegionType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ScalarImageKmeansImageFilter(); diff --git a/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentFunctorImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentFunctorImageFilter.h index cc8475f47b3..58114a20ad0 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentFunctorImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentFunctorImageFilter.h @@ -137,8 +137,6 @@ class ITK_TEMPLATE_EXPORT ConnectedComponentFunctorImageFilter this->Modified(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); @@ -147,8 +145,6 @@ class ITK_TEMPLATE_EXPORT ConnectedComponentFunctorImageFilter itkConceptMacro(OutputConvertibleToLongCheck, (Concept::Convertible)); itkConceptMacro(UnsignedLongConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputIncrementDecrementOperatorsCheck, (Concept::IncrementDecrementOperators)); - // End concept checking -#endif protected: ConnectedComponentFunctorImageFilter() = default; diff --git a/Modules/Segmentation/ConnectedComponents/include/itkHardConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkHardConnectedComponentImageFilter.h index 53ecfe493b2..3c76a5e5e0c 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkHardConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkHardConnectedComponentImageFilter.h @@ -97,16 +97,12 @@ class ITK_TEMPLATE_EXPORT HardConnectedComponentImageFilter : public ImageToImag m_Seeds.push_front(seed); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(UnsignedShortConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(UnsignedCharConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputIncrementDecrementOperatorsCheck, (Concept::IncrementDecrementOperators)); - // End concept checking -#endif protected: HardConnectedComponentImageFilter() = default; diff --git a/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h index 82e24b38712..eff13d37f25 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h @@ -231,15 +231,11 @@ class ITK_TEMPLATE_EXPORT RelabelComponentImageFilter : public InPlaceImageFilte return 0; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(UnsignedLongConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(OutputLongConvertibleToUnsignedLongCheck, (Concept::Convertible)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: RelabelComponentImageFilter(); diff --git a/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h index 6587d97f660..6761969bc02 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h @@ -138,15 +138,11 @@ class ScalarConnectedComponentImageFilter return (this->GetFunctor().GetDistanceThreshold()); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(MaskEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(OutputIncrementDecrementOperatorsCheck, (Concept::IncrementDecrementOperators)); - // End concept checking -#endif protected: ScalarConnectedComponentImageFilter() = default; diff --git a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h index 635bbec64e3..25ba4187441 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h @@ -141,12 +141,8 @@ class VectorConnectedComponentImageFilter return (this->GetFunctor().GetDistanceThreshold()); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputValueHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(InputValyeTypeIsFloatingCheck, (Concept::IsFloatingPoint)); - // End concept checking -#endif protected: VectorConnectedComponentImageFilter() = default; diff --git a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h index e5f2a019087..f5826888ca1 100644 --- a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h +++ b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h @@ -285,17 +285,13 @@ class ITK_TEMPLATE_EXPORT KLMRegionGrowImageFilter : public RegionGrowImageFilte void PrintAlgorithmBorderStats(); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(SameDimension, (Concept::SameDimension)); -# if defined(THIS_CONCEPT_FAILS_ON_GCC) +#if defined(THIS_CONCEPT_FAILS_ON_GCC) /** The input pixel type must be the same as that of the output image. */ itkConceptMacro(SameVectorDimension, (Concept::SameDimension)); -# endif - // End concept checking -#endif +#endif // end THIS_CONCEPT_FAILS_ON_GCC protected: KLMRegionGrowImageFilter(); diff --git a/Modules/Segmentation/LabelVoting/include/itkBinaryMedianImageFilter.h b/Modules/Segmentation/LabelVoting/include/itkBinaryMedianImageFilter.h index 03af6585c47..9f901283631 100644 --- a/Modules/Segmentation/LabelVoting/include/itkBinaryMedianImageFilter.h +++ b/Modules/Segmentation/LabelVoting/include/itkBinaryMedianImageFilter.h @@ -106,15 +106,11 @@ class ITK_TEMPLATE_EXPORT BinaryMedianImageFilter : public ImageToImageFilter)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: BinaryMedianImageFilter(); diff --git a/Modules/Segmentation/LabelVoting/include/itkLabelVotingImageFilter.h b/Modules/Segmentation/LabelVoting/include/itkLabelVotingImageFilter.h index b152acc1108..f07ecd7be7b 100644 --- a/Modules/Segmentation/LabelVoting/include/itkLabelVotingImageFilter.h +++ b/Modules/Segmentation/LabelVoting/include/itkLabelVotingImageFilter.h @@ -144,8 +144,6 @@ class ITK_TEMPLATE_EXPORT LabelVotingImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); @@ -154,8 +152,6 @@ class ITK_TEMPLATE_EXPORT LabelVotingImageFilter : public ImageToImageFilter)); itkConceptMacro(InputIncrementDecrementOperatorsCheck, (Concept::IncrementDecrementOperators)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: LabelVotingImageFilter(); diff --git a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryHoleFillingImageFilter.h b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryHoleFillingImageFilter.h index e28ddada64d..e03410447ed 100644 --- a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryHoleFillingImageFilter.h +++ b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryHoleFillingImageFilter.h @@ -86,12 +86,8 @@ class ITK_TEMPLATE_EXPORT VotingBinaryHoleFillingImageFilter : public VotingBina /** Returns the number of pixels that changed when the filter was executed. */ itkGetConstReferenceMacro(NumberOfPixelsChanged, SizeValueType); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(UnsignedIntConvertibleToInputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: VotingBinaryHoleFillingImageFilter(); diff --git a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryImageFilter.h b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryImageFilter.h index a45a618fb3a..71245529f81 100644 --- a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryImageFilter.h +++ b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryImageFilter.h @@ -106,15 +106,11 @@ class ITK_TEMPLATE_EXPORT VotingBinaryImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: VotingBinaryImageFilter(); diff --git a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryIterativeHoleFillingImageFilter.h b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryIterativeHoleFillingImageFilter.h index f70534801eb..69f195f146e 100644 --- a/Modules/Segmentation/LabelVoting/include/itkVotingBinaryIterativeHoleFillingImageFilter.h +++ b/Modules/Segmentation/LabelVoting/include/itkVotingBinaryIterativeHoleFillingImageFilter.h @@ -127,12 +127,8 @@ class ITK_TEMPLATE_EXPORT VotingBinaryIterativeHoleFillingImageFilter : public I /** Returns the number of pixels that changed when the filter was executed. */ itkGetConstReferenceMacro(NumberOfPixelsChanged, unsigned int); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputOStreamWritableeCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: VotingBinaryIterativeHoleFillingImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetImageFilter.h index 386d308311f..cb72216dac3 100644 --- a/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetImageFilter.h @@ -191,11 +191,7 @@ class ITK_TEMPLATE_EXPORT CannySegmentationLevelSetImageFilter return this->m_CannyFunction->GetCannyImage(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~CannySegmentationLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h b/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h index 50a05268aff..cf6cb501ada 100644 --- a/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h @@ -151,11 +151,7 @@ class ITK_TEMPLATE_EXPORT CollidingFrontsImageFilter : public ImageToImageFilter itkGetConstMacro(StopOnTargets, bool); itkBooleanMacro(StopOnTargets); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: CollidingFrontsImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkCurvesLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkCurvesLevelSetImageFilter.h index 0826f8729dd..8c53d65c66d 100644 --- a/Modules/Segmentation/LevelSets/include/itkCurvesLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkCurvesLevelSetImageFilter.h @@ -140,11 +140,7 @@ class ITK_TEMPLATE_EXPORT CurvesLevelSetImageFilter return m_CurvesFunction->GetDerivativeSigma(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~CurvesLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkExtensionVelocitiesImageFilter.h b/Modules/Segmentation/LevelSets/include/itkExtensionVelocitiesImageFilter.h index b0ed9f080a5..a79e9e31d66 100644 --- a/Modules/Segmentation/LevelSets/include/itkExtensionVelocitiesImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkExtensionVelocitiesImageFilter.h @@ -99,12 +99,8 @@ class ITK_TEMPLATE_EXPORT ExtensionVelocitiesImageFilter : public ReinitializeLe AuxImageType * GetOutputVelocityImage(unsigned int idx = 0); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(AuxValueHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(LevelSetOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ExtensionVelocitiesImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkNarrowBandCurvesLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkNarrowBandCurvesLevelSetImageFilter.h index 1ccb17fa387..2b84066a00c 100644 --- a/Modules/Segmentation/LevelSets/include/itkNarrowBandCurvesLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkNarrowBandCurvesLevelSetImageFilter.h @@ -145,11 +145,7 @@ class ITK_TEMPLATE_EXPORT NarrowBandCurvesLevelSetImageFilter return m_CurvesFunction->GetDerivativeSigma(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~NarrowBandCurvesLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h index e51f7965a8e..8ed1f12bbb0 100644 --- a/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h @@ -373,11 +373,7 @@ class ITK_TEMPLATE_EXPORT NarrowBandLevelSetImageFilter : public NarrowBandImage "error value will not be set or used."); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~NarrowBandLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkNarrowBandThresholdSegmentationLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkNarrowBandThresholdSegmentationLevelSetImageFilter.h index ad595d4534e..c7c52926174 100644 --- a/Modules/Segmentation/LevelSets/include/itkNarrowBandThresholdSegmentationLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkNarrowBandThresholdSegmentationLevelSetImageFilter.h @@ -203,11 +203,7 @@ class ITK_TEMPLATE_EXPORT NarrowBandThresholdSegmentationLevelSetImageFilter return m_ThresholdFunction->GetSmoothingConductance(); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~NarrowBandThresholdSegmentationLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.h index 60e4102f2c8..4990954c5d3 100644 --- a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.h @@ -337,13 +337,9 @@ class ITK_TEMPLATE_EXPORT ParallelSparseFieldLevelSetImageFilter return m_Data[ThreadNum].m_Layers[0]; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ParallelSparseFieldLevelSetImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h index 6994009733c..8fa357053bc 100644 --- a/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h @@ -127,12 +127,8 @@ class ITK_TEMPLATE_EXPORT ReinitializeLevelSetImageFilter : public ImageToImageF return m_OutputNarrowBand; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(LevelSetDoubleAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(LevelSetOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: ReinitializeLevelSetImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h index 08b273186ac..aa186736b0b 100644 --- a/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h @@ -502,11 +502,7 @@ class ITK_TEMPLATE_EXPORT SegmentationLevelSetImageFilter void GenerateAdvectionImage(); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ~SegmentationLevelSetImageFilter() override = default; diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h index bed9d090a05..eb3c4381e92 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h @@ -271,11 +271,7 @@ class ITK_TEMPLATE_EXPORT SparseFieldFourthOrderLevelSetImageFilter ++m_RefitIteration; } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: SparseFieldFourthOrderLevelSetImageFilter(); diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.h index 5449b5617e2..8d6a5db6a23 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.h @@ -332,13 +332,9 @@ class ITK_TEMPLATE_EXPORT SparseFieldLevelSetImageFilter : public FiniteDifferen this->SetInterpolateSurfaceLocation(false); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(DoubleConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: SparseFieldLevelSetImageFilter(); diff --git a/Modules/Segmentation/LevelSetsv4/include/itkWhitakerSparseLevelSetImage.h b/Modules/Segmentation/LevelSetsv4/include/itkWhitakerSparseLevelSetImage.h index 55d795283c4..71418a121cd 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkWhitakerSparseLevelSetImage.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkWhitakerSparseLevelSetImage.h @@ -87,14 +87,8 @@ class ITK_TEMPLATE_EXPORT WhitakerSparseLevelSetImage : public LevelSetSparseIma OutputType Evaluate(const InputType & inputIndex) const override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking - itkConceptMacro(DoubleConvertible, (Concept::Convertible)); - // End concept checking -#endif // ITK_USE_CONCEPT_CHECKING - static inline LayerIdType MinusThreeLayer() { diff --git a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.h b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.h index 118ac3b1141..f98bc74c7f6 100644 --- a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.h +++ b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.h @@ -324,8 +324,6 @@ class ITK_TEMPLATE_EXPORT MRFImageFilter : public ImageToImageFilter)); itkConceptMacro(ClassifiedConvertibleToUnsignedIntCheck, @@ -333,8 +331,6 @@ class ITK_TEMPLATE_EXPORT MRFImageFilter : public ImageToImageFilter)); itkConceptMacro(IntConvertibleToClassifiedCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: MRFImageFilter(); diff --git a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.h b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.h index 7de4daf69c0..cb729e36f42 100644 --- a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.h +++ b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.h @@ -227,14 +227,10 @@ class ITK_TEMPLATE_EXPORT RGBGibbsPriorFilter : public MRFImageFilter)); itkConceptMacro(DimensionShouldBe3, (Concept::SameDimension)); - // End concept checking -#endif private: using InputImageSizeType = typename TInputImage::SizeType; diff --git a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.h index db361a60941..4aac05071ab 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.h @@ -141,12 +141,8 @@ class ITK_TEMPLATE_EXPORT ConfidenceConnectedImageFilter : public ImageToImageFi virtual const SeedsContainerType & GetSeeds() const; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: ConfidenceConnectedImageFilter(); diff --git a/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h index f35ff95d789..13eb45e2c36 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h @@ -149,16 +149,12 @@ class ITK_TEMPLATE_EXPORT ConnectedThresholdImageFilter : public ImageToImageFil static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif using ConnectivityEnum = ConnectedThresholdImageFilterEnums::Connectivity; #if !defined(ITK_LEGACY_REMOVE) diff --git a/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h index 499229929d4..72737ac745f 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h @@ -199,11 +199,7 @@ class ITK_TEMPLATE_EXPORT IsolatedConnectedImageFilter : public ImageToImageFilt * threshold. */ itkGetConstReferenceMacro(ThresholdingFailed, bool); -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); - // End concept checking -#endif protected: IsolatedConnectedImageFilter(); diff --git a/Modules/Segmentation/RegionGrowing/include/itkNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkNeighborhoodConnectedImageFilter.h index 79f994cc0e0..f1765bcc7bb 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkNeighborhoodConnectedImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkNeighborhoodConnectedImageFilter.h @@ -103,15 +103,11 @@ class ITK_TEMPLATE_EXPORT NeighborhoodConnectedImageFilter : public ImageToImage static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(InputOStreamWritableCheck, (Concept::OStreamWritable)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: NeighborhoodConnectedImageFilter(); diff --git a/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.h index 3241deccbc9..41da92563de 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.h @@ -140,14 +140,9 @@ class ITK_TEMPLATE_EXPORT VectorConfidenceConnectedImageFilter : public ImageToI virtual const SeedsContainerType & GetSeeds() const; - -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(OutputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits)); itkConceptMacro(OutputOStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: VectorConfidenceConnectedImageFilter(); diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiPartitioningImageFilter.h b/Modules/Segmentation/Voronoi/include/itkVoronoiPartitioningImageFilter.h index 922985e983d..9aee52dfc50 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiPartitioningImageFilter.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiPartitioningImageFilter.h @@ -82,12 +82,8 @@ class ITK_TEMPLATE_EXPORT VoronoiPartitioningImageFilter static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: VoronoiPartitioningImageFilter() = default; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.h b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.h index 4e19bce46ba..f7162c49d9f 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.h @@ -114,12 +114,8 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationImageFilter static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); - // End concept checking -#endif protected: VoronoiSegmentationImageFilter() = default; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h index d3cc8fd28d8..92c98f43b33 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h @@ -204,13 +204,9 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationRGBImageFilter static constexpr unsigned int InputImageDimension = TInputImage::ImageDimension; static constexpr unsigned int OutputImageDimension = TOutputImage::ImageDimension; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); itkConceptMacro(IntConvertibleToOutputCheck, (Concept::Convertible)); itkConceptMacro(PixelDimensionCheck, (Concept::SameDimension)); - // End concept checking -#endif protected: VoronoiSegmentationRGBImageFilter(); diff --git a/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.h b/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.h index 27418af473e..727389f3cd3 100644 --- a/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.h +++ b/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.h @@ -101,12 +101,8 @@ class ITK_TEMPLATE_EXPORT TobogganImageFilter : public ImageToImageFilter>; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(LessThanComparableCheck, (Concept::LessThanComparable)); itkConceptMacro(OStreamWritableCheck, (Concept::OStreamWritable)); - // End concept checking -#endif protected: TobogganImageFilter() = default; diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedImageFilter.h b/Modules/Segmentation/Watersheds/include/itkWatershedImageFilter.h index bf27d5a0e7f..9882277c9c9 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedImageFilter.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedImageFilter.h @@ -252,14 +252,10 @@ class ITK_TEMPLATE_EXPORT WatershedImageFilter void EnlargeOutputRequestedRegion(DataObject * data) override; -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(InputEqualityComparableCheck, (Concept::EqualityComparable)); itkConceptMacro(InputAdditiveOperatorsCheck, (Concept::AdditiveOperators)); itkConceptMacro(DoubleInputMultiplyOperatorCheck, (Concept::MultiplyOperator)); itkConceptMacro(InputLessThanComparableCheck, (Concept::LessThanComparable)); - // End concept checking -#endif protected: WatershedImageFilter(); diff --git a/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h b/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h index 8a97a38e9c8..54f38c8d402 100644 --- a/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h +++ b/Modules/Video/BridgeOpenCV/include/itkOpenCVBasicTypeBridge.h @@ -61,10 +61,7 @@ struct OpenCVBasicTypeBridge return OpenCVDataType(iP[0], iP[1]); } -#ifdef ITK_USE_CONCEPT_CHECKING - // Begin concept checking itkConceptMacro(SameDimensionCheck, (Concept::SameDimension)); -#endif }; template @@ -91,10 +88,7 @@ struct OpenCVBasicTypeBridge)); -#endif }; template <> diff --git a/Utilities/Doxygen/DoxygenConfig.cmake b/Utilities/Doxygen/DoxygenConfig.cmake index 0a66c6b5b40..c4064e4b31d 100644 --- a/Utilities/Doxygen/DoxygenConfig.cmake +++ b/Utilities/Doxygen/DoxygenConfig.cmake @@ -148,7 +148,6 @@ set(DOXYGEN_PREDEFINED "size_t=vcl_size_t" "ITK_USE_FFTWD" "ITK_USE_FFTWF" - "ITK_USE_CONCEPT_CHECKING" "itkMacro_h" "ITK_LEGACY_REMOVE" "ITK_FUTURE_LEGACY_REMOVE" diff --git a/Wrapping/DoxygenConfig.cmake b/Wrapping/DoxygenConfig.cmake index 66d6e91b667..e3807b28b80 100644 --- a/Wrapping/DoxygenConfig.cmake +++ b/Wrapping/DoxygenConfig.cmake @@ -142,7 +142,6 @@ set(DOXYGEN_PREDEFINED "size_t=vcl_size_t" "ITK_USE_FFTWD" "ITK_USE_FFTWF" - "ITK_USE_CONCEPT_CHECKING" "itkMacro_h" "ITK_LEGACY_REMOVE" "ITK_FUTURE_LEGACY_REMOVE"