From c7d180e58b116fee37a6108fd823d02f6a38f049 Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 30 May 2024 14:50:56 -0400 Subject: [PATCH 1/7] COMP: Remove ; from itkBooleanMacro --- .clang-format | 1 + .../itkVectorCentralDifferenceImageFunction.h | 2 +- .../itkConicShellInteriorExteriorSpatialFunction.h | 2 +- Modules/Core/Common/include/itkDataObject.h | 2 +- Modules/Core/Common/include/itkFileOutputWindow.h | 4 ++-- .../Common/include/itkGaussianDerivativeOperator.h | 2 +- .../Core/Common/include/itkGaussianSpatialFunction.h | 2 +- Modules/Core/Common/include/itkImageSource.h | 2 +- .../Core/Common/include/itkImportImageContainer.h | 2 +- Modules/Core/Common/include/itkInPlaceImageFilter.h | 2 +- Modules/Core/Common/include/itkLightProcessObject.h | 2 +- Modules/Core/Common/include/itkOutputWindow.h | 2 +- Modules/Core/Common/include/itkProcessObject.h | 6 +++--- ...apedFloodFilledFunctionConditionalConstIterator.h | 2 +- .../include/itkFiniteDifferenceImageFilter.h | 4 ++-- .../GPUCommon/include/itkGPUImageToImageFilter.h | 2 +- .../include/itkBSplineInterpolateImageFunction.h | 2 +- .../include/itkCentralDifferenceImageFunction.h | 2 +- .../include/itkGaussianBlurImageFunction.h | 2 +- .../include/itkGaussianDerivativeImageFunction.h | 2 +- .../Mesh/include/itkImageToParametricSpaceFilter.h | 2 +- .../SpatialObjects/include/itkContourSpatialObject.h | 2 +- .../include/itkImageMaskSpatialObject.h | 2 +- .../SpatialObjects/include/itkMetaConverterBase.h | 2 +- .../SpatialObjects/include/itkMetaSceneConverter.h | 4 ++-- .../SpatialObjects/include/itkPolygonSpatialObject.h | 2 +- .../include/itkSpatialObjectToImageFilter.h | 2 +- .../SpatialObjects/include/itkTubeSpatialObject.h | 4 ++-- .../include/itkPipelineMonitorImageFilter.h | 2 +- .../include/itkTestingComparisonImageFilter.h | 4 ++-- .../include/itkMRIBiasFieldCorrectionFilter.h | 10 +++++----- .../include/itkN4BiasFieldCorrectionImageFilter.h | 2 +- .../itkBinaryClosingByReconstructionImageFilter.h | 2 +- .../itkBinaryMorphologicalClosingImageFilter.h | 2 +- .../include/itkBinaryMorphologyImageFilter.h | 2 +- .../itkBinaryOpeningByReconstructionImageFilter.h | 2 +- .../include/itkScalarToRGBColormapImageFilter.h | 2 +- .../include/itkConvolutionImageFilterBase.h | 2 +- .../include/itkPatchBasedDenoisingBaseImageFilter.h | 6 +++--- .../include/itkPatchBasedDenoisingImageFilter.h | 6 +++--- ...lineSmoothingOnUpdateDisplacementFieldTransform.h | 2 +- .../include/itkConstantVelocityFieldTransform.h | 2 +- .../itkDisplacementFieldJacobianDeterminantFilter.h | 2 +- .../itkDisplacementFieldToBSplineImageFilter.h | 6 +++--- .../itkExponentialDisplacementFieldImageFilter.h | 4 ++-- .../include/itkInvertDisplacementFieldImageFilter.h | 2 +- ...kTimeVaryingVelocityFieldIntegrationImageFilter.h | 2 +- .../include/itkTransformToDisplacementFieldFilter.h | 2 +- .../itkContourDirectedMeanDistanceImageFilter.h | 2 +- .../include/itkContourMeanDistanceImageFilter.h | 2 +- .../include/itkDanielssonDistanceMapImageFilter.h | 6 +++--- .../itkDirectedHausdorffDistanceImageFilter.h | 2 +- .../include/itkIsoContourDistanceImageFilter.h | 2 +- .../itkSignedDanielssonDistanceMapImageFilter.h | 6 +++--- .../include/itkSignedMaurerDistanceMapImageFilter.h | 6 +++--- .../Filtering/FFT/include/itkFFTShiftImageFilter.h | 2 +- .../itkHalfHermitianToRealInverseFFTImageFilter.h | 2 +- .../FFT/include/itkHalfToFullHermitianImageFilter.h | 2 +- .../FastMarching/include/itkFastMarchingBase.h | 2 +- .../include/itkFastMarchingImageFilter.h | 4 ++-- .../include/itkFastMarchingImageFilterBase.h | 2 +- .../itkFastMarchingImageToNodePairContainerAdaptor.h | 2 +- .../itkFastMarchingUpwindGradientImageFilter.h | 2 +- .../ImageFeature/include/itkBilateralImageFilter.h | 2 +- .../ImageFeature/include/itkDerivativeImageFilter.h | 2 +- .../itkDiscreteGaussianDerivativeImageFilter.h | 4 ++-- .../include/itkHessianRecursiveGaussianImageFilter.h | 2 +- .../itkHessianToObjectnessMeasureImageFilter.h | 4 ++-- .../ImageFeature/include/itkLaplacianImageFilter.h | 2 +- .../include/itkLaplacianSharpeningImageFilter.h | 2 +- .../include/itkMaskFeaturePointSelectionFilter.h | 2 +- .../itkMultiScaleHessianBasedMeasureImageFilter.h | 6 +++--- .../ImageFeature/include/itkUnsharpMaskImageFilter.h | 2 +- .../include/itkMaskNeighborhoodOperatorImageFilter.h | 2 +- .../include/itkFrequencyBandImageFilter.h | 12 ++++++------ ...uencyFFTLayoutImageRegionConstIteratorWithIndex.h | 2 +- ...itianFFTLayoutImageRegionConstIteratorWithIndex.h | 2 +- ...iftedFFTLayoutImageRegionConstIteratorWithIndex.h | 2 +- .../include/itkUnaryFrequencyDomainFilter.h | 2 +- .../ImageGradient/include/itkGradientImageFilter.h | 4 ++-- .../include/itkGradientMagnitudeImageFilter.h | 2 +- ...tkGradientMagnitudeRecursiveGaussianImageFilter.h | 2 +- .../itkGradientRecursiveGaussianImageFilter.h | 2 +- .../include/itkVectorGradientMagnitudeImageFilter.h | 4 ++-- .../itkBSplineScatteredDataPointSetToImageFilter.h | 2 +- .../include/itkChangeInformationImageFilter.h | 12 ++++++------ .../Filtering/ImageGrid/include/itkFlipImageFilter.h | 2 +- .../ImageGrid/include/itkOrientImageFilter.h | 2 +- .../ImageGrid/include/itkResampleImageFilter.h | 2 +- .../include/itkHistogramMatchingImageFilter.h | 4 ++-- .../ImageLabel/include/itkBinaryContourImageFilter.h | 2 +- .../ImageLabel/include/itkLabelContourImageFilter.h | 2 +- .../ImageSources/include/itkGaborImageSource.h | 2 +- .../ImageSources/include/itkGaborKernelFunction.h | 2 +- .../ImageSources/include/itkGaussianImageSource.h | 2 +- .../ImageSources/include/itkGenerateImageSource.h | 2 +- .../include/itkAccumulateImageFilter.h | 2 +- .../itkAdaptiveHistogramEqualizationImageFilter.h | 2 +- .../include/itkLabelStatisticsImageFilter.h | 2 +- .../include/itkAttributeKeepNObjectsLabelMapFilter.h | 2 +- .../include/itkAttributeOpeningLabelMapFilter.h | 2 +- .../include/itkAttributeRelabelLabelMapFilter.h | 2 +- .../include/itkAttributeSelectionLabelMapFilter.h | 2 +- .../include/itkAttributeUniqueLabelMapFilter.h | 2 +- .../LabelMap/include/itkBinaryFillholeImageFilter.h | 2 +- .../LabelMap/include/itkBinaryGrindPeakImageFilter.h | 2 +- .../include/itkBinaryImageToLabelMapFilter.h | 2 +- .../include/itkBinaryImageToShapeLabelMapFilter.h | 8 ++++---- .../itkBinaryImageToStatisticsLabelMapFilter.h | 8 ++++---- .../itkBinaryReconstructionByDilationImageFilter.h | 2 +- .../itkBinaryReconstructionByErosionImageFilter.h | 2 +- .../include/itkBinaryShapeKeepNObjectsImageFilter.h | 4 ++-- .../include/itkBinaryShapeOpeningImageFilter.h | 4 ++-- .../itkBinaryStatisticsKeepNObjectsImageFilter.h | 4 ++-- .../include/itkBinaryStatisticsOpeningImageFilter.h | 4 ++-- .../LabelMap/include/itkInPlaceLabelMapFilter.h | 2 +- .../include/itkLabelImageToShapeLabelMapFilter.h | 6 +++--- .../itkLabelImageToStatisticsLabelMapFilter.h | 6 +++--- .../LabelMap/include/itkLabelMapMaskImageFilter.h | 4 ++-- .../include/itkLabelShapeKeepNObjectsImageFilter.h | 2 +- .../include/itkLabelShapeOpeningImageFilter.h | 2 +- .../itkLabelStatisticsKeepNObjectsImageFilter.h | 2 +- .../include/itkLabelStatisticsOpeningImageFilter.h | 2 +- .../include/itkObjectByObjectLabelMapFilter.h | 6 +++--- .../include/itkShapeKeepNObjectsLabelMapFilter.h | 2 +- .../LabelMap/include/itkShapeLabelMapFilter.h | 6 +++--- .../LabelMap/include/itkShapeOpeningLabelMapFilter.h | 2 +- .../LabelMap/include/itkShapeRelabelImageFilter.h | 2 +- .../LabelMap/include/itkShapeRelabelLabelMapFilter.h | 2 +- .../LabelMap/include/itkShapeUniqueLabelMapFilter.h | 2 +- .../LabelMap/include/itkShiftScaleLabelMapFilter.h | 2 +- .../LabelMap/include/itkStatisticsLabelMapFilter.h | 2 +- .../include/itkStatisticsRelabelImageFilter.h | 2 +- .../include/itkBlackTopHatImageFilter.h | 4 ++-- .../include/itkClosingByReconstructionImageFilter.h | 4 ++-- .../include/itkDoubleThresholdImageFilter.h | 2 +- .../include/itkFlatStructuringElement.h | 2 +- .../itkGrayscaleConnectedClosingImageFilter.h | 2 +- .../itkGrayscaleConnectedOpeningImageFilter.h | 2 +- .../include/itkGrayscaleFillholeImageFilter.h | 2 +- .../include/itkGrayscaleGeodesicDilateImageFilter.h | 4 ++-- .../include/itkGrayscaleGeodesicErodeImageFilter.h | 4 ++-- .../include/itkGrayscaleGrindPeakImageFilter.h | 2 +- .../itkGrayscaleMorphologicalClosingImageFilter.h | 2 +- .../itkGrayscaleMorphologicalOpeningImageFilter.h | 2 +- .../include/itkHConcaveImageFilter.h | 2 +- .../include/itkHConvexImageFilter.h | 2 +- .../include/itkHMaximaImageFilter.h | 2 +- .../include/itkHMinimaImageFilter.h | 2 +- .../include/itkMaskedMovingHistogramImageFilter.h | 2 +- .../include/itkOpeningByReconstructionImageFilter.h | 4 ++-- .../include/itkReconstructionImageFilter.h | 4 ++-- .../include/itkRegionalMaximaImageFilter.h | 4 ++-- .../include/itkRegionalMinimaImageFilter.h | 4 ++-- .../include/itkValuedRegionalExtremaImageFilter.h | 2 +- .../include/itkWhiteTopHatImageFilter.h | 4 ++-- .../Path/include/itkContourExtractor2DImageFilter.h | 6 +++--- .../Path/include/itkPathToChainCodePathFilter.h | 2 +- .../include/itkQuadEdgeMeshDecimationCriteria.h | 2 +- .../include/itkSmoothingQuadEdgeMeshFilter.h | 2 +- .../include/itkDiscreteGaussianImageFilter.h | 2 +- .../include/itkRecursiveGaussianImageFilter.h | 2 +- .../itkSmoothingRecursiveGaussianImageFilter.h | 2 +- .../include/itkHistogramThresholdImageFilter.h | 4 ++-- .../include/itkIntermodesThresholdCalculator.h | 2 +- .../include/itkIntermodesThresholdImageFilter.h | 2 +- .../include/itkOtsuMultipleThresholdsCalculator.h | 2 +- .../include/itkOtsuMultipleThresholdsImageFilter.h | 4 ++-- .../include/itkOtsuThresholdCalculator.h | 2 +- .../include/itkOtsuThresholdImageFilter.h | 2 +- Modules/IO/CSV/include/itkCSVArray2DDataObject.h | 4 ++-- Modules/IO/CSV/include/itkCSVFileReaderBase.h | 6 +++--- Modules/IO/DCMTK/include/itkDCMTKSeriesFileNames.h | 6 +++--- Modules/IO/GDCM/include/itkGDCMImageIO.h | 6 +++--- Modules/IO/GDCM/include/itkGDCMSeriesFileNames.h | 6 +++--- Modules/IO/ImageBase/include/itkImageFileReader.h | 2 +- Modules/IO/ImageBase/include/itkImageFileWriter.h | 4 ++-- Modules/IO/ImageBase/include/itkImageIOBase.h | 10 +++++----- Modules/IO/ImageBase/include/itkImageSeriesReader.h | 8 ++++---- Modules/IO/ImageBase/include/itkImageSeriesWriter.h | 2 +- .../include/itkRegularExpressionSeriesFileNames.h | 2 +- Modules/IO/JPEG/include/itkJPEGImageIO.h | 4 ++-- Modules/IO/MeshBase/include/itkMeshFileWriter.h | 2 +- Modules/IO/MeshBase/include/itkMeshIOBase.h | 10 +++++----- Modules/IO/MeshGifti/include/itkGiftiMeshIO.h | 2 +- Modules/IO/Meta/include/itkMetaArrayWriter.h | 2 +- Modules/IO/NIFTI/include/itkNiftiImageIO.h | 6 +++--- .../SpatialObjects/include/itkSpatialObjectWriter.h | 4 ++-- .../TransformBase/include/itkTransformFileWriter.h | 4 ++-- .../IO/TransformBase/include/itkTransformIOBase.h | 4 ++-- .../Review/include/itkAreaClosingImageFilter.h | 2 +- .../Review/include/itkAreaOpeningImageFilter.h | 2 +- .../include/itkAttributeMorphologyBaseImageFilter.h | 2 +- .../itkDiscreteGaussianDerivativeImageFunction.h | 4 ++-- ...kDiscreteGradientMagnitudeGaussianImageFunction.h | 4 ++-- .../itkDiscreteHessianGaussianImageFunction.h | 4 ++-- .../Review/include/itkLabelGeometryImageFilter.h | 8 ++++---- .../itkMultiphaseFiniteDifferenceImageFilter.h | 6 +++--- .../itkMultiphaseSparseFiniteDifferenceImageFilter.h | 2 +- .../Review/include/itkWarpHarmonicEnergyCalculator.h | 2 +- .../Numerics/Optimizers/include/itkAmoebaOptimizer.h | 4 ++-- .../include/itkCumulativeGaussianOptimizer.h | 2 +- .../Numerics/Optimizers/include/itkFRPROptimizer.h | 2 +- .../Optimizers/include/itkGradientDescentOptimizer.h | 2 +- .../Numerics/Optimizers/include/itkLBFGSBOptimizer.h | 2 +- .../Numerics/Optimizers/include/itkLBFGSOptimizer.h | 2 +- .../include/itkOnePlusOneEvolutionaryOptimizer.h | 2 +- .../include/itkParticleSwarmOptimizerBase.h | 6 +++--- .../Numerics/Optimizers/include/itkPowellOptimizer.h | 2 +- .../itkRegularStepGradientDescentBaseOptimizer.h | 2 +- .../Numerics/Optimizers/include/itkSPSAOptimizer.h | 2 +- .../include/itkSingleValuedNonLinearVnlOptimizer.h | 2 +- .../Optimizersv4/include/itkAmoebaOptimizerv4.h | 4 ++-- .../include/itkCommandIterationUpdatev4.h | 2 +- .../include/itkGradientDescentOptimizerv4.h | 6 +++--- .../Optimizersv4/include/itkLBFGS2Optimizerv4.h | 2 +- .../Optimizersv4/include/itkLBFGSOptimizerBasev4.h | 2 +- .../include/itkObjectToObjectOptimizerBase.h | 2 +- .../include/itkOnePlusOneEvolutionaryOptimizerv4.h | 2 +- .../Optimizersv4/include/itkPowellOptimizerv4.h | 2 +- .../itkRegistrationParameterScalesEstimator.h | 2 +- Modules/Numerics/Statistics/include/itkHistogram.h | 2 +- .../Statistics/include/itkImageToHistogramFilter.h | 2 +- .../include/itkImageToNeighborhoodSampleAdaptor.h | 2 +- .../include/itkJointDomainImageToListSampleAdaptor.h | 2 +- .../include/itkKdTreeBasedKmeansEstimator.h | 2 +- .../itkScalarImageToCooccurrenceMatrixFilter.h | 2 +- .../include/itkScalarImageToTextureFeaturesFilter.h | 2 +- .../Numerics/Statistics/include/itkSubsamplerBase.h | 2 +- .../itkUniformRandomSpatialNeighborSubsampler.h | 2 +- .../include/itkCenteredVersorTransformInitializer.h | 2 +- .../Common/include/itkEuclideanDistancePointMetric.h | 2 +- .../Common/include/itkImageToImageMetric.h | 4 ++-- .../include/itkKappaStatisticImageToImageMetric.h | 2 +- .../include/itkMatchCardinalityImageToImageMetric.h | 2 +- .../itkMattesMutualInformationImageToImageMetric.h | 2 +- .../include/itkMultiResolutionPyramidImageFilter.h | 2 +- .../itkNormalizedCorrelationImageToImageMetric.h | 2 +- .../itkNormalizedCorrelationPointSetToImageMetric.h | 2 +- .../FEM/include/itkFEMRegistrationFilter.h | 8 ++++---- .../Metricsv4/include/itkImageToImageMetricv4.h | 10 +++++----- ...nHavrdaCharvatTsallisPointSetToPointSetMetricv4.h | 2 +- .../itkManifoldParzenWindowsPointSetFunction.h | 4 ++-- .../include/itkPointSetToPointSetMetricWithIndexv4.h | 4 ++-- .../include/itkDemonsRegistrationFilter.h | 2 +- .../itkDiffeomorphicDemonsRegistrationFilter.h | 2 +- .../include/itkPDEDeformableRegistrationFilter.h | 4 ++-- .../include/itkImageRegistrationMethodv4.h | 6 +++--- .../include/itkScalarImageKmeansImageFilter.h | 2 +- .../include/itkConnectedComponentImageFilter.h | 2 +- .../include/itkRelabelComponentImageFilter.h | 2 +- .../include/itkCollidingFrontsImageFilter.h | 4 ++-- .../include/itkLevelSetNeighborhoodExtractor.h | 2 +- .../include/itkNarrowBandLevelSetImageFilter.h | 2 +- .../include/itkReinitializeLevelSetImageFilter.h | 2 +- .../include/itkSegmentationLevelSetImageFilter.h | 4 ++-- .../itkSparseFieldFourthOrderLevelSetImageFilter.h | 2 +- .../include/itkLevelSetEquationCurvatureTerm.h | 2 +- .../include/itkIsolatedConnectedImageFilter.h | 2 +- .../SuperPixel/include/itkSLICImageFilter.h | 4 ++-- .../include/itkVoronoiSegmentationImageFilterBase.h | 2 +- ...itkMorphologicalWatershedFromMarkersImageFilter.h | 4 ++-- .../include/itkMorphologicalWatershedImageFilter.h | 4 ++-- Modules/Video/IO/include/itkVideoFileReader.h | 2 +- 264 files changed, 397 insertions(+), 396 deletions(-) diff --git a/.clang-format b/.clang-format index 69950423abc..54f3a797c3f 100644 --- a/.clang-format +++ b/.clang-format @@ -155,6 +155,7 @@ StatementMacros: - INTEL_PRAGMA_WARN_PUSH - INTEL_PRAGMA_WARN_POP - INTEL_SUPPRESS_warning_1292 + - itkBooleanMacro TabWidth: 2 UseTab: Never ... diff --git a/Modules/Compatibility/Deprecated/include/itkVectorCentralDifferenceImageFunction.h b/Modules/Compatibility/Deprecated/include/itkVectorCentralDifferenceImageFunction.h index 728c822de14..d4e03886b6e 100644 --- a/Modules/Compatibility/Deprecated/include/itkVectorCentralDifferenceImageFunction.h +++ b/Modules/Compatibility/Deprecated/include/itkVectorCentralDifferenceImageFunction.h @@ -136,7 +136,7 @@ class ITK_TEMPLATE_EXPORT VectorCentralDifferenceImageFunction */ itkSetMacro(UseImageDirection, bool); itkGetConstMacro(UseImageDirection, bool); - itkBooleanMacro(UseImageDirection); + itkBooleanMacro(UseImageDirection) protected: VectorCentralDifferenceImageFunction(); diff --git a/Modules/Core/Common/include/itkConicShellInteriorExteriorSpatialFunction.h b/Modules/Core/Common/include/itkConicShellInteriorExteriorSpatialFunction.h index 07b79d5248b..f845ffa4ec2 100644 --- a/Modules/Core/Common/include/itkConicShellInteriorExteriorSpatialFunction.h +++ b/Modules/Core/Common/include/itkConicShellInteriorExteriorSpatialFunction.h @@ -118,7 +118,7 @@ class ITK_TEMPLATE_EXPORT ConicShellInteriorExteriorSpatialFunction * set to false for the opposite direction. */ itkGetConstMacro(Polarity, bool); itkSetMacro(Polarity, bool); - itkBooleanMacro(Polarity); + itkBooleanMacro(Polarity) protected: ConicShellInteriorExteriorSpatialFunction() = default; diff --git a/Modules/Core/Common/include/itkDataObject.h b/Modules/Core/Common/include/itkDataObject.h index 6a2504c9196..87e4ddae164 100644 --- a/Modules/Core/Common/include/itkDataObject.h +++ b/Modules/Core/Common/include/itkDataObject.h @@ -351,7 +351,7 @@ class ITK_FORCE_EXPORT_MACRO(ITKCommon) DataObject : public Object } itkGetConstReferenceMacro(ReleaseDataFlag, bool); - itkBooleanMacro(ReleaseDataFlag); + itkBooleanMacro(ReleaseDataFlag) /** Turn on/off a flag to control whether every object releases its data * after being used by a filter. Being a global flag, it controls the diff --git a/Modules/Core/Common/include/itkFileOutputWindow.h b/Modules/Core/Common/include/itkFileOutputWindow.h index f2e94506459..8134ffd7dbf 100644 --- a/Modules/Core/Common/include/itkFileOutputWindow.h +++ b/Modules/Core/Common/include/itkFileOutputWindow.h @@ -69,7 +69,7 @@ class ITKCommon_EXPORT FileOutputWindow : public OutputWindow /** Set/Get the buffer flushing mode */ itkSetMacro(Flush, bool); itkGetConstMacro(Flush, bool); - itkBooleanMacro(Flush); + itkBooleanMacro(Flush) /** Setting append will cause the log file to be * opened in append mode. Otherwise, if the log file exists, @@ -77,7 +77,7 @@ class ITKCommon_EXPORT FileOutputWindow : public OutputWindow * is created. */ itkSetMacro(Append, bool); itkGetConstMacro(Append, bool); - itkBooleanMacro(Append); + itkBooleanMacro(Append) protected: FileOutputWindow(); diff --git a/Modules/Core/Common/include/itkGaussianDerivativeOperator.h b/Modules/Core/Common/include/itkGaussianDerivativeOperator.h index aeb72cca467..97fa2e21fc0 100644 --- a/Modules/Core/Common/include/itkGaussianDerivativeOperator.h +++ b/Modules/Core/Common/include/itkGaussianDerivativeOperator.h @@ -136,7 +136,7 @@ class ITK_TEMPLATE_EXPORT GaussianDerivativeOperator : public NeighborhoodOperat { return m_NormalizeAcrossScale; } - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set/Get the variance of the Gaussian kernel. * diff --git a/Modules/Core/Common/include/itkGaussianSpatialFunction.h b/Modules/Core/Common/include/itkGaussianSpatialFunction.h index 94965a76413..bd80f3f594b 100644 --- a/Modules/Core/Common/include/itkGaussianSpatialFunction.h +++ b/Modules/Core/Common/include/itkGaussianSpatialFunction.h @@ -78,7 +78,7 @@ class ITK_TEMPLATE_EXPORT GaussianSpatialFunction : public SpatialFunctionRecomputeGaussianKernel(); } } - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) itkGetMacro(UseImageSpacing, bool); /** The variance for the discrete Gaussian kernel. Sets the variance diff --git a/Modules/Core/Mesh/include/itkImageToParametricSpaceFilter.h b/Modules/Core/Mesh/include/itkImageToParametricSpaceFilter.h index 6d46715db81..993840f6afd 100644 --- a/Modules/Core/Mesh/include/itkImageToParametricSpaceFilter.h +++ b/Modules/Core/Mesh/include/itkImageToParametricSpaceFilter.h @@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT ImageToParametricSpaceFilter : public ImageToMeshFilte * an operator=(). Default value = true */ itkSetMacro(ComputeIndices, bool); itkGetConstMacro(ComputeIndices, bool); - itkBooleanMacro(ComputeIndices); + itkBooleanMacro(ComputeIndices) protected: ImageToParametricSpaceFilter(); diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h index 4797fc5eeb0..cd4d4d84267 100644 --- a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h @@ -174,7 +174,7 @@ class ITK_TEMPLATE_EXPORT ContourSpatialObject /** Get if the contour is closed. */ itkGetConstMacro(IsClosed, bool); - itkBooleanMacro(IsClosed); + itkBooleanMacro(IsClosed) /** Get the axis-normal orientation of the contour */ int diff --git a/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h b/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h index c2a638ec5cb..8d2c79be979 100644 --- a/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h @@ -92,7 +92,7 @@ class ITK_TEMPLATE_EXPORT ImageMaskSpatialObject : public ImageSpatialObjectm_ActualXDimensionIsOdd = value; }; itkGetMacro(ActualXDimensionIsOdd, bool); - itkBooleanMacro(ActualXDimensionIsOdd); + itkBooleanMacro(ActualXDimensionIsOdd) private: /** Calculate Nyquist frequency index (m_LargestPositiveFrequencyIndex), Min/Max indices from LargestPossibleRegion. diff --git a/Modules/Filtering/ImageFrequency/include/itkFrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex.h b/Modules/Filtering/ImageFrequency/include/itkFrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex.h index 509d4115474..1e23dac7369 100644 --- a/Modules/Filtering/ImageFrequency/include/itkFrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex.h +++ b/Modules/Filtering/ImageFrequency/include/itkFrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex.h @@ -279,7 +279,7 @@ class FrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex this->m_FrequencySpacing[0] = 1.0 / (this->m_Image->GetSpacing()[0] * size_estimated); } itkGetMacro(ActualXDimensionIsOdd, bool); - itkBooleanMacro(ActualXDimensionIsOdd); + itkBooleanMacro(ActualXDimensionIsOdd) private: /** Calculate Nyquist frequency index (m_LargestPositiveFrequencyIndex), Min/Max indices from LargestPossibleRegion. diff --git a/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h b/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h index a0bec95e552..6d5b89c2772 100644 --- a/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h +++ b/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h @@ -241,7 +241,7 @@ class ITK_TEMPLATE_EXPORT FrequencyShiftedFFTLayoutImageRegionConstIteratorWithI this->m_ActualXDimensionIsOdd = value; }; itkGetMacro(ActualXDimensionIsOdd, bool); - itkBooleanMacro(ActualXDimensionIsOdd); + itkBooleanMacro(ActualXDimensionIsOdd) private: /** Calculate m_ZeroFrequencyIndex, and frequency spacing/origin. diff --git a/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h b/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h index 3f9db77d090..e272d9676bd 100644 --- a/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h +++ b/Modules/Filtering/ImageFrequency/include/itkUnaryFrequencyDomainFilter.h @@ -102,7 +102,7 @@ class ITK_TEMPLATE_EXPORT UnaryFrequencyDomainFilter : public InPlaceImageFilter * image was odd. **/ itkSetMacro(ActualXDimensionIsOdd, bool); itkGetConstReferenceMacro(ActualXDimensionIsOdd, bool); - itkBooleanMacro(ActualXDimensionIsOdd); + itkBooleanMacro(ActualXDimensionIsOdd) /** Returns factor with which the current frequency should be multiplied. */ using ConstRefFunctionType = double(const FrequencyIteratorType &); diff --git a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h index 735dfbe694f..0e60f23114e 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h +++ b/Modules/Filtering/ImageGradient/include/itkGradientImageFilter.h @@ -116,7 +116,7 @@ class ITK_TEMPLATE_EXPORT GradientImageFilter : public ImageToImageFilter itkOverrideGetNameOfClassMacro(GenerateImageSource); itkSetMacro(UseReferenceImage, bool); - itkBooleanMacro(UseReferenceImage); + itkBooleanMacro(UseReferenceImage) itkGetConstMacro(UseReferenceImage, bool); /** diff --git a/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h index 835d0c2d58b..4753c3e149e 100644 --- a/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkAccumulateImageFilter.h @@ -104,7 +104,7 @@ class ITK_TEMPLATE_EXPORT AccumulateImageFilter : public ImageToImageFilterm_MeasureBound = bound; } - itkBooleanMacro(TopologicalChange); + itkBooleanMacro(TopologicalChange) itkGetConstMacro(TopologicalChange, bool); itkSetMacro(TopologicalChange, bool); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.h index 91470ede730..20a9d495357 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.h @@ -100,7 +100,7 @@ class ITK_TEMPLATE_EXPORT SmoothingQuadEdgeMeshFilter : public QuadEdgeMeshToQua itkGetConstMacro(NumberOfIterations, unsigned int); /** Set/Get if DelaunayConformingQuadEdgeMeshFilter is used at the end of each iterations */ - itkBooleanMacro(DelaunayConforming); + itkBooleanMacro(DelaunayConforming) itkSetMacro(DelaunayConforming, bool); itkGetConstMacro(DelaunayConforming, bool); diff --git a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h index 30767ba890f..3e25bb8147c 100644 --- a/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h @@ -281,7 +281,7 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte * in voxel units. Default is On. */ itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) #if !defined(ITK_FUTURE_LEGACY_REMOVE) /** Use the image spacing information in calculations. Use this option if you diff --git a/Modules/Filtering/Smoothing/include/itkRecursiveGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkRecursiveGaussianImageFilter.h index de2de01fffd..6ccaaf022a1 100644 --- a/Modules/Filtering/Smoothing/include/itkRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkRecursiveGaussianImageFilter.h @@ -178,7 +178,7 @@ class ITK_TEMPLATE_EXPORT RecursiveGaussianImageFilter : public RecursiveSeparab */ itkSetMacro(NormalizeAcrossScale, bool); itkGetConstMacro(NormalizeAcrossScale, bool); - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set/Get the Order of the Gaussian to convolve with. \li ZeroOrder is equivalent to convolving with a Gaussian. This diff --git a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h index afc687e7ecc..0a542a7ccf2 100644 --- a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h @@ -129,7 +129,7 @@ class ITK_TEMPLATE_EXPORT SmoothingRecursiveGaussianImageFilter : public InPlace void SetNormalizeAcrossScale(bool normalize); itkGetConstMacro(NormalizeAcrossScale, bool); - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set the number of work units to create. */ void diff --git a/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h index 8e3d80bf5ae..46662454b6d 100644 --- a/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h @@ -159,14 +159,14 @@ class ITK_TEMPLATE_EXPORT HistogramThresholdImageFilter : public ImageToImageFil * Default is true for all but char types */ itkSetMacro(AutoMinimumMaximum, bool); itkGetConstMacro(AutoMinimumMaximum, bool); - itkBooleanMacro(AutoMinimumMaximum); + itkBooleanMacro(AutoMinimumMaximum) /** Do you want the output to be masked by the mask used in * histogram construction. Only relevant if masking is in * use. Default is true. */ itkSetMacro(MaskOutput, bool); itkGetConstMacro(MaskOutput, bool); - itkBooleanMacro(MaskOutput); + itkBooleanMacro(MaskOutput) /** The value in the mask image, if used, indicating voxels that should be included. Default is the max of pixel type, as in the diff --git a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.h b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.h index c0b718bf377..22fbf912d6f 100644 --- a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.h +++ b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.h @@ -83,7 +83,7 @@ class ITK_TEMPLATE_EXPORT IntermodesThresholdCalculator : public HistogramThresh peaks is used. Default is "On". */ itkSetMacro(UseInterMode, bool); itkGetConstMacro(UseInterMode, bool); - itkBooleanMacro(UseInterMode); + itkBooleanMacro(UseInterMode) protected: IntermodesThresholdCalculator() diff --git a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdImageFilter.h index 28d1e492b07..eb5ea344a7e 100644 --- a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdImageFilter.h @@ -101,7 +101,7 @@ class ITK_TEMPLATE_EXPORT IntermodesThresholdImageFilter peaks is used. */ itkSetMacro(UseInterMode, bool); itkGetConstReferenceMacro(UseInterMode, bool); - itkBooleanMacro(UseInterMode); + itkBooleanMacro(UseInterMode) /** Image related type alias. */ static constexpr unsigned int InputImageDimension = InputImageType::ImageDimension; diff --git a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.h b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.h index 887d562a40b..40d9f638667 100644 --- a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.h +++ b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.h @@ -92,7 +92,7 @@ class ITK_TEMPLATE_EXPORT OtsuMultipleThresholdsCalculator : public HistogramAlg /** Set/Get the use of valley emphasis. Default is false. */ itkSetMacro(ValleyEmphasis, bool); itkGetConstReferenceMacro(ValleyEmphasis, bool); - itkBooleanMacro(ValleyEmphasis); + itkBooleanMacro(ValleyEmphasis) /** Should the threshold value be mid-point of the bin or the maximum? * Default is to return bin maximum. */ diff --git a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h index a065df15774..4dedec57a43 100644 --- a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsImageFilter.h @@ -115,13 +115,13 @@ class ITK_TEMPLATE_EXPORT OtsuMultipleThresholdsImageFilter : public ImageToImag /** Set/Get the use of valley emphasis. Default is false. */ itkSetMacro(ValleyEmphasis, bool); itkGetConstReferenceMacro(ValleyEmphasis, bool); - itkBooleanMacro(ValleyEmphasis); + itkBooleanMacro(ValleyEmphasis) /** Should the threshold value be mid-point of the bin or the maximum? * Default is to return bin maximum. */ itkSetMacro(ReturnBinMidpoint, bool); itkGetConstReferenceMacro(ReturnBinMidpoint, bool); - itkBooleanMacro(ReturnBinMidpoint); + itkBooleanMacro(ReturnBinMidpoint) /** Get the computed threshold. */ const ThresholdVectorType & diff --git a/Modules/Filtering/Thresholding/include/itkOtsuThresholdCalculator.h b/Modules/Filtering/Thresholding/include/itkOtsuThresholdCalculator.h index 19aecbb7d50..5501507fe0a 100644 --- a/Modules/Filtering/Thresholding/include/itkOtsuThresholdCalculator.h +++ b/Modules/Filtering/Thresholding/include/itkOtsuThresholdCalculator.h @@ -67,7 +67,7 @@ class ITK_TEMPLATE_EXPORT OtsuThresholdCalculator : public HistogramThresholdCal * Default is to return bin maximum. */ itkSetMacro(ReturnBinMidpoint, bool); itkGetConstReferenceMacro(ReturnBinMidpoint, bool); - itkBooleanMacro(ReturnBinMidpoint); + itkBooleanMacro(ReturnBinMidpoint) /** for backward compatibility. Update() should be preferred. */ void diff --git a/Modules/Filtering/Thresholding/include/itkOtsuThresholdImageFilter.h b/Modules/Filtering/Thresholding/include/itkOtsuThresholdImageFilter.h index 2bbb6d3c392..a9cd1231e02 100644 --- a/Modules/Filtering/Thresholding/include/itkOtsuThresholdImageFilter.h +++ b/Modules/Filtering/Thresholding/include/itkOtsuThresholdImageFilter.h @@ -104,7 +104,7 @@ class ITK_TEMPLATE_EXPORT OtsuThresholdImageFilter * Default is to return bin maximum. */ itkSetMacro(ReturnBinMidpoint, bool); itkGetConstReferenceMacro(ReturnBinMidpoint, bool); - itkBooleanMacro(ReturnBinMidpoint); + itkBooleanMacro(ReturnBinMidpoint) protected: OtsuThresholdImageFilter() { this->SetCalculator(CalculatorType::New()); } diff --git a/Modules/IO/CSV/include/itkCSVArray2DDataObject.h b/Modules/IO/CSV/include/itkCSVArray2DDataObject.h index 9caa7ac6b1e..903e7adacec 100644 --- a/Modules/IO/CSV/include/itkCSVArray2DDataObject.h +++ b/Modules/IO/CSV/include/itkCSVArray2DDataObject.h @@ -71,8 +71,8 @@ class ITK_TEMPLATE_EXPORT CSVArray2DDataObject : public DataObject /** Set macros */ itkSetMacro(HasColumnHeaders, bool); itkSetMacro(HasRowHeaders, bool); - itkBooleanMacro(HasColumnHeaders); - itkBooleanMacro(HasRowHeaders); + itkBooleanMacro(HasColumnHeaders) + itkBooleanMacro(HasRowHeaders) /** Get macros for Column and Row headers. */ itkGetConstMacro(HasColumnHeaders, bool); diff --git a/Modules/IO/CSV/include/itkCSVFileReaderBase.h b/Modules/IO/CSV/include/itkCSVFileReaderBase.h index 3b0485e64ef..b452fb088a0 100644 --- a/Modules/IO/CSV/include/itkCSVFileReaderBase.h +++ b/Modules/IO/CSV/include/itkCSVFileReaderBase.h @@ -117,9 +117,9 @@ class ITKIOCSV_EXPORT CSVFileReaderBase : public LightProcessObject /** Boolean macros for setting HasRowHeaders, HasColumnHeaders and * UseStringDelimiterCharacter. They can conveniently be set by appending * On() or Off() to each of the variable names. */ - itkBooleanMacro(HasRowHeaders); - itkBooleanMacro(HasColumnHeaders); - itkBooleanMacro(UseStringDelimiterCharacter); + itkBooleanMacro(HasRowHeaders) + itkBooleanMacro(HasColumnHeaders) + itkBooleanMacro(UseStringDelimiterCharacter) /** Counts the number of rows and columns in a file and prepares the file * for iterative reading using the GetNextField() method. */ diff --git a/Modules/IO/DCMTK/include/itkDCMTKSeriesFileNames.h b/Modules/IO/DCMTK/include/itkDCMTKSeriesFileNames.h index d5cd66b9e16..46ba558a666 100644 --- a/Modules/IO/DCMTK/include/itkDCMTKSeriesFileNames.h +++ b/Modules/IO/DCMTK/include/itkDCMTKSeriesFileNames.h @@ -134,7 +134,7 @@ class ITKIODCMTK_EXPORT DCMTKSeriesFileNames : public ProcessObject /** Recursively parse the input directory */ itkSetMacro(Recursive, bool); itkGetConstMacro(Recursive, bool); - itkBooleanMacro(Recursive); + itkBooleanMacro(Recursive) /** Use additional series information such as ProtocolName * and SeriesName to identify when a single SeriesUID contains @@ -171,7 +171,7 @@ class ITKIODCMTK_EXPORT DCMTKSeriesFileNames : public ProcessObject */ itkSetMacro(LoadSequences, bool); itkGetConstMacro(LoadSequences, bool); - itkBooleanMacro(LoadSequences); + itkBooleanMacro(LoadSequences) /** Parse any private tags in the DICOM file. Defaults to false * to skip private tags. This makes loading DICOM files faster when @@ -179,7 +179,7 @@ class ITKIODCMTK_EXPORT DCMTKSeriesFileNames : public ProcessObject */ itkSetMacro(LoadPrivateTags, bool); itkGetConstMacro(LoadPrivateTags, bool); - itkBooleanMacro(LoadPrivateTags); + itkBooleanMacro(LoadPrivateTags) protected: DCMTKSeriesFileNames(); diff --git a/Modules/IO/GDCM/include/itkGDCMImageIO.h b/Modules/IO/GDCM/include/itkGDCMImageIO.h index d81017d2f34..ea02e77b26f 100644 --- a/Modules/IO/GDCM/include/itkGDCMImageIO.h +++ b/Modules/IO/GDCM/include/itkGDCMImageIO.h @@ -178,19 +178,19 @@ class ITKIOGDCM_EXPORT GDCMImageIO : public ImageIOBase /** Preserve the original DICOM UIDs of the input files. */ itkSetMacro(KeepOriginalUID, bool); itkGetConstMacro(KeepOriginalUID, bool); - itkBooleanMacro(KeepOriginalUID); + itkBooleanMacro(KeepOriginalUID) /** Parse and load any private tags in the DICOM file. Loading DICOM * files is faster when private tags are not needed. Default is false. */ itkSetMacro(LoadPrivateTags, bool); itkGetConstMacro(LoadPrivateTags, bool); - itkBooleanMacro(LoadPrivateTags); + itkBooleanMacro(LoadPrivateTags) /** Convert Y'CbCr (YBR_FULL, YBR_FULL_422) to RGB. Default is true, * not required for YBR_RCT and YBR_ICT. */ itkSetMacro(ReadYBRtoRGB, bool); itkGetConstMacro(ReadYBRtoRGB, bool); - itkBooleanMacro(ReadYBRtoRGB); + itkBooleanMacro(ReadYBRtoRGB) #if defined(ITKIO_DEPRECATED_GDCM1_API) /** Convenience methods to query patient information and scanner diff --git a/Modules/IO/GDCM/include/itkGDCMSeriesFileNames.h b/Modules/IO/GDCM/include/itkGDCMSeriesFileNames.h index 0e5200204af..8b6a23795c7 100644 --- a/Modules/IO/GDCM/include/itkGDCMSeriesFileNames.h +++ b/Modules/IO/GDCM/include/itkGDCMSeriesFileNames.h @@ -141,7 +141,7 @@ class ITKIOGDCM_EXPORT GDCMSeriesFileNames : public ProcessObject * Must be set before the call to SetInputDirectory(). */ itkSetMacro(Recursive, bool); itkGetConstMacro(Recursive, bool); - itkBooleanMacro(Recursive); + itkBooleanMacro(Recursive) /** Use additional series information such as ProtocolName * and SeriesName to identify when a single SeriesUID contains @@ -175,7 +175,7 @@ class ITKIOGDCM_EXPORT GDCMSeriesFileNames : public ProcessObject */ itkSetMacro(LoadSequences, bool); itkGetConstMacro(LoadSequences, bool); - itkBooleanMacro(LoadSequences); + itkBooleanMacro(LoadSequences) /** Parse any private tags in the DICOM file. Defaults to false * to skip private tags. This makes loading DICOM files faster when @@ -183,7 +183,7 @@ class ITKIOGDCM_EXPORT GDCMSeriesFileNames : public ProcessObject */ itkSetMacro(LoadPrivateTags, bool); itkGetConstMacro(LoadPrivateTags, bool); - itkBooleanMacro(LoadPrivateTags); + itkBooleanMacro(LoadPrivateTags) protected: GDCMSeriesFileNames(); diff --git a/Modules/IO/ImageBase/include/itkImageFileReader.h b/Modules/IO/ImageBase/include/itkImageFileReader.h index 5c7d4db5277..4e7b5416df9 100644 --- a/Modules/IO/ImageBase/include/itkImageFileReader.h +++ b/Modules/IO/ImageBase/include/itkImageFileReader.h @@ -116,7 +116,7 @@ class ITK_TEMPLATE_EXPORT ImageFileReader : public ImageSource /** Set the stream On or Off */ itkSetMacro(UseStreaming, bool); itkGetConstReferenceMacro(UseStreaming, bool); - itkBooleanMacro(UseStreaming); + itkBooleanMacro(UseStreaming) protected: ImageFileReader(); diff --git a/Modules/IO/ImageBase/include/itkImageFileWriter.h b/Modules/IO/ImageBase/include/itkImageFileWriter.h index 7cecf9ca096..3494e02f386 100644 --- a/Modules/IO/ImageBase/include/itkImageFileWriter.h +++ b/Modules/IO/ImageBase/include/itkImageFileWriter.h @@ -201,7 +201,7 @@ class ITK_TEMPLATE_EXPORT ImageFileWriter : public ProcessObject /** Set the compression On or Off */ itkSetMacro(UseCompression, bool); itkGetConstReferenceMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) /** Set the compression level. \sa ImageIOBase for details. * Set to a negative number to use ImageIO's default compression level. */ @@ -216,7 +216,7 @@ class ITK_TEMPLATE_EXPORT ImageFileWriter : public ProcessObject * the ImageIO object. */ itkSetMacro(UseInputMetaDataDictionary, bool); itkGetConstReferenceMacro(UseInputMetaDataDictionary, bool); - itkBooleanMacro(UseInputMetaDataDictionary); + itkBooleanMacro(UseInputMetaDataDictionary) protected: ImageFileWriter() = default; diff --git a/Modules/IO/ImageBase/include/itkImageIOBase.h b/Modules/IO/ImageBase/include/itkImageIOBase.h index 0a84d4a4ff3..ca7569c8e2d 100644 --- a/Modules/IO/ImageBase/include/itkImageIOBase.h +++ b/Modules/IO/ImageBase/include/itkImageIOBase.h @@ -258,7 +258,7 @@ class ITKIOImageBase_EXPORT ImageIOBase : public LightProcessObject /** Set/Get a boolean to use the compression or not. */ itkSetMacro(UseCompression, bool); itkGetConstMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) /** \brief Set/Get a compression level hint * @@ -286,12 +286,12 @@ class ITKIOImageBase_EXPORT ImageIOBase : public LightProcessObject /** Set/Get a boolean to use streaming while reading or not. */ itkSetMacro(UseStreamedReading, bool); itkGetConstMacro(UseStreamedReading, bool); - itkBooleanMacro(UseStreamedReading); + itkBooleanMacro(UseStreamedReading) /** Set/Get a boolean to use streaming while writing or not. */ itkSetMacro(UseStreamedWriting, bool); itkGetConstMacro(UseStreamedWriting, bool); - itkBooleanMacro(UseStreamedWriting); + itkBooleanMacro(UseStreamedWriting) /** Set/Get a boolean to perform RGB palette expansion. * If true, palette image is read as RGB, @@ -299,13 +299,13 @@ class ITKIOImageBase_EXPORT ImageIOBase : public LightProcessObject * A RGB image is always read as RGB.*/ itkSetMacro(ExpandRGBPalette, bool); itkGetConstMacro(ExpandRGBPalette, bool); - itkBooleanMacro(ExpandRGBPalette); + itkBooleanMacro(ExpandRGBPalette) /** Set/Get a boolean to include a color palette while writing * the image file. Applies only for scalar Pixels*/ itkSetMacro(WritePalette, bool); itkGetConstMacro(WritePalette, bool); - itkBooleanMacro(WritePalette); + itkBooleanMacro(WritePalette) /** Determine whether a palletized image file has been read as a scalar image * plus a color palette. diff --git a/Modules/IO/ImageBase/include/itkImageSeriesReader.h b/Modules/IO/ImageBase/include/itkImageSeriesReader.h index 676f1f384e3..f0bd9b3012e 100644 --- a/Modules/IO/ImageBase/include/itkImageSeriesReader.h +++ b/Modules/IO/ImageBase/include/itkImageSeriesReader.h @@ -118,13 +118,13 @@ class ITK_TEMPLATE_EXPORT ImageSeriesReader : public ImageSource * from last to first */ itkSetMacro(ReverseOrder, bool); itkGetConstMacro(ReverseOrder, bool); - itkBooleanMacro(ReverseOrder); + itkBooleanMacro(ReverseOrder) /** Do we want to force orthogonal direction cosines? On by default. * Turning it off enables proper reading of DICOM series with gantry tilt. */ itkSetMacro(ForceOrthogonalDirection, bool); itkGetConstMacro(ForceOrthogonalDirection, bool); - itkBooleanMacro(ForceOrthogonalDirection); + itkBooleanMacro(ForceOrthogonalDirection) /** Set/Get the ImageIO helper class. By default, the * ImageSeriesReader uses the factory mechanism of the @@ -144,7 +144,7 @@ class ITK_TEMPLATE_EXPORT ImageSeriesReader : public ImageSource */ itkSetMacro(MetaDataDictionaryArrayUpdate, bool); itkGetConstMacro(MetaDataDictionaryArrayUpdate, bool); - itkBooleanMacro(MetaDataDictionaryArrayUpdate); + itkBooleanMacro(MetaDataDictionaryArrayUpdate) /** Prepare the allocation of the output image during the first back * propagation of the pipeline. */ @@ -167,7 +167,7 @@ class ITK_TEMPLATE_EXPORT ImageSeriesReader : public ImageSource /** Set the stream On or Off */ itkSetMacro(UseStreaming, bool); itkGetConstReferenceMacro(UseStreaming, bool); - itkBooleanMacro(UseStreaming); + itkBooleanMacro(UseStreaming) /** Set the relative threshold for issuing warnings about non-uniform sampling */ itkSetMacro(SpacingWarningRelThreshold, double); diff --git a/Modules/IO/ImageBase/include/itkImageSeriesWriter.h b/Modules/IO/ImageBase/include/itkImageSeriesWriter.h index ce81b62b3b2..23ab21c2cca 100644 --- a/Modules/IO/ImageBase/include/itkImageSeriesWriter.h +++ b/Modules/IO/ImageBase/include/itkImageSeriesWriter.h @@ -208,7 +208,7 @@ class ITK_TEMPLATE_EXPORT ImageSeriesWriter : public ProcessObject /** Set the compression On or Off */ itkSetMacro(UseCompression, bool); itkGetConstReferenceMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) protected: ImageSeriesWriter(); diff --git a/Modules/IO/ImageBase/include/itkRegularExpressionSeriesFileNames.h b/Modules/IO/ImageBase/include/itkRegularExpressionSeriesFileNames.h index 25682b67b03..a5e237884e7 100644 --- a/Modules/IO/ImageBase/include/itkRegularExpressionSeriesFileNames.h +++ b/Modules/IO/ImageBase/include/itkRegularExpressionSeriesFileNames.h @@ -103,7 +103,7 @@ class ITKIOImageBase_EXPORT RegularExpressionSeriesFileNames : public Object * submatch alphabetically. */ itkSetMacro(NumericSort, bool); itkGetConstMacro(NumericSort, bool); - itkBooleanMacro(NumericSort); + itkBooleanMacro(NumericSort) /** Returns a vector containing the series' file names. The file * names are sorted by the sub expression selected by the SubMatch id. */ diff --git a/Modules/IO/JPEG/include/itkJPEGImageIO.h b/Modules/IO/JPEG/include/itkJPEGImageIO.h index c836e831f40..5bb3921d14f 100644 --- a/Modules/IO/JPEG/include/itkJPEGImageIO.h +++ b/Modules/IO/JPEG/include/itkJPEGImageIO.h @@ -67,12 +67,12 @@ class ITKIOJPEG_EXPORT JPEGImageIO : public ImageIOBase /** */ itkSetMacro(Progressive, bool); itkGetConstMacro(Progressive, bool); - itkBooleanMacro(Progressive); + itkBooleanMacro(Progressive) /** Convert to RGB if out_color_space is CMYK, default is true */ itkSetMacro(CMYKtoRGB, bool); itkGetConstMacro(CMYKtoRGB, bool); - itkBooleanMacro(CMYKtoRGB); + itkBooleanMacro(CMYKtoRGB) /*-------- This part of the interface deals with reading data. ------ */ diff --git a/Modules/IO/MeshBase/include/itkMeshFileWriter.h b/Modules/IO/MeshBase/include/itkMeshFileWriter.h index eacb8fbb893..ea2ebc1ab1b 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileWriter.h +++ b/Modules/IO/MeshBase/include/itkMeshFileWriter.h @@ -139,7 +139,7 @@ class ITK_TEMPLATE_EXPORT MeshFileWriter : public ProcessObject /** Set the compression On or Off */ itkSetMacro(UseCompression, bool); itkGetConstReferenceMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) protected: MeshFileWriter(); diff --git a/Modules/IO/MeshBase/include/itkMeshIOBase.h b/Modules/IO/MeshBase/include/itkMeshIOBase.h index a162993aa9d..489ab94e8d1 100644 --- a/Modules/IO/MeshBase/include/itkMeshIOBase.h +++ b/Modules/IO/MeshBase/include/itkMeshIOBase.h @@ -459,16 +459,16 @@ class ITKIOMeshBase_EXPORT MeshIOBase : public LightProcessObject itkGetConstMacro(CellBufferSize, SizeValueType); itkSetMacro(UpdatePoints, bool); itkGetConstMacro(UpdatePoints, bool); - itkBooleanMacro(UpdatePoints); + itkBooleanMacro(UpdatePoints) itkSetMacro(UpdateCells, bool); itkGetConstMacro(UpdateCells, bool); - itkBooleanMacro(UpdateCells); + itkBooleanMacro(UpdateCells) itkSetMacro(UpdatePointData, bool); itkGetConstMacro(UpdatePointData, bool); - itkBooleanMacro(UpdatePointData); + itkBooleanMacro(UpdatePointData) itkSetMacro(UpdateCellData, bool); itkGetConstMacro(UpdateCellData, bool); - itkBooleanMacro(UpdateCellData); + itkBooleanMacro(UpdateCellData) unsigned int GetComponentSize(IOComponentEnum componentType) const; @@ -527,7 +527,7 @@ class ITKIOMeshBase_EXPORT MeshIOBase : public LightProcessObject /** Set/Get a boolean to use the compression or not. */ itkSetMacro(UseCompression, bool); itkGetConstMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) /** Convenience method returns the IOFileEnum as a string. This can be * used for writing output files. */ diff --git a/Modules/IO/MeshGifti/include/itkGiftiMeshIO.h b/Modules/IO/MeshGifti/include/itkGiftiMeshIO.h index 41f92752d18..57f9c974766 100644 --- a/Modules/IO/MeshGifti/include/itkGiftiMeshIO.h +++ b/Modules/IO/MeshGifti/include/itkGiftiMeshIO.h @@ -63,7 +63,7 @@ class ITKIOMeshGifti_EXPORT GiftiMeshIO : public MeshIOBase itkGetConstMacro(ReadPointData, bool); itkSetMacro(ReadPointData, bool); - itkBooleanMacro(ReadPointData); + itkBooleanMacro(ReadPointData) void SetDirection(const DirectionType & direction); diff --git a/Modules/IO/Meta/include/itkMetaArrayWriter.h b/Modules/IO/Meta/include/itkMetaArrayWriter.h index 612ca26cb0b..3295dab7625 100644 --- a/Modules/IO/Meta/include/itkMetaArrayWriter.h +++ b/Modules/IO/Meta/include/itkMetaArrayWriter.h @@ -56,7 +56,7 @@ class ITKIOMeta_EXPORT MetaArrayWriter : public LightProcessObject * If set to On, data will be stored in the file in binary format; if set * to Off, data will be stored in ascii format. * Default is Off. */ - itkBooleanMacro(Binary); + itkBooleanMacro(Binary) itkSetMacro(Binary, bool); itkGetConstMacro(Binary, bool); diff --git a/Modules/IO/NIFTI/include/itkNiftiImageIO.h b/Modules/IO/NIFTI/include/itkNiftiImageIO.h index 31e84f8bbbd..24f1d0feb41 100644 --- a/Modules/IO/NIFTI/include/itkNiftiImageIO.h +++ b/Modules/IO/NIFTI/include/itkNiftiImageIO.h @@ -198,7 +198,7 @@ class ITKIONIFTI_EXPORT NiftiImageIO : public ImageIOBase */ itkSetMacro(ConvertRASVectors, bool); itkGetConstMacro(ConvertRASVectors, bool); - itkBooleanMacro(ConvertRASVectors); + itkBooleanMacro(ConvertRASVectors) /** Enable conversion of vector coordinates between RAS coordinate system (in NIFTI file) and * LPS (ITK convention) when reading or writing a "displacement vector" file (intent code: 1006). @@ -217,12 +217,12 @@ class ITKIONIFTI_EXPORT NiftiImageIO : public ImageIOBase */ itkSetMacro(ConvertRASDisplacementVectors, bool); itkGetConstMacro(ConvertRASDisplacementVectors, bool); - itkBooleanMacro(ConvertRASDisplacementVectors); + itkBooleanMacro(ConvertRASDisplacementVectors) /** Allow to read nifti files with non-orthogonal sform*/ itkSetMacro(SFORM_Permissive, bool); itkGetConstMacro(SFORM_Permissive, bool); - itkBooleanMacro(SFORM_Permissive); + itkBooleanMacro(SFORM_Permissive) protected: NiftiImageIO(); diff --git a/Modules/IO/SpatialObjects/include/itkSpatialObjectWriter.h b/Modules/IO/SpatialObjects/include/itkSpatialObjectWriter.h index eafc391b2df..0ac80e8246a 100644 --- a/Modules/IO/SpatialObjects/include/itkSpatialObjectWriter.h +++ b/Modules/IO/SpatialObjects/include/itkSpatialObjectWriter.h @@ -79,7 +79,7 @@ class ITK_TEMPLATE_EXPORT SpatialObjectWriter : public Object itkSetMacro(BinaryPoints, bool); itkGetConstMacro(BinaryPoints, bool); - itkBooleanMacro(BinaryPoints); + itkBooleanMacro(BinaryPoints) void SetTransformPrecision(unsigned int precision); @@ -90,7 +90,7 @@ class ITK_TEMPLATE_EXPORT SpatialObjectWriter : public Object /** Set/Get if the images should be written in a different file */ itkSetMacro(WriteImagesInSeparateFile, bool); itkGetConstMacro(WriteImagesInSeparateFile, bool); - itkBooleanMacro(WriteImagesInSeparateFile); + itkBooleanMacro(WriteImagesInSeparateFile) /** Add a converter for a new MetaObject/SpatialObject type */ void diff --git a/Modules/IO/TransformBase/include/itkTransformFileWriter.h b/Modules/IO/TransformBase/include/itkTransformFileWriter.h index 4db55116e02..debe01fc56b 100644 --- a/Modules/IO/TransformBase/include/itkTransformFileWriter.h +++ b/Modules/IO/TransformBase/include/itkTransformFileWriter.h @@ -83,12 +83,12 @@ class ITKIOTransformBase_TEMPLATE_EXPORT TransformFileWriterTemplate : public Li /** Set/Get the write mode (append/overwrite) for the filter. */ itkSetMacro(AppendMode, bool); itkGetConstMacro(AppendMode, bool); - itkBooleanMacro(AppendMode); + itkBooleanMacro(AppendMode) /** Set/Get a boolean to use the compression or not. */ itkSetMacro(UseCompression, bool); itkGetConstMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) /** Set/Get the input transform to write */ void diff --git a/Modules/IO/TransformBase/include/itkTransformIOBase.h b/Modules/IO/TransformBase/include/itkTransformIOBase.h index 584c3dc70f4..79b7caac02e 100644 --- a/Modules/IO/TransformBase/include/itkTransformIOBase.h +++ b/Modules/IO/TransformBase/include/itkTransformIOBase.h @@ -127,12 +127,12 @@ class ITKIOTransformBase_TEMPLATE_EXPORT TransformIOBaseTemplate : public LightP /** Set the writer to append to the specified file */ itkSetMacro(AppendMode, bool); itkGetConstMacro(AppendMode, bool); - itkBooleanMacro(AppendMode); + itkBooleanMacro(AppendMode) /** Set/Get a boolean to use the compression or not. */ itkSetMacro(UseCompression, bool); itkGetConstMacro(UseCompression, bool); - itkBooleanMacro(UseCompression); + itkBooleanMacro(UseCompression) /** The transform type has a string representation used when reading * and writing transform files. In the case where a double-precision diff --git a/Modules/Nonunit/Review/include/itkAreaClosingImageFilter.h b/Modules/Nonunit/Review/include/itkAreaClosingImageFilter.h index 6e0855f83fb..6fb3f283632 100644 --- a/Modules/Nonunit/Review/include/itkAreaClosingImageFilter.h +++ b/Modules/Nonunit/Review/include/itkAreaClosingImageFilter.h @@ -90,7 +90,7 @@ class AreaClosingImageFilter */ itkSetMacro(UseImageSpacing, bool); itkGetConstReferenceMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) protected: AreaClosingImageFilter() { m_UseImageSpacing = true; } diff --git a/Modules/Nonunit/Review/include/itkAreaOpeningImageFilter.h b/Modules/Nonunit/Review/include/itkAreaOpeningImageFilter.h index f3893d4856b..e224c496d6e 100644 --- a/Modules/Nonunit/Review/include/itkAreaOpeningImageFilter.h +++ b/Modules/Nonunit/Review/include/itkAreaOpeningImageFilter.h @@ -92,7 +92,7 @@ class AreaOpeningImageFilter */ itkSetMacro(UseImageSpacing, bool); itkGetConstReferenceMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) protected: AreaOpeningImageFilter() { m_UseImageSpacing = true; } diff --git a/Modules/Nonunit/Review/include/itkAttributeMorphologyBaseImageFilter.h b/Modules/Nonunit/Review/include/itkAttributeMorphologyBaseImageFilter.h index ac4b013d4f5..28f435cf2fc 100644 --- a/Modules/Nonunit/Review/include/itkAttributeMorphologyBaseImageFilter.h +++ b/Modules/Nonunit/Review/include/itkAttributeMorphologyBaseImageFilter.h @@ -114,7 +114,7 @@ class ITK_TEMPLATE_EXPORT AttributeMorphologyBaseImageFilter : public ImageToIma */ itkSetMacro(FullyConnected, bool); itkGetConstReferenceMacro(FullyConnected, bool); - itkBooleanMacro(FullyConnected); + itkBooleanMacro(FullyConnected) /** * Set/Get the threshold value used to select the connected components. diff --git a/Modules/Nonunit/Review/include/itkDiscreteGaussianDerivativeImageFunction.h b/Modules/Nonunit/Review/include/itkDiscreteGaussianDerivativeImageFunction.h index 3c4935dac15..5fb88e845ba 100644 --- a/Modules/Nonunit/Review/include/itkDiscreteGaussianDerivativeImageFunction.h +++ b/Modules/Nonunit/Review/include/itkDiscreteGaussianDerivativeImageFunction.h @@ -169,12 +169,12 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianDerivativeImageFunction : public Image * parameter t. */ itkSetMacro(NormalizeAcrossScale, bool); itkGetConstMacro(NormalizeAcrossScale, bool); - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set/Get the flag for using image spacing when calculating derivatives. */ itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) /** Set/Get a limit for growth of the kernel. Small maximum error values with * large variances will yield very large kernel sizes. This value can be diff --git a/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.h b/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.h index bb3297df628..9d9a66ad905 100644 --- a/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.h +++ b/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.h @@ -156,12 +156,12 @@ class ITK_TEMPLATE_EXPORT DiscreteGradientMagnitudeGaussianImageFunction * parameter t. */ itkSetMacro(NormalizeAcrossScale, bool); itkGetConstMacro(NormalizeAcrossScale, bool); - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set/Get the flag for using image spacing when calculating derivatives. */ itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) /** Set/Get a limit for growth of the kernel. Small maximum error values with * large variances will yield very large kernel sizes. This value can be diff --git a/Modules/Nonunit/Review/include/itkDiscreteHessianGaussianImageFunction.h b/Modules/Nonunit/Review/include/itkDiscreteHessianGaussianImageFunction.h index 51cb6791155..60c8bd1cc25 100644 --- a/Modules/Nonunit/Review/include/itkDiscreteHessianGaussianImageFunction.h +++ b/Modules/Nonunit/Review/include/itkDiscreteHessianGaussianImageFunction.h @@ -156,12 +156,12 @@ class ITK_TEMPLATE_EXPORT DiscreteHessianGaussianImageFunction * parameter t. */ itkSetMacro(NormalizeAcrossScale, bool); itkGetConstMacro(NormalizeAcrossScale, bool); - itkBooleanMacro(NormalizeAcrossScale); + itkBooleanMacro(NormalizeAcrossScale) /** Set/Get the flag for using image spacing when calculating derivatives. */ itkSetMacro(UseImageSpacing, bool); itkGetConstMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) /** Set/Get a limit for growth of the kernel. Small maximum error values with * large variances will yield very large kernel sizes. This value can be diff --git a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h index 8bdb1ca588a..8018cc86cd8 100644 --- a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h +++ b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h @@ -253,7 +253,7 @@ class ITK_TEMPLATE_EXPORT [[deprecated( // Macros for enabling the calculation of additional features. itkGetMacro(CalculatePixelIndices, bool); - itkBooleanMacro(CalculatePixelIndices); + itkBooleanMacro(CalculatePixelIndices) void SetCalculatePixelIndices(const bool value) { // CalculateOrientedBoundingBox, CalculateOrientedLabelImage, and @@ -279,7 +279,7 @@ class ITK_TEMPLATE_EXPORT [[deprecated( } itkGetMacro(CalculateOrientedBoundingBox, bool); - itkBooleanMacro(CalculateOrientedBoundingBox); + itkBooleanMacro(CalculateOrientedBoundingBox) void SetCalculateOrientedBoundingBox(const bool value) { if (this->m_CalculateOrientedBoundingBox != value) @@ -297,7 +297,7 @@ class ITK_TEMPLATE_EXPORT [[deprecated( } itkGetMacro(CalculateOrientedLabelRegions, bool); - itkBooleanMacro(CalculateOrientedLabelRegions); + itkBooleanMacro(CalculateOrientedLabelRegions) void SetCalculateOrientedLabelRegions(const bool value) { if (this->m_CalculateOrientedLabelRegions != value) @@ -315,7 +315,7 @@ class ITK_TEMPLATE_EXPORT [[deprecated( } itkGetMacro(CalculateOrientedIntensityRegions, bool); - itkBooleanMacro(CalculateOrientedIntensityRegions); + itkBooleanMacro(CalculateOrientedIntensityRegions) void SetCalculateOrientedIntensityRegions(const bool value) { if (this->m_CalculateOrientedIntensityRegions != value) diff --git a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h index 4337c95f518..13617ef0fd2 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h @@ -263,7 +263,7 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace /** Use the image spacing information in calculations. Use this option if you * want derivatives in physical space. Default is UseImageSpacingOn. */ itkSetMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) itkGetConstReferenceMacro(UseImageSpacing, bool); /** Set/Get the maximum error allowed in the solution. This may not be @@ -279,13 +279,13 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace /** Set/Get the state of the filter. */ itkSetMacro(InitializedState, bool); itkGetConstReferenceMacro(InitializedState, bool); - itkBooleanMacro(InitializedState); + itkBooleanMacro(InitializedState) /** Require the filter to be manually reinitialized (by calling SetInitializedStateOff() */ itkSetMacro(ManualReinitialization, bool); itkGetConstReferenceMacro(ManualReinitialization, bool); - itkBooleanMacro(ManualReinitialization); + itkBooleanMacro(ManualReinitialization) /** Set the number of elapsed iterations of the filter. */ itkSetMacro(ElapsedIterations, unsigned int); diff --git a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h index f1acb44fdc6..df0d5dbf1fe 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.h @@ -289,7 +289,7 @@ class ITK_TEMPLATE_EXPORT MultiphaseSparseFiniteDifferenceImageFilter * applications may not use this value and can safely turn the flag off. */ itkSetMacro(InterpolateSurfaceLocation, bool); itkGetConstMacro(InterpolateSurfaceLocation, bool); - itkBooleanMacro(InterpolateSurfaceLocation); + itkBooleanMacro(InterpolateSurfaceLocation) void SetFunctionCount(const IdCellType & n) diff --git a/Modules/Nonunit/Review/include/itkWarpHarmonicEnergyCalculator.h b/Modules/Nonunit/Review/include/itkWarpHarmonicEnergyCalculator.h index 4e7d3f9fd20..1467fea956d 100644 --- a/Modules/Nonunit/Review/include/itkWarpHarmonicEnergyCalculator.h +++ b/Modules/Nonunit/Review/include/itkWarpHarmonicEnergyCalculator.h @@ -100,7 +100,7 @@ class ITK_TEMPLATE_EXPORT WarpHarmonicEnergyCalculator : public Object void SetUseImageSpacing(bool); itkGetConstMacro(UseImageSpacing, bool); - itkBooleanMacro(UseImageSpacing); + itkBooleanMacro(UseImageSpacing) using WeightsType = FixedArray; diff --git a/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h b/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h index aae6ce036cb..160702e84c0 100644 --- a/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h @@ -112,7 +112,7 @@ class ITKOptimizers_EXPORT AmoebaOptimizer : public SingleValuedNonLinearVnlOpti * simplex as [x0[0], x0[1], ..., x0[i]+InitialSimplexDelta[i], ..., * x0[d-1]]. */ itkSetMacro(AutomaticInitialSimplex, bool); - itkBooleanMacro(AutomaticInitialSimplex); + itkBooleanMacro(AutomaticInitialSimplex) itkGetConstMacro(AutomaticInitialSimplex, bool); /** Set/Get the mode that determines if we want to use multiple runs of the @@ -122,7 +122,7 @@ class ITKOptimizers_EXPORT AmoebaOptimizer : public SingleValuedNonLinearVnlOpti * that from the previous iteration. */ itkSetMacro(OptimizeWithRestarts, bool); - itkBooleanMacro(OptimizeWithRestarts); + itkBooleanMacro(OptimizeWithRestarts) itkGetConstMacro(OptimizeWithRestarts, bool); /** Set/Get the deltas that are used to define the initial simplex diff --git a/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h b/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h index fe4e8a2a1ae..1b8b37b1ea5 100644 --- a/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h @@ -72,7 +72,7 @@ class ITKOptimizers_EXPORT CumulativeGaussianOptimizer : public MultipleValuedNo itkGetMacro(DifferenceTolerance, double); itkSetMacro(Verbose, bool); itkGetMacro(Verbose, bool); - itkBooleanMacro(Verbose); + itkBooleanMacro(Verbose) itkGetMacro(ComputedMean, double); itkGetMacro(ComputedStandardDeviation, double); itkGetMacro(UpperAsymptote, double); diff --git a/Modules/Numerics/Optimizers/include/itkFRPROptimizer.h b/Modules/Numerics/Optimizers/include/itkFRPROptimizer.h index 204f774358b..e16181dfcbe 100644 --- a/Modules/Numerics/Optimizers/include/itkFRPROptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkFRPROptimizer.h @@ -92,7 +92,7 @@ class ITKOptimizers_EXPORT FRPROptimizer : public PowellOptimizer /** Convert gradient to a unit length vector */ itkSetMacro(UseUnitLengthGradient, bool); itkGetConstMacro(UseUnitLengthGradient, bool); - itkBooleanMacro(UseUnitLengthGradient); + itkBooleanMacro(UseUnitLengthGradient) /** Start optimization. */ void diff --git a/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h b/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h index e970db8f179..3c2d817fdfa 100644 --- a/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h @@ -100,7 +100,7 @@ class ITKOptimizers_EXPORT GradientDescentOptimizer : public SingleValuedNonLine /** Methods to configure the cost function. */ itkGetConstReferenceMacro(Maximize, bool); itkSetMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) bool GetMinimize() const { diff --git a/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h b/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h index 2d8c9e716e3..cfb0535cbea 100644 --- a/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h @@ -112,7 +112,7 @@ class ITKOptimizers_EXPORT LBFGSBOptimizer : public SingleValuedNonLinearVnlOpti SetTrace(bool flag); itkGetMacro(Trace, bool); - itkBooleanMacro(Trace); + itkBooleanMacro(Trace) /** Set the lower bound value for each variable. */ virtual void diff --git a/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h b/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h index 9d7621cea9a..e63318bc433 100644 --- a/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h @@ -125,7 +125,7 @@ class ITKOptimizers_EXPORT LBFGSOptimizer : public SingleValuedNonLinearVnlOptim SetTrace(bool flag); itkGetMacro(Trace, bool); - itkBooleanMacro(Trace); + itkBooleanMacro(Trace) /** Set/Get the maximum number of function evaluations allowed. */ virtual void diff --git a/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h b/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h index d19935fdb3a..0eb747e50c9 100644 --- a/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h @@ -92,7 +92,7 @@ class ITKOptimizers_EXPORT OnePlusOneEvolutionaryOptimizer : public SingleValued /** Set if the Optimizer should Maximize the metric */ itkSetMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) itkGetConstReferenceMacro(Maximize, bool); bool diff --git a/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h b/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h index 258ba9e4007..5ac836273a5 100644 --- a/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h +++ b/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h @@ -93,7 +93,7 @@ class ITKOptimizers_EXPORT ParticleSwarmOptimizerBase : public SingleValuedNonLi * convergence.*/ itkSetMacro(InitializeNormalDistribution, bool); itkGetMacro(InitializeNormalDistribution, bool); - itkBooleanMacro(InitializeNormalDistribution); + itkBooleanMacro(InitializeNormalDistribution) /** * Specify the initial swarm. Useful for evaluating PSO variants. If the @@ -112,7 +112,7 @@ class ITKOptimizers_EXPORT ParticleSwarmOptimizerBase : public SingleValuedNonLi */ itkSetMacro(PrintSwarm, bool); itkGetMacro(PrintSwarm, bool); - itkBooleanMacro(PrintSwarm); + itkBooleanMacro(PrintSwarm) /** Start optimization. */ void @@ -184,7 +184,7 @@ class ITKOptimizers_EXPORT ParticleSwarmOptimizerBase : public SingleValuedNonLi * generator. Default is Off. */ itkSetMacro(UseSeed, bool); itkGetMacro(UseSeed, bool); - itkBooleanMacro(UseSeed); + itkBooleanMacro(UseSeed) /** Get the function value for the current position. * NOTE: This value is only valid during and after the execution of the diff --git a/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h b/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h index 9779c9c1663..2fc84addd61 100644 --- a/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h @@ -82,7 +82,7 @@ class ITKOptimizers_EXPORT PowellOptimizer : public SingleValuedNonLinearOptimiz /** Set if the Optimizer should Maximize the metric */ itkSetMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) itkGetConstReferenceMacro(Maximize, bool); /** Set/Get maximum iteration limit. */ diff --git a/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h b/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h index c74bff690c1..129e0b5bcdb 100644 --- a/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h @@ -86,7 +86,7 @@ class ITKOptimizers_EXPORT RegularStepGradientDescentBaseOptimizer : public Sing /** Specify whether to minimize or maximize the cost function. */ itkSetMacro(Maximize, bool); itkGetConstReferenceMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) bool GetMinimize() const { diff --git a/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h b/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h index 40a3782edb4..e858291e170 100644 --- a/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h @@ -191,7 +191,7 @@ class ITKOptimizers_EXPORT SPSAOptimizer : public SingleValuedNonLinearOptimizer /** Methods to configure the cost function. */ itkGetConstMacro(Maximize, bool); itkSetMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) bool GetMinimize() const { diff --git a/Modules/Numerics/Optimizers/include/itkSingleValuedNonLinearVnlOptimizer.h b/Modules/Numerics/Optimizers/include/itkSingleValuedNonLinearVnlOptimizer.h index fe0df0b3fcc..ecd7d8220bc 100644 --- a/Modules/Numerics/Optimizers/include/itkSingleValuedNonLinearVnlOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkSingleValuedNonLinearVnlOptimizer.h @@ -70,7 +70,7 @@ class ITKOptimizers_EXPORT SingleValuedNonLinearVnlOptimizer : public SingleValu * -1.0. */ itkGetConstReferenceMacro(Maximize, bool); itkSetMacro(Maximize, bool); - itkBooleanMacro(Maximize); + itkBooleanMacro(Maximize) bool GetMinimize() const { diff --git a/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h index e5b3ee327a6..7e3bee980f4 100644 --- a/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h @@ -100,7 +100,7 @@ class ITKOptimizersv4_EXPORT AmoebaOptimizerv4 : public SingleValuedNonLinearVnl * simplex as [x0[0], x0[1], ..., x0[i]+InitialSimplexDelta[i], ..., * x0[d-1]]. */ itkSetMacro(AutomaticInitialSimplex, bool); - itkBooleanMacro(AutomaticInitialSimplex); + itkBooleanMacro(AutomaticInitialSimplex) itkGetConstMacro(AutomaticInitialSimplex, bool); /** Set/Get the mode that determines if we want to use multiple runs of the @@ -110,7 +110,7 @@ class ITKOptimizersv4_EXPORT AmoebaOptimizerv4 : public SingleValuedNonLinearVnl * that from the previous iteration. */ itkSetMacro(OptimizeWithRestarts, bool); - itkBooleanMacro(OptimizeWithRestarts); + itkBooleanMacro(OptimizeWithRestarts) itkGetConstMacro(OptimizeWithRestarts, bool); /** Set/Get the deltas that are used to define the initial simplex diff --git a/Modules/Numerics/Optimizersv4/include/itkCommandIterationUpdatev4.h b/Modules/Numerics/Optimizersv4/include/itkCommandIterationUpdatev4.h index 43b59beb63a..8fad7555f2f 100644 --- a/Modules/Numerics/Optimizersv4/include/itkCommandIterationUpdatev4.h +++ b/Modules/Numerics/Optimizersv4/include/itkCommandIterationUpdatev4.h @@ -128,7 +128,7 @@ class CommandIterationUpdatev4 : public Command */ itkSetMacro(PrintParameters, bool); itkGetMacro(PrintParameters, bool); - itkBooleanMacro(PrintParameters); + itkBooleanMacro(PrintParameters) protected: diff --git a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerv4.h index 0738f530958..f3bb0b5c5f8 100644 --- a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerv4.h @@ -131,7 +131,7 @@ class ITK_TEMPLATE_EXPORT GradientDescentOptimizerv4Template */ itkSetMacro(DoEstimateLearningRateAtEachIteration, bool); itkGetConstReferenceMacro(DoEstimateLearningRateAtEachIteration, bool); - itkBooleanMacro(DoEstimateLearningRateAtEachIteration); + itkBooleanMacro(DoEstimateLearningRateAtEachIteration) /** Option to use ScalesEstimator for learning rate estimation * only *once*, during first iteration. The estimation overrides the @@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT GradientDescentOptimizerv4Template */ itkSetMacro(DoEstimateLearningRateOnce, bool); itkGetConstReferenceMacro(DoEstimateLearningRateOnce, bool); - itkBooleanMacro(DoEstimateLearningRateOnce); + itkBooleanMacro(DoEstimateLearningRateOnce) /** Minimum convergence value for convergence checking. * The convergence checker calculates convergence value by fitting to @@ -183,7 +183,7 @@ class ITK_TEMPLATE_EXPORT GradientDescentOptimizerv4Template */ itkSetMacro(ReturnBestParametersAndValue, bool); itkGetConstReferenceMacro(ReturnBestParametersAndValue, bool); - itkBooleanMacro(ReturnBestParametersAndValue); + itkBooleanMacro(ReturnBestParametersAndValue) /** Start and run the optimization. */ void diff --git a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h index 534dd7fa72a..44829463320 100644 --- a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h @@ -459,7 +459,7 @@ class ITK_TEMPLATE_EXPORT LBFGS2Optimizerv4Template */ itkSetMacro(EstimateScalesAtEachIteration, bool); itkGetConstReferenceMacro(EstimateScalesAtEachIteration, bool); - itkBooleanMacro(EstimateScalesAtEachIteration); + itkBooleanMacro(EstimateScalesAtEachIteration) protected: LBFGS2Optimizerv4Template(); diff --git a/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h b/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h index 31383fe3ea3..ec4a3aa0e13 100644 --- a/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h +++ b/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT LBFGSOptimizerBasev4 : public SingleValuedNonLinearVnl SetTrace(bool flag); itkGetConstMacro(Trace, bool); - itkBooleanMacro(Trace); + itkBooleanMacro(Trace) /** Set/Get the maximum number of function evaluations allowed. */ virtual void diff --git a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h index 24bc89059b3..567ea674936 100644 --- a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h +++ b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h @@ -214,7 +214,7 @@ class ITK_TEMPLATE_EXPORT ObjectToObjectOptimizerBaseTemplate : public Object */ itkSetMacro(DoEstimateScales, bool); itkGetConstReferenceMacro(DoEstimateScales, bool); - itkBooleanMacro(DoEstimateScales); + itkBooleanMacro(DoEstimateScales) /** Set the number of work units to use when threading. * The default is the global default number of work units diff --git a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h index 6c5dffe56f7..a8ab4de89c0 100644 --- a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h @@ -160,7 +160,7 @@ class ITK_TEMPLATE_EXPORT OnePlusOneEvolutionaryOptimizerv4 itkGetConstReferenceMacro(CatchGetValueException, bool); itkSetMacro(CatchGetValueException, bool); - itkBooleanMacro(CatchGetValueException); + itkBooleanMacro(CatchGetValueException) itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); diff --git a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h index 0e2cbcc37d4..56e9f330eec 100644 --- a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h @@ -126,7 +126,7 @@ class ITK_TEMPLATE_EXPORT PowellOptimizerv4 : public ObjectToObjectOptimizerBase itkGetConstReferenceMacro(CatchGetValueException, bool); itkSetMacro(CatchGetValueException, bool); - itkBooleanMacro(CatchGetValueException); + itkBooleanMacro(CatchGetValueException) itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); diff --git a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.h b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.h index fcc368afbd7..3cc32081e0a 100644 --- a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.h +++ b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.h @@ -158,7 +158,7 @@ class ITK_TEMPLATE_EXPORT RegistrationParameterScalesEstimator */ itkSetMacro(TransformForward, bool); itkGetConstMacro(TransformForward, bool); - itkBooleanMacro(TransformForward); + itkBooleanMacro(TransformForward) /** Get/Set a point set for virtual domain sampling. */ #ifndef ITK_FUTURE_LEGACY_REMOVE diff --git a/Modules/Numerics/Statistics/include/itkHistogram.h b/Modules/Numerics/Statistics/include/itkHistogram.h index 4ba8ea1ee10..00e10e5b945 100644 --- a/Modules/Numerics/Statistics/include/itkHistogram.h +++ b/Modules/Numerics/Statistics/include/itkHistogram.h @@ -159,7 +159,7 @@ class ITK_TEMPLATE_EXPORT Histogram : public Sample> /** Set/Get whether the bins at the edges of the histogram extend to +/- infinity. */ itkGetConstMacro(ClipBinsAtEnds, bool); itkSetMacro(ClipBinsAtEnds, bool); - itkBooleanMacro(ClipBinsAtEnds); + itkBooleanMacro(ClipBinsAtEnds) /** Returns true if the given index is out of bound meaning one of index * is not between [0, last index] */ diff --git a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h index 7b9e88125b0..30a871252ae 100644 --- a/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h +++ b/Modules/Numerics/Statistics/include/itkImageToHistogramFilter.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT ImageToHistogramFilter : public ImageSink * minimum and maximum of the histogram are going to be computed * automatically from the values of the sample */ itkSetGetDecoratedInputMacro(AutoMinimumMaximum, bool); - itkBooleanMacro(AutoMinimumMaximum); + itkBooleanMacro(AutoMinimumMaximum) /** Method that facilitates the use of this filter in the internal * pipeline of another filter. */ diff --git a/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h index 5173683b6bb..64e98c51ffd 100644 --- a/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkImageToNeighborhoodSampleAdaptor.h @@ -135,7 +135,7 @@ class ITK_TEMPLATE_EXPORT ImageToNeighborhoodSampleAdaptor itkGetConstMacro(UseImageRegion, bool); /** Convenience methods to turn on/off the UseImageRegion flag */ - itkBooleanMacro(UseImageRegion); + itkBooleanMacro(UseImageRegion) /** returns the number of measurement vectors in this container */ diff --git a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h index ac737293f35..bdaf64dcba3 100644 --- a/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h +++ b/Modules/Numerics/Statistics/include/itkJointDomainImageToListSampleAdaptor.h @@ -177,7 +177,7 @@ class ITK_TEMPLATE_EXPORT JointDomainImageToListSampleAdaptor /** Method to set UsePixelContainer flag */ itkSetMacro(UsePixelContainer, bool); itkGetConstMacro(UsePixelContainer, bool); - itkBooleanMacro(UsePixelContainer); + itkBooleanMacro(UsePixelContainer) // void PrintSelf(std::ostream& os, Indent indent) const override; diff --git a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h index fa3bd8ec446..f5053647c80 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h +++ b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h @@ -156,7 +156,7 @@ class ITK_TEMPLATE_EXPORT KdTreeBasedKmeansEstimator : public Object itkSetMacro(UseClusterLabels, bool); itkGetConstMacro(UseClusterLabels, bool); - itkBooleanMacro(UseClusterLabels); + itkBooleanMacro(UseClusterLabels) protected: KdTreeBasedKmeansEstimator(); diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h index 46b5064911c..0d433701af1 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.h @@ -158,7 +158,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToCooccurrenceMatrixFilter : public Process total frequency). Normalization is off by default. */ itkSetMacro(Normalize, bool); itkGetConstMacro(Normalize, bool); - itkBooleanMacro(Normalize); + itkBooleanMacro(Normalize) /** Method to set/get the image */ using Superclass::SetInput; diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h index e84709d2128..49d83cd333f 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h @@ -211,7 +211,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageToTextureFeaturesFilter : public ProcessObj itkGetConstMacro(FastCalculations, bool); itkSetMacro(FastCalculations, bool); - itkBooleanMacro(FastCalculations); + itkBooleanMacro(FastCalculations) protected: ScalarImageToTextureFeaturesFilter(); diff --git a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h index 4a9e0afdfc8..13806c28bfd 100644 --- a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h +++ b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h @@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT SubsamplerBase : public Object */ itkSetMacro(CanSelectQuery, bool); itkGetConstReferenceMacro(CanSelectQuery, bool); - itkBooleanMacro(CanSelectQuery); + itkBooleanMacro(CanSelectQuery) /** Provide an interface to set the seed. * The seed value will be used by subclasses where appropriate. diff --git a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h index c38c044f75c..3b37cec85ac 100644 --- a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h @@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT UniformRandomSpatialNeighborSubsampler : public Spatia } } - itkBooleanMacro(UseClockForSeed); + itkBooleanMacro(UseClockForSeed) itkGetConstMacro(UseClockForSeed, bool); virtual void diff --git a/Modules/Registration/Common/include/itkCenteredVersorTransformInitializer.h b/Modules/Registration/Common/include/itkCenteredVersorTransformInitializer.h index b9204ee7363..8b157e22380 100644 --- a/Modules/Registration/Common/include/itkCenteredVersorTransformInitializer.h +++ b/Modules/Registration/Common/include/itkCenteredVersorTransformInitializer.h @@ -88,7 +88,7 @@ class ITK_TEMPLATE_EXPORT CenteredVersorTransformInitializer * initial rotation that will align them. */ itkSetMacro(ComputeRotation, bool); itkGetMacro(ComputeRotation, bool); - itkBooleanMacro(ComputeRotation); + itkBooleanMacro(ComputeRotation) protected: CenteredVersorTransformInitializer(); diff --git a/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h b/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h index b7dc6bda4be..e36c81f9f20 100644 --- a/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h +++ b/Modules/Registration/Common/include/itkEuclideanDistancePointMetric.h @@ -113,7 +113,7 @@ class ITK_TEMPLATE_EXPORT EuclideanDistancePointMetric * of distances^4 instead of the sum of distances^2. Default is false. */ itkSetMacro(ComputeSquaredDistance, bool); itkGetConstMacro(ComputeSquaredDistance, bool); - itkBooleanMacro(ComputeSquaredDistance); + itkBooleanMacro(ComputeSquaredDistance) protected: EuclideanDistancePointMetric(); diff --git a/Modules/Registration/Common/include/itkImageToImageMetric.h b/Modules/Registration/Common/include/itkImageToImageMetric.h index 95876d23679..74187112235 100644 --- a/Modules/Registration/Common/include/itkImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkImageToImageMetric.h @@ -215,7 +215,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetric : public SingleValuedCostFunction /** Set/Get gradient computation. */ itkSetMacro(ComputeGradient, bool); itkGetConstReferenceMacro(ComputeGradient, bool); - itkBooleanMacro(ComputeGradient); + itkBooleanMacro(ComputeGradient) /** Computes the gradient image and assigns it to m_GradientImage */ virtual void @@ -338,7 +338,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetric : public SingleValuedCostFunction * preserve backward compatibility with previous versions of ITK. */ itkSetMacro(UseCachingOfBSplineWeights, bool); itkGetConstReferenceMacro(UseCachingOfBSplineWeights, bool); - itkBooleanMacro(UseCachingOfBSplineWeights); + itkBooleanMacro(UseCachingOfBSplineWeights) using MultiThreaderType = MultiThreaderBase; /** Get the Threader. */ diff --git a/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.h b/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.h index 46cf02cb188..9025056b901 100644 --- a/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.h @@ -120,7 +120,7 @@ class ITK_TEMPLATE_EXPORT KappaStatisticImageToImageMetric : public ImageToImage * (ComplementOn). When using an optimizer that minimizes * metric values use ComplementOn(). */ itkSetMacro(Complement, bool); - itkBooleanMacro(Complement); + itkBooleanMacro(Complement) itkGetConstMacro(Complement, bool); protected: diff --git a/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h b/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h index 12a52c711c8..a68d81e4d7f 100644 --- a/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h @@ -121,7 +121,7 @@ class ITK_TEMPLATE_EXPORT MatchCardinalityImageToImageMetric : public ImageToIma * or mismatches. The default is to measure matches * (MeasureMatchesOn). */ itkSetMacro(MeasureMatches, bool); - itkBooleanMacro(MeasureMatches); + itkBooleanMacro(MeasureMatches) itkGetConstMacro(MeasureMatches, bool); /** Return the multithreader used by this class. */ diff --git a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h index 24b219fd3ad..2149889641b 100644 --- a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h @@ -218,7 +218,7 @@ class ITK_TEMPLATE_EXPORT MattesMutualInformationImageToImageMetric * number of parameters, such as, BSplineTransforms. */ itkSetMacro(UseExplicitPDFDerivatives, bool); itkGetConstReferenceMacro(UseExplicitPDFDerivatives, bool); - itkBooleanMacro(UseExplicitPDFDerivatives); + itkBooleanMacro(UseExplicitPDFDerivatives) /** The marginal PDFs are stored as std::vector. */ using PDFValueType = double; // NOTE: floating point precision is not as stable. Double precision proves faster and diff --git a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h index 7661d11045e..4573c20c6fa 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h +++ b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.h @@ -211,7 +211,7 @@ class ITK_TEMPLATE_EXPORT MultiResolutionPyramidImageFilter : public ImageToImag itkSetMacro(UseShrinkImageFilter, bool); itkGetConstMacro(UseShrinkImageFilter, bool); - itkBooleanMacro(UseShrinkImageFilter); + itkBooleanMacro(UseShrinkImageFilter) #ifdef ITK_USE_CONCEPT_CHECKING // Begin concept checking diff --git a/Modules/Registration/Common/include/itkNormalizedCorrelationImageToImageMetric.h b/Modules/Registration/Common/include/itkNormalizedCorrelationImageToImageMetric.h index 13979876fe3..91db2db2c36 100644 --- a/Modules/Registration/Common/include/itkNormalizedCorrelationImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkNormalizedCorrelationImageToImageMetric.h @@ -97,7 +97,7 @@ class ITK_TEMPLATE_EXPORT NormalizedCorrelationImageToImageMetric : public Image * Default value is false. */ itkSetMacro(SubtractMean, bool); itkGetConstReferenceMacro(SubtractMean, bool); - itkBooleanMacro(SubtractMean); + itkBooleanMacro(SubtractMean) protected: NormalizedCorrelationImageToImageMetric(); diff --git a/Modules/Registration/Common/include/itkNormalizedCorrelationPointSetToImageMetric.h b/Modules/Registration/Common/include/itkNormalizedCorrelationPointSetToImageMetric.h index 1af7a34767d..3fcc80c97e9 100644 --- a/Modules/Registration/Common/include/itkNormalizedCorrelationPointSetToImageMetric.h +++ b/Modules/Registration/Common/include/itkNormalizedCorrelationPointSetToImageMetric.h @@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT NormalizedCorrelationPointSetToImageMetric * Default value is false. */ itkSetMacro(SubtractMean, bool); itkGetConstReferenceMacro(SubtractMean, bool); - itkBooleanMacro(SubtractMean); + itkBooleanMacro(SubtractMean) protected: NormalizedCorrelationPointSetToImageMetric(); diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h index 694ebd69164..23c99dc5ce6 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h @@ -400,14 +400,14 @@ class ITK_TEMPLATE_EXPORT FEMRegistrationFilter : public ImageToImageFilter; @@ -177,7 +177,7 @@ class ITK_TEMPLATE_EXPORT PDEDeformableRegistrationFilter * deviations are specified with SetUpdateFieldStandardDeviations() */ itkSetMacro(SmoothUpdateField, bool); itkGetConstMacro(SmoothUpdateField, bool); - itkBooleanMacro(SmoothUpdateField); + itkBooleanMacro(SmoothUpdateField) /** Set the Gaussian smoothing standard deviations for the update * field. The values are set with respect to pixel coordinates. */ diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h index 3b96d945b99..a28de291260 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h +++ b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h @@ -431,7 +431,7 @@ class ITK_TEMPLATE_EXPORT ImageRegistrationMethodv4 : public ProcessObject */ itkSetMacro(SmoothingSigmasAreSpecifiedInPhysicalUnits, bool); itkGetConstMacro(SmoothingSigmasAreSpecifiedInPhysicalUnits, bool); - itkBooleanMacro(SmoothingSigmasAreSpecifiedInPhysicalUnits); + itkBooleanMacro(SmoothingSigmasAreSpecifiedInPhysicalUnits) /** Make a DataObject of the correct type to be used as the specified output. */ using DataObjectPointerArraySizeType = ProcessObject::DataObjectPointerArraySizeType; @@ -480,14 +480,14 @@ class ITK_TEMPLATE_EXPORT ImageRegistrationMethodv4 : public ProcessObject */ itkSetMacro(InPlace, bool); itkGetConstMacro(InPlace, bool); - itkBooleanMacro(InPlace); + itkBooleanMacro(InPlace) /** * Initialize the current linear transform to be optimized with the center of the * previous transform in the queue. This provides a much better initialization than * the default origin. */ - itkBooleanMacro(InitializeCenterOfLinearOutputTransform); + itkBooleanMacro(InitializeCenterOfLinearOutputTransform) itkSetMacro(InitializeCenterOfLinearOutputTransform, bool); itkGetConstMacro(InitializeCenterOfLinearOutputTransform, bool); diff --git a/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h b/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h index 4e31775f26a..5372e52ff08 100644 --- a/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h +++ b/Modules/Segmentation/Classifiers/include/itkScalarImageKmeansImageFilter.h @@ -135,7 +135,7 @@ class ITK_TEMPLATE_EXPORT ScalarImageKmeansImageFilter : public ImageToImageFilt * only for display. The default value is false. */ itkSetMacro(UseNonContiguousLabels, bool); itkGetConstReferenceMacro(UseNonContiguousLabels, bool); - itkBooleanMacro(UseNonContiguousLabels); + itkBooleanMacro(UseNonContiguousLabels) /** Set Region method to constrain classification to a certain region */ void diff --git a/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentImageFilter.h index fa64ab49216..c64b56103bc 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkConnectedComponentImageFilter.h @@ -131,7 +131,7 @@ class ITK_TEMPLATE_EXPORT ConnectedComponentImageFilter */ itkSetMacro(FullyConnected, bool); itkGetConstReferenceMacro(FullyConnected, bool); - itkBooleanMacro(FullyConnected); + itkBooleanMacro(FullyConnected) /** Type used as identifier of the different component labels. */ using LabelType = IdentifierType; diff --git a/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h index ac46a183f76..69eabd7bc84 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkRelabelComponentImageFilter.h @@ -175,7 +175,7 @@ class ITK_TEMPLATE_EXPORT RelabelComponentImageFilter : public InPlaceImageFilte * If false, initial order of labels is kept. */ itkSetMacro(SortByObjectSize, bool); itkGetConstMacro(SortByObjectSize, bool); - itkBooleanMacro(SortByObjectSize); + itkBooleanMacro(SortByObjectSize) /** Get the size of each object in pixels. This information is only * valid after the filter has executed. Size of the background is diff --git a/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h b/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h index 50a05268aff..b6b48f2e7d7 100644 --- a/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkCollidingFrontsImageFilter.h @@ -145,11 +145,11 @@ class ITK_TEMPLATE_EXPORT CollidingFrontsImageFilter : public ImageToImageFilter itkSetMacro(ApplyConnectivity, bool); itkGetConstMacro(ApplyConnectivity, bool); - itkBooleanMacro(ApplyConnectivity); + itkBooleanMacro(ApplyConnectivity) itkSetMacro(StopOnTargets, bool); itkGetConstMacro(StopOnTargets, bool); - itkBooleanMacro(StopOnTargets); + itkBooleanMacro(StopOnTargets) #ifdef ITK_USE_CONCEPT_CHECKING // Begin concept checking diff --git a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.h b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.h index 6577c8f51a9..6a88353d4eb 100644 --- a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.h +++ b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.h @@ -108,7 +108,7 @@ class ITK_TEMPLATE_EXPORT LevelSetNeighborhoodExtractor : public LightProcessObj /** Get the narrowbanding flag. */ itkGetConstMacro(NarrowBanding, bool); - itkBooleanMacro(NarrowBanding); + itkBooleanMacro(NarrowBanding) /** Set/Get the input narrowband. A narrowband is represented as * a VectorContainer of LevelSetNodes. */ diff --git a/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h index 9eb75d6d344..7ae5bea38c8 100644 --- a/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkNarrowBandLevelSetImageFilter.h @@ -269,7 +269,7 @@ class ITK_TEMPLATE_EXPORT NarrowBandLevelSetImageFilter : public NarrowBandImage * set. */ itkSetMacro(ReverseExpansionDirection, bool); itkGetConstMacro(ReverseExpansionDirection, bool); - itkBooleanMacro(ReverseExpansionDirection); + itkBooleanMacro(ReverseExpansionDirection) /** Combined scaling of the propagation and advection speed terms. You should use either this -or- Get/SetPropagationScaling and diff --git a/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h index 6994009733c..f5aac080640 100644 --- a/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkReinitializeLevelSetImageFilter.h @@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT ReinitializeLevelSetImageFilter : public ImageToImageF * off. */ itkSetMacro(NarrowBanding, bool); itkGetConstMacro(NarrowBanding, bool); - itkBooleanMacro(NarrowBanding); + itkBooleanMacro(NarrowBanding) /** Set/Get the input narrow bandwidth. The default value is 12. */ itkSetClampMacro(InputNarrowBandwidth, double, 0.0, NumericTraits::max()); diff --git a/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h index 48c19c2dac9..894fb4241ec 100644 --- a/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkSegmentationLevelSetImageFilter.h @@ -316,7 +316,7 @@ class ITK_TEMPLATE_EXPORT SegmentationLevelSetImageFilter * set. */ itkSetMacro(ReverseExpansionDirection, bool); itkGetConstMacro(ReverseExpansionDirection, bool); - itkBooleanMacro(ReverseExpansionDirection); + itkBooleanMacro(ReverseExpansionDirection) /** Turn On/Off automatic generation of Speed and Advection terms when Update is called. If set to Off, the Speed and Advection images must be set @@ -325,7 +325,7 @@ class ITK_TEMPLATE_EXPORT SegmentationLevelSetImageFilter to updating the filter. */ itkSetMacro(AutoGenerateSpeedAdvection, bool); itkGetConstMacro(AutoGenerateSpeedAdvection, bool); - itkBooleanMacro(AutoGenerateSpeedAdvection); + itkBooleanMacro(AutoGenerateSpeedAdvection) /** Combined scaling of the propagation and advection speed terms. You should use either this -or- Get/SetPropagationScaling and diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h index ff483ee496b..16460bdeca9 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldFourthOrderLevelSetImageFilter.h @@ -215,7 +215,7 @@ class ITK_TEMPLATE_EXPORT SparseFieldFourthOrderLevelSetImageFilter itkSetMacro(NormalProcessConductance, ValueType); itkSetMacro(NormalProcessUnsharpFlag, bool); itkGetConstReferenceMacro(NormalProcessUnsharpFlag, bool); - itkBooleanMacro(NormalProcessUnsharpFlag); + itkBooleanMacro(NormalProcessUnsharpFlag) itkSetMacro(NormalProcessUnsharpWeight, ValueType); itkGetConstReferenceMacro(NormalProcessUnsharpWeight, ValueType); diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationCurvatureTerm.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationCurvatureTerm.h index f314d88dad4..a2021aa13f6 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationCurvatureTerm.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationCurvatureTerm.h @@ -97,7 +97,7 @@ class ITK_TEMPLATE_EXPORT LevelSetEquationCurvatureTerm : public LevelSetEquatio itkSetMacro(UseCurvatureImage, bool); itkGetMacro(UseCurvatureImage, bool); - itkBooleanMacro(UseCurvatureImage); + itkBooleanMacro(UseCurvatureImage) /** Neighborhood radius type */ using DefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition; diff --git a/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h index 499229929d4..ffaeb7fc836 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkIsolatedConnectedImageFilter.h @@ -192,7 +192,7 @@ class ITK_TEMPLATE_EXPORT IsolatedConnectedImageFilter : public ImageToImageFilt /** Set/Get whether to find an upper threshold (separating two dark * regions) or a lower threshold (separating two bright regions). */ itkSetMacro(FindUpperThreshold, bool); - itkBooleanMacro(FindUpperThreshold); + itkBooleanMacro(FindUpperThreshold) itkGetConstReferenceMacro(FindUpperThreshold, bool); /** Get the flag that tells whether the algorithm failed to find a diff --git a/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.h b/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.h index 4990d54584b..dc4e18272e7 100644 --- a/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.h +++ b/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.h @@ -137,7 +137,7 @@ class ITK_TEMPLATE_EXPORT SLICImageFilter : public ImageToImageFilter Date: Thu, 30 May 2024 15:41:03 -0400 Subject: [PATCH 2/7] COMP: Remove ; from other itk macros --- .clang-format | 6 +++++ .../Core/Common/include/itkHexahedronCell.h | 2 +- Modules/Core/Common/include/itkLineCell.h | 2 +- Modules/Core/Common/include/itkMath.h | 2 +- .../Core/Common/include/itkNumericTraits.h | 24 +++++++++---------- Modules/Core/Common/include/itkPolyLineCell.h | 2 +- Modules/Core/Common/include/itkPolygonCell.h | 2 +- .../Common/include/itkQuadraticEdgeCell.h | 2 +- .../Common/include/itkQuadraticTriangleCell.h | 2 +- .../Common/include/itkQuadrilateralCell.h | 2 +- .../Core/Common/include/itkTetrahedronCell.h | 2 +- Modules/Core/Common/include/itkTriangleCell.h | 2 +- Modules/Core/Common/include/itkVertexCell.h | 2 +- .../include/itkGeometricalQuadEdge.h | 2 +- .../QuadEdgeMesh/include/itkQuadEdgeMesh.h | 2 +- ...attesMutualInformationImageToImageMetric.h | 2 +- ...etricv4GetValueAndDerivativeThreaderBase.h | 2 +- 17 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.clang-format b/.clang-format index 54f3a797c3f..e741ab3e75b 100644 --- a/.clang-format +++ b/.clang-format @@ -156,6 +156,12 @@ StatementMacros: - INTEL_PRAGMA_WARN_POP - INTEL_SUPPRESS_warning_1292 - itkBooleanMacro + - itkQEDefineFrontIteratorMethodsMacro + - itkQEAccessorsMacro + - itkCellVisitMacro + - itkNUMERIC_TRAITS_MIN_MAX_MACRO + - itkTemplateFloatingToIntegerMacro + - itkPadStruct TabWidth: 2 UseTab: Never ... diff --git a/Modules/Core/Common/include/itkHexahedronCell.h b/Modules/Core/Common/include/itkHexahedronCell.h index cb7fd3f61f0..8b933f327f4 100644 --- a/Modules/Core/Common/include/itkHexahedronCell.h +++ b/Modules/Core/Common/include/itkHexahedronCell.h @@ -154,7 +154,7 @@ class ITK_TEMPLATE_EXPORT HexahedronCell InterpolationWeightType *) override; /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::HEXAHEDRON_CELL); + itkCellVisitMacro(CellGeometryEnum::HEXAHEDRON_CELL) protected: /** Store the number of points needed for a hexahedron. */ diff --git a/Modules/Core/Common/include/itkLineCell.h b/Modules/Core/Common/include/itkLineCell.h index a3f160b3d38..15df8f220ee 100644 --- a/Modules/Core/Common/include/itkLineCell.h +++ b/Modules/Core/Common/include/itkLineCell.h @@ -111,7 +111,7 @@ class ITK_TEMPLATE_EXPORT LineCell : public TCellInterface GetVertex(CellFeatureIdentifier, VertexAutoPointer &); /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::LINE_CELL); + itkCellVisitMacro(CellGeometryEnum::LINE_CELL) LineCell() = default; diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h index c311597d815..55890fab01a 100644 --- a/Modules/Core/Common/include/itkMath.h +++ b/Modules/Core/Common/include/itkMath.h @@ -204,7 +204,7 @@ itkTemplateFloatingToIntegerMacro(Floor); * the default one (or at least that it is always restored to the * default one). */ -itkTemplateFloatingToIntegerMacro(Ceil); +itkTemplateFloatingToIntegerMacro(Ceil) #undef itkTemplateFloatingToIntegerMacro diff --git a/Modules/Core/Common/include/itkNumericTraits.h b/Modules/Core/Common/include/itkNumericTraits.h index ae4bd04fbb2..dee01914360 100644 --- a/Modules/Core/Common/include/itkNumericTraits.h +++ b/Modules/Core/Common/include/itkNumericTraits.h @@ -393,7 +393,7 @@ class NumericTraits : public std::numeric_limits static constexpr char ITKCommon_EXPORT Zero = 0; static constexpr char ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr char NonpositiveMin() @@ -621,7 +621,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned char ITKCommon_EXPORT Zero = 0; static constexpr unsigned char ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned char NonpositiveMin() @@ -724,7 +724,7 @@ class NumericTraits : public std::numeric_limits static constexpr short ITKCommon_EXPORT Zero = 0; static constexpr short ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr short NonpositiveMin() { @@ -827,7 +827,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned short ITKCommon_EXPORT Zero = 0; static constexpr unsigned short ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned short NonpositiveMin() { @@ -929,7 +929,7 @@ class NumericTraits : public std::numeric_limits static constexpr int ITKCommon_EXPORT Zero = 0; static constexpr int ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr int NonpositiveMin() { @@ -1154,7 +1154,7 @@ class NumericTraits : public std::numeric_limits static constexpr long ITKCommon_EXPORT Zero = 0L; static constexpr long ITKCommon_EXPORT One = 1L; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr long NonpositiveMin() { @@ -1257,7 +1257,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned long ITKCommon_EXPORT Zero = 0UL; static constexpr unsigned long ITKCommon_EXPORT One = 1UL; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned long NonpositiveMin() { @@ -1361,7 +1361,7 @@ class NumericTraits : public std::numeric_limits static constexpr float ITKCommon_EXPORT Zero = 0.0f; static constexpr float ITKCommon_EXPORT One = 1.0f; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr float NonpositiveMin() { @@ -1464,7 +1464,7 @@ class NumericTraits : public std::numeric_limits static constexpr double ITKCommon_EXPORT Zero = 0.0; static constexpr double ITKCommon_EXPORT One = 1.0; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr double NonpositiveMin() { @@ -1575,7 +1575,7 @@ class NumericTraits : public std::numeric_limits static constexpr long double ITKCommon_EXPORT Zero = 0.0; static constexpr long double ITKCommon_EXPORT One = 1.0; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr long double NonpositiveMin() { @@ -1679,7 +1679,7 @@ class NumericTraits : public std::numeric_limits static constexpr ValueType ITKCommon_EXPORT Zero = 0LL; static constexpr ValueType ITKCommon_EXPORT One = 1LL; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr ValueType NonpositiveMin() { @@ -1782,7 +1782,7 @@ class NumericTraits : public std::numeric_limits; /** Need to add POLYGON_CELL into CellInterface. */ - itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL); + itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL) /** Implement the standard CellInterface. */ CellGeometryEnum diff --git a/Modules/Core/Common/include/itkQuadraticEdgeCell.h b/Modules/Core/Common/include/itkQuadraticEdgeCell.h index 125275f3ada..1267db8ac57 100644 --- a/Modules/Core/Common/include/itkQuadraticEdgeCell.h +++ b/Modules/Core/Common/include/itkQuadraticEdgeCell.h @@ -106,7 +106,7 @@ class ITK_TEMPLATE_EXPORT QuadraticEdgeCell : public TCellInterface GetVertex(CellFeatureIdentifier, VertexAutoPointer &); /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::QUADRATIC_EDGE_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRATIC_EDGE_CELL) QuadraticEdgeCell() = default; diff --git a/Modules/Core/Common/include/itkQuadraticTriangleCell.h b/Modules/Core/Common/include/itkQuadraticTriangleCell.h index 267ac243d35..2cf2c9a728b 100644 --- a/Modules/Core/Common/include/itkQuadraticTriangleCell.h +++ b/Modules/Core/Common/include/itkQuadraticTriangleCell.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT QuadraticTriangleCell GetEdge(CellFeatureIdentifier, EdgeAutoPointer &); /** Cell visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::QUADRATIC_TRIANGLE_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRATIC_TRIANGLE_CELL) /** Given the parametric coordinates of a point in the cell * determine the value of its Shape Functions diff --git a/Modules/Core/Common/include/itkQuadrilateralCell.h b/Modules/Core/Common/include/itkQuadrilateralCell.h index acf10441a73..601dd869d24 100644 --- a/Modules/Core/Common/include/itkQuadrilateralCell.h +++ b/Modules/Core/Common/include/itkQuadrilateralCell.h @@ -130,7 +130,7 @@ class ITK_TEMPLATE_EXPORT QuadrilateralCell InterpolationWeightType * weight) override; /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::QUADRILATERAL_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRILATERAL_CELL) /** Constructor and destructor */ QuadrilateralCell() = default; diff --git a/Modules/Core/Common/include/itkTetrahedronCell.h b/Modules/Core/Common/include/itkTetrahedronCell.h index 9c62125ff12..6fee0fc3ac3 100644 --- a/Modules/Core/Common/include/itkTetrahedronCell.h +++ b/Modules/Core/Common/include/itkTetrahedronCell.h @@ -165,7 +165,7 @@ class ITK_TEMPLATE_EXPORT TetrahedronCell GetFace(CellFeatureIdentifier, FaceAutoPointer &); /** Visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::TETRAHEDRON_CELL); + itkCellVisitMacro(CellGeometryEnum::TETRAHEDRON_CELL) bool EvaluatePosition(CoordRepType *, diff --git a/Modules/Core/Common/include/itkTriangleCell.h b/Modules/Core/Common/include/itkTriangleCell.h index 24b6a787ddf..d4053cba45f 100644 --- a/Modules/Core/Common/include/itkTriangleCell.h +++ b/Modules/Core/Common/include/itkTriangleCell.h @@ -165,7 +165,7 @@ class ITK_TEMPLATE_EXPORT TriangleCell InterpolationWeightType *) override; /** Cell visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::TRIANGLE_CELL); + itkCellVisitMacro(CellGeometryEnum::TRIANGLE_CELL) /** Compute Area to a TriangleCell given a PointsContainer. */ CoordRepType diff --git a/Modules/Core/Common/include/itkVertexCell.h b/Modules/Core/Common/include/itkVertexCell.h index 9b5f1d7b10a..488c1a295b7 100644 --- a/Modules/Core/Common/include/itkVertexCell.h +++ b/Modules/Core/Common/include/itkVertexCell.h @@ -125,7 +125,7 @@ class ITK_TEMPLATE_EXPORT VertexCell : public TCellInterface GetPointId(); /** Cell visitor interface */ - itkCellVisitMacro(CellGeometryEnum::VERTEX_CELL); + itkCellVisitMacro(CellGeometryEnum::VERTEX_CELL) /** Evaluate the position of a given point */ bool diff --git a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h index cfc3529afb1..a9f876abf3d 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h +++ b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h @@ -103,7 +103,7 @@ class ITK_TEMPLATE_EXPORT GeometricalQuadEdge : public QuadEdge inline itkQEDefineIteratorGeomMethodsMacro(InvDnext); /** QE macros. */ - itkQEAccessorsMacro(Superclass, Self, DualType); + itkQEAccessorsMacro(Superclass, Self, DualType) public: GeometricalQuadEdge(); diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h index d3e5fb6e8fc..561f0116b32 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h @@ -169,7 +169,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMesh : public Mesh Date: Thu, 30 May 2024 15:50:58 -0400 Subject: [PATCH 3/7] COMP: Updated itkLegacyMacro Definition --- .clang-format | 1 + Modules/Core/Common/include/itkMacro.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index e741ab3e75b..2b8a92ebc8b 100644 --- a/.clang-format +++ b/.clang-format @@ -162,6 +162,7 @@ StatementMacros: - itkNUMERIC_TRAITS_MIN_MAX_MACRO - itkTemplateFloatingToIntegerMacro - itkPadStruct + - itkLegacyMacro TabWidth: 2 UseTab: Never ... diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h index cc3e2622890..48b25785f90 100644 --- a/Modules/Core/Common/include/itkMacro.h +++ b/Modules/Core/Common/include/itkMacro.h @@ -647,7 +647,8 @@ OutputWindowDisplayDebugText(const char *); // // See below for what to do for the method definition. #if defined(ITK_LEGACY_REMOVE) -# define itkLegacyMacro(method) /* no ';' */ +# define itkLegacyMacro(method) \ + static_assert(true, "Compile time eliminated. Used to require a semi-colon at end of macro.") #else # if defined(ITK_LEGACY_SILENT) || defined(ITK_LEGACY_TEST) // Provide legacy methods with no warnings. From 405ae352a396cddb1552e9812467f302acd7ca1a Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 30 May 2024 15:53:53 -0400 Subject: [PATCH 4/7] COMP: Remove ITK_ASSOCIATE ; or struct; Should we remove the semicolon from the struct or from ITK_ASSOCIATE. --- Modules/Core/Common/include/itkPromoteType.h | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Modules/Core/Common/include/itkPromoteType.h b/Modules/Core/Common/include/itkPromoteType.h index 7162ac1805c..84bee8aa097 100644 --- a/Modules/Core/Common/include/itkPromoteType.h +++ b/Modules/Core/Common/include/itkPromoteType.h @@ -62,20 +62,20 @@ struct Identity using Type = Typed; \ }; -ITK_ASSOCIATE(1, TA); -ITK_ASSOCIATE(2, TB); +ITK_ASSOCIATE(1, TA) +ITK_ASSOCIATE(2, TB) -ITK_ASSOCIATE(3, short); -ITK_ASSOCIATE(4, unsigned short); -ITK_ASSOCIATE(5, int); -ITK_ASSOCIATE(6, unsigned int); -ITK_ASSOCIATE(7, long); -ITK_ASSOCIATE(8, unsigned long); -ITK_ASSOCIATE(9, long long); -ITK_ASSOCIATE(10, unsigned long long); -ITK_ASSOCIATE(11, float); -ITK_ASSOCIATE(12, double); -ITK_ASSOCIATE(13, long double); +ITK_ASSOCIATE(3, short) +ITK_ASSOCIATE(4, unsigned short) +ITK_ASSOCIATE(5, int) +ITK_ASSOCIATE(6, unsigned int) +ITK_ASSOCIATE(7, long) +ITK_ASSOCIATE(8, unsigned long) +ITK_ASSOCIATE(9, long long) +ITK_ASSOCIATE(10, unsigned long long) +ITK_ASSOCIATE(11, float) +ITK_ASSOCIATE(12, double) +ITK_ASSOCIATE(13, long double) #undef ITK_ASSOCIATE } // namespace Details From e0e0ba86ffdede8bfc7758c4dc47eec1933a040a Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 30 May 2024 16:04:10 -0400 Subject: [PATCH 5/7] COMP: Remove ; to function cases --- .../Common/include/itkGaussianKernelFunction.h | 3 ++- Modules/Core/Common/include/itkProcessObject.h | 14 ++++++++++---- Modules/Core/Common/include/itkVectorContainer.h | 4 ++-- .../include/itkVelocityFieldTransform.h | 3 ++- .../include/itkNullImageToImageFilterDriver.hxx | 3 ++- ...ncyFFTLayoutImageRegionConstIteratorWithIndex.h | 2 +- ...tedFFTLayoutImageRegionConstIteratorWithIndex.h | 2 +- .../include/itkArithmeticOpsFunctors.h | 2 +- .../itkPointSetToPointSetMetricWithIndexv4.h | 4 ++-- .../include/itkPointSetToPointSetMetricv4.h | 6 +++--- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Modules/Core/Common/include/itkGaussianKernelFunction.h b/Modules/Core/Common/include/itkGaussianKernelFunction.h index 8aa3f5d1c23..0ec7a1f8f3b 100644 --- a/Modules/Core/Common/include/itkGaussianKernelFunction.h +++ b/Modules/Core/Common/include/itkGaussianKernelFunction.h @@ -64,7 +64,8 @@ class ITK_TEMPLATE_EXPORT GaussianKernelFunction : public KernelFunctionBaseSetNumberOfWorkUnits(count); } + itkLegacyMacro(void SetNumberOfThreads(ThreadIdType count)) + { + this->SetNumberOfWorkUnits(count); + } - itkLegacyMacro(ThreadIdType GetNumberOfThreads() const) { return this->GetNumberOfWorkUnits(); } + itkLegacyMacro(ThreadIdType GetNumberOfThreads() const) + { + return this->GetNumberOfWorkUnits(); + } #endif // !ITK_LEGACY_REMOVE /** Return the multithreader used by this class. */ @@ -905,7 +911,7 @@ class ITKCommon_EXPORT ProcessObject : public Object progressFixedToFloat(uint32_t fixed) { return static_cast(fixed) / static_cast(std::numeric_limits::max()); - }; + } /** * Internal method convert floating point progress [0.0, 1.0] to internal integer representation. Values outside the @@ -924,7 +930,7 @@ class ITKCommon_EXPORT ProcessObject : public Object } double temp = static_cast(f) * std::numeric_limits::max(); return static_cast(temp); - }; + } /** These ivars are made protected so filters like itkStreamingImageFilter * can access them directly. */ diff --git a/Modules/Core/Common/include/itkVectorContainer.h b/Modules/Core/Common/include/itkVectorContainer.h index 5e217d16d17..051ef30cd3c 100644 --- a/Modules/Core/Common/include/itkVectorContainer.h +++ b/Modules/Core/Common/include/itkVectorContainer.h @@ -244,7 +244,7 @@ class ITK_TEMPLATE_EXPORT VectorContainer m_Pos += n; m_Iter += n; return *this; - }; + } /** Get the index into the VectorContainer associated with this iterator. */ @@ -335,7 +335,7 @@ class ITK_TEMPLATE_EXPORT VectorContainer m_Pos += n; m_Iter += n; return *this; - }; + } difference_type operator-(const ConstIterator & r) const diff --git a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h index 5e972935eea..78730aaf8d6 100644 --- a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h +++ b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h @@ -166,7 +166,8 @@ class ITK_TEMPLATE_EXPORT VelocityFieldTransform : public DisplacementFieldTrans /** Trigger the computation of the displacement field by integrating the velocity field. */ virtual void - IntegrateVelocityField(){}; + IntegrateVelocityField() + {} /** * Set the lower time bound defining the integration domain of the transform. diff --git a/Modules/Filtering/ImageFilterBase/include/itkNullImageToImageFilterDriver.hxx b/Modules/Filtering/ImageFilterBase/include/itkNullImageToImageFilterDriver.hxx index 3114dd8d294..b86f12cbfd9 100644 --- a/Modules/Filtering/ImageFilterBase/include/itkNullImageToImageFilterDriver.hxx +++ b/Modules/Filtering/ImageFilterBase/include/itkNullImageToImageFilterDriver.hxx @@ -48,7 +48,8 @@ class NullImageToImageFilterDriver { public: NullImageToImageFilterDriver() - : m_Filter(nullptr){}; + : m_Filter(nullptr) + {} using ImageSizeType = typename TInputImage::SizeType; using InputPixelType = typename TInputImage::PixelType; diff --git a/Modules/Filtering/ImageFrequency/include/itkFrequencyFFTLayoutImageRegionConstIteratorWithIndex.h b/Modules/Filtering/ImageFrequency/include/itkFrequencyFFTLayoutImageRegionConstIteratorWithIndex.h index 32136b0ab04..f387d76ec84 100644 --- a/Modules/Filtering/ImageFrequency/include/itkFrequencyFFTLayoutImageRegionConstIteratorWithIndex.h +++ b/Modules/Filtering/ImageFrequency/include/itkFrequencyFFTLayoutImageRegionConstIteratorWithIndex.h @@ -263,7 +263,7 @@ class ITK_TEMPLATE_EXPORT FrequencyFFTLayoutImageRegionConstIteratorWithIndex SetActualXDimensionIsOdd(bool value) { this->m_ActualXDimensionIsOdd = value; - }; + } itkGetMacro(ActualXDimensionIsOdd, bool); itkBooleanMacro(ActualXDimensionIsOdd) diff --git a/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h b/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h index 6d5b89c2772..437834f04fe 100644 --- a/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h +++ b/Modules/Filtering/ImageFrequency/include/itkFrequencyShiftedFFTLayoutImageRegionConstIteratorWithIndex.h @@ -239,7 +239,7 @@ class ITK_TEMPLATE_EXPORT FrequencyShiftedFFTLayoutImageRegionConstIteratorWithI SetActualXDimensionIsOdd(bool value) { this->m_ActualXDimensionIsOdd = value; - }; + } itkGetMacro(ActualXDimensionIsOdd, bool); itkBooleanMacro(ActualXDimensionIsOdd) diff --git a/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h b/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h index c100f2441c1..0c6fe548cf3 100644 --- a/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h +++ b/Modules/Filtering/ImageIntensity/include/itkArithmeticOpsFunctors.h @@ -170,7 +170,7 @@ class ITK_TEMPLATE_EXPORT DivideOrZeroOut { m_Threshold = 1e-5 * NumericTraits::OneValue(); m_Constant = TOutput{}; - }; + } ~DivideOrZeroOut() = default; diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h index 544f4c9184d..8b0be330800 100644 --- a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h +++ b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h @@ -418,13 +418,13 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricWithIndexv4 RequiresMovingPointsLocator() const { return true; - }; + } virtual bool RequiresFixedPointsLocator() const { return true; - }; + } /** * Function to be defined in the appropriate derived classes. Calculates diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h index 0b7ac515de0..049f97eef80 100644 --- a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h @@ -210,7 +210,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricv4 const PixelType & pixel) const override { return this->GetLocalNeighborhoodValue(point, pixel); - }; + } LocalDerivativeType GetLocalNeighborhoodDerivativeWithIndex(const PointIdentifier &, @@ -218,7 +218,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricv4 const PixelType & pixel) const override { return this->GetLocalNeighborhoodDerivative(point, pixel); - }; + } void GetLocalNeighborhoodValueAndDerivativeWithIndex(const PointIdentifier &, @@ -228,7 +228,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetMetricv4 const PixelType & pixel) const override { this->GetLocalNeighborhoodValueAndDerivative(point, measure, derivative, pixel); - }; + } }; } // end namespace itk From 72228e27c89da138eb785b8a895916d2771a3b5d Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 30 May 2024 16:08:30 -0400 Subject: [PATCH 6/7] COMP: Remove cases with ; to override cases --- Modules/Core/Common/include/itkQuadrilateralCell.h | 4 ++-- Modules/Core/Common/include/itkTriangleCell.h | 4 ++-- Modules/Core/Transform/include/itkBSplineTransform.h | 9 ++++++--- Modules/Core/Transform/include/itkTransform.h | 4 ++-- Modules/Core/Transform/include/itkTransformBase.h | 4 ++-- .../Convolution/include/itkConvolutionImageFilterBase.h | 3 ++- .../Common/include/itkTransformParametersAdaptor.h | 3 ++- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Modules/Core/Common/include/itkQuadrilateralCell.h b/Modules/Core/Common/include/itkQuadrilateralCell.h index 601dd869d24..ae72ded6564 100644 --- a/Modules/Core/Common/include/itkQuadrilateralCell.h +++ b/Modules/Core/Common/include/itkQuadrilateralCell.h @@ -141,9 +141,9 @@ class ITK_TEMPLATE_EXPORT QuadrilateralCell // This was observed in at least gcc 4.8 and 5.4.0, and // AppleClang 7.0.2 and 8.0.0. Probably others too. // "= default" doesn't gain us much, so just don't use it here. - ~QuadrilateralCell() override{}; + ~QuadrilateralCell() override {} #else - ~QuadrilateralCell() override = default; + ~QuadrilateralCell() override = default #endif protected: diff --git a/Modules/Core/Common/include/itkTriangleCell.h b/Modules/Core/Common/include/itkTriangleCell.h index d4053cba45f..a1073762c0a 100644 --- a/Modules/Core/Common/include/itkTriangleCell.h +++ b/Modules/Core/Common/include/itkTriangleCell.h @@ -188,9 +188,9 @@ class ITK_TEMPLATE_EXPORT TriangleCell // This was observed in at least gcc 4.8 and 5.4.0, and // AppleClang 7.0.2 and 8.0.0. Probably others too. // "= default" doesn't gain us much, so just don't use it here. - ~TriangleCell() override{}; + ~TriangleCell() override {} #else - ~TriangleCell() override = default; + ~TriangleCell() override = default #endif protected: diff --git a/Modules/Core/Transform/include/itkBSplineTransform.h b/Modules/Core/Transform/include/itkBSplineTransform.h index 8a1b5591912..e6970c031b9 100644 --- a/Modules/Core/Transform/include/itkBSplineTransform.h +++ b/Modules/Core/Transform/include/itkBSplineTransform.h @@ -302,14 +302,17 @@ class ITK_TEMPLATE_EXPORT BSplineTransform : public BSplineBaseTransform Date: Thu, 30 May 2024 16:10:22 -0400 Subject: [PATCH 7/7] COMP: Remove ; IPL cases --- .clang-format | 2 ++ Modules/IO/IPL/include/itkIPLFileNameList.h | 22 ++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.clang-format b/.clang-format index 2b8a92ebc8b..5fb828b3788 100644 --- a/.clang-format +++ b/.clang-format @@ -163,6 +163,8 @@ StatementMacros: - itkTemplateFloatingToIntegerMacro - itkPadStruct - itkLegacyMacro + - IPLSetMacroDeclaration + - IPLGetMacroDeclaration TabWidth: 2 UseTab: Never ... diff --git a/Modules/IO/IPL/include/itkIPLFileNameList.h b/Modules/IO/IPL/include/itkIPLFileNameList.h index 53edc5133b9..5c14285b3e2 100644 --- a/Modules/IO/IPL/include/itkIPLFileNameList.h +++ b/Modules/IO/IPL/include/itkIPLFileNameList.h @@ -93,21 +93,15 @@ class IPLFileSortInfo virtual ~IPLFileSortInfo(); - IPLSetMacroDeclaration(ImageFileName, std::string); - IPLGetMacroDeclaration(ImageFileName, std::string); - IPLSetMacroDeclaration(SliceLocation, float); - IPLGetMacroDeclaration(SliceLocation, float); - IPLSetMacroDeclaration(SliceOffset, int); - IPLGetMacroDeclaration(SliceOffset, int); - IPLSetMacroDeclaration(EchoNumber, int); - IPLGetMacroDeclaration(EchoNumber, int); - IPLSetMacroDeclaration(ImageNumber, int); - IPLGetMacroDeclaration(ImageNumber, int); - IPLSetMacroDeclaration(Data, void *); - IPLGetMacroDeclaration(Data, const void *); + IPLSetMacroDeclaration(ImageFileName, std::string) + IPLGetMacroDeclaration(ImageFileName, std::string) IPLSetMacroDeclaration(SliceLocation, float) + IPLGetMacroDeclaration(SliceLocation, float) IPLSetMacroDeclaration(SliceOffset, int) + IPLGetMacroDeclaration(SliceOffset, int) IPLSetMacroDeclaration(EchoNumber, int) + IPLGetMacroDeclaration(EchoNumber, int) IPLSetMacroDeclaration(ImageNumber, int) + IPLGetMacroDeclaration(ImageNumber, int) IPLSetMacroDeclaration(Data, void *) + IPLGetMacroDeclaration(Data, const void *) -private: - std::string m_ImageFileName{}; + private : std::string m_ImageFileName{}; float m_SliceLocation{}; int m_SliceOffset{}; int m_EchoNumber{};