From a416917ca6d03dd87c672e553ccb7e0424cc2930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sun, 18 Dec 2022 18:55:46 -0500 Subject: [PATCH] DOC: Fix unbalanced grouping commands Doxygen warnings Fix unbalanced grouping commands Doxygen warnings. Fixes: ``` Modules/Core/Common/include/itkAutoPointer.h:261: warning: unbalanced grouping commands ``` warnings across classes. The warning is raised when the Utilities/Doxygen/itkdoxygen.pl Doxygen Perl script processes the files at issue and starts a `/**@{` block that gets interrupted by an unexpected symbol (e.g. a brace) without being previously closed with the corresponding `/**@}*/` ending token. Raised for example in: https://open.cdash.org/viewBuildError.php?type=1&buildid=8344134 --- Modules/Core/Common/include/itkAutoPointer.h | 1 + .../include/itkBSplineDerivativeKernelFunction.h | 1 + .../include/itkBSplineInterpolationWeightFunction.h | 1 + .../Core/Common/include/itkBSplineKernelFunction.h | 1 + .../Common/include/itkBackwardDifferenceOperator.h | 1 + .../itkBufferedImageNeighborhoodPixelAccessPolicy.h | 1 + Modules/Core/Common/include/itkCommonEnums.h | 1 + .../include/itkConnectedImageNeighborhoodShape.h | 3 ++- ...nstantBoundaryImageNeighborhoodPixelAccessPolicy.h | 2 +- Modules/Core/Common/include/itkContinuousIndex.h | 1 + Modules/Core/Common/include/itkCovariantVector.h | 1 + .../Common/include/itkDefaultConvertPixelTraits.h | 1 + .../include/itkExtractImageFilterRegionCopier.h | 1 + Modules/Core/Common/include/itkFixedArray.h | 1 + .../Common/include/itkForwardDifferenceOperator.h | 1 + Modules/Core/Common/include/itkImageIterator.h | 1 + .../Core/Common/include/itkImageIteratorWithIndex.h | 1 + .../Common/include/itkImageLinearIteratorWithIndex.h | 1 + .../Common/include/itkImageRandomIteratorWithIndex.h | 1 + .../itkImageRandomNonRepeatingIteratorWithIndex.h | 1 + .../include/itkImageRegionConstIteratorWithIndex.h | 1 + .../itkImageRegionConstIteratorWithOnlyIndex.h | 1 + .../itkImageRegionExclusionIteratorWithIndex.h | 1 + Modules/Core/Common/include/itkImageRegionIterator.h | 1 + .../Common/include/itkImageRegionIteratorWithIndex.h | 1 + .../Common/include/itkImageRegionReverseIterator.h | 1 + Modules/Core/Common/include/itkImageReverseIterator.h | 1 + .../Core/Common/include/itkImageScanlineIterator.h | 1 + Modules/Core/Common/include/itkImageSink.h | 1 + .../Common/include/itkImageSliceIteratorWithIndex.h | 1 + Modules/Core/Common/include/itkMemoryUsageObserver.h | 11 +++++++++++ Modules/Core/Common/include/itkMultiThreaderBase.h | 1 + Modules/Core/Common/include/itkNeighborhoodIterator.h | 1 + .../Core/Common/include/itkOrientationAdapterBase.h | 1 + .../Common/include/itkPeriodicBoundaryCondition.h | 1 + Modules/Core/Common/include/itkPoint.h | 1 + ...hapedFloodFilledFunctionConditionalConstIterator.h | 1 + .../Common/include/itkShapedImageNeighborhoodRange.h | 1 + .../Core/Common/include/itkSymmetricEigenAnalysis.h | 1 + ...eroFluxNeumannImageNeighborhoodPixelAccessPolicy.h | 1 + .../Core/GPUCommon/include/itkGPUInPlaceImageFilter.h | 1 + Modules/Core/Mesh/include/itkMesh.h | 1 + .../include/itkQuadEdgeMeshFrontIterator.h | 4 ++++ Modules/Core/SpatialObjects/include/itkMetaEvent.h | 1 + .../Core/SpatialObjects/include/itkSpatialObject.h | 1 + .../include/itkElasticBodySplineKernelTransform.h | 1 + .../include/itkNormalizedCorrelationImageFilter.h | 1 + .../include/itkReflectiveImageRegionIterator.h | 2 ++ .../ImageCompose/include/itkJoinImageFilter.h | 2 ++ .../ImageFeature/include/itkZeroCrossingImageFilter.h | 1 + .../ImageFilterBase/include/itkNoiseImageFilter.h | 1 + .../itkAdaptiveHistogramEqualizationImageFilter.h | 1 + Modules/Filtering/Path/include/itkParametricPath.h | 1 + .../Path/include/itkPathAndImageToPathFilter.h | 1 + Modules/Filtering/Path/include/itkPathToPathFilter.h | 1 + .../include/itkNormalQuadEdgeMeshFilter.h | 1 + .../Smoothing/include/itkMedianImageFilter.h | 1 + Modules/IO/GDCM/include/itkGDCMImageIO.h | 1 + Modules/IO/ImageBase/include/itkImageFileWriter.h | 1 + Modules/IO/ImageBase/include/itkImageSeriesWriter.h | 1 + Modules/IO/JPEG2000/include/itkJPEG2000ImageIO.h | 2 ++ .../IO/MeshBase/include/itkMeshConvertPixelTraits.h | 1 + .../IO/TransformBase/include/itkTransformFileReader.h | 2 ++ .../Optimizersv4/include/itkLBFGS2Optimizerv4.h | 1 + .../include/itkObjectToObjectOptimizerBase.h | 1 + .../Statistics/include/itkSampleToSubsampleFilter.h | 1 + .../include/itkMatchCardinalityImageToImageMetric.h | 1 + .../include/itkDefaultImageToImageMetricTraitsv4.h | 1 + .../Metricsv4/include/itkImageToImageMetricv4.h | 1 + ...mageToImageMetricv4GetValueAndDerivativeThreader.h | 2 ++ ...ToImageMetricv4GetValueAndDerivativeThreaderBase.h | 2 ++ .../include/itkCannySegmentationLevelSetFunction.h | 1 + .../itkIsotropicFourthOrderLevelSetImageFilter.h | 1 + .../include/itkUnsharpMaskLevelSetImageFilter.h | 1 + .../include/itkBinaryImageToLevelSetImageAdaptor.h | 1 + .../include/itkLevelSetEquationLaplacianTerm.h | 1 + .../include/itkLevelSetEquationPropagationTerm.h | 1 + .../Watersheds/include/itkWatershedSegmentTable.h | 2 ++ 78 files changed, 99 insertions(+), 2 deletions(-) diff --git a/Modules/Core/Common/include/itkAutoPointer.h b/Modules/Core/Common/include/itkAutoPointer.h index 181ed18e829..36042339da4 100644 --- a/Modules/Core/Common/include/itkAutoPointer.h +++ b/Modules/Core/Common/include/itkAutoPointer.h @@ -254,6 +254,7 @@ TransferAutoPointer(TAutoPointerBase & pa, TAutoPointerDerived & pb) pb.ReleaseOwnership(); // pb Release Ownership and clears } } + } // end namespace itk #endif diff --git a/Modules/Core/Common/include/itkBSplineDerivativeKernelFunction.h b/Modules/Core/Common/include/itkBSplineDerivativeKernelFunction.h index 02a6dd60b70..91890fa63fb 100644 --- a/Modules/Core/Common/include/itkBSplineDerivativeKernelFunction.h +++ b/Modules/Core/Common/include/itkBSplineDerivativeKernelFunction.h @@ -186,6 +186,7 @@ class ITK_TEMPLATE_EXPORT BSplineDerivativeKernelFunction : public KernelFunctio itkGenericExceptionMacro("Evaluate not implemented for spline order " << SplineOrder); } }; + } // end namespace itk #endif diff --git a/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h b/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h index f62281684f1..7b4cff4571a 100644 --- a/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h +++ b/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h @@ -122,6 +122,7 @@ class ITK_TEMPLATE_EXPORT BSplineInterpolationWeightFunction BSplineInterpolationWeightFunction() = default; ~BSplineInterpolationWeightFunction() override = default; }; + } // end namespace itk #ifndef ITK_MANUAL_INSTANTIATION diff --git a/Modules/Core/Common/include/itkBSplineKernelFunction.h b/Modules/Core/Common/include/itkBSplineKernelFunction.h index 7ec44365e58..094d5d85a8a 100644 --- a/Modules/Core/Common/include/itkBSplineKernelFunction.h +++ b/Modules/Core/Common/include/itkBSplineKernelFunction.h @@ -180,6 +180,7 @@ class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBaseFillCenteredDirectional(coeff); } }; + } // namespace itk #ifndef ITK_MANUAL_INSTANTIATION diff --git a/Modules/Core/Common/include/itkBufferedImageNeighborhoodPixelAccessPolicy.h b/Modules/Core/Common/include/itkBufferedImageNeighborhoodPixelAccessPolicy.h index 55d7cdab007..94be5a1fed7 100644 --- a/Modules/Core/Common/include/itkBufferedImageNeighborhoodPixelAccessPolicy.h +++ b/Modules/Core/Common/include/itkBufferedImageNeighborhoodPixelAccessPolicy.h @@ -126,6 +126,7 @@ class BufferedImageNeighborhoodPixelAccessPolicy final { m_NeighborhoodAccessor.Set(imageBufferPointer + m_PixelIndexValue, pixelValue); } + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkCommonEnums.h b/Modules/Core/Common/include/itkCommonEnums.h index 0ae3626ec99..f46e0b2002c 100644 --- a/Modules/Core/Common/include/itkCommonEnums.h +++ b/Modules/Core/Common/include/itkCommonEnums.h @@ -164,6 +164,7 @@ using IOFileModeType = CommonEnums::IOFileMode; using IOByteOrderType = CommonEnums::IOByteOrder; using CellGeometryType = CommonEnums::CellGeometry; #endif + // Define how to print enumeration extern ITKCommon_EXPORT std::ostream & operator<<(std::ostream & out, IOPixelEnum value); diff --git a/Modules/Core/Common/include/itkConnectedImageNeighborhoodShape.h b/Modules/Core/Common/include/itkConnectedImageNeighborhoodShape.h index 8a6020df44a..b1eaeceb739 100644 --- a/Modules/Core/Common/include/itkConnectedImageNeighborhoodShape.h +++ b/Modules/Core/Common/include/itkConnectedImageNeighborhoodShape.h @@ -83,6 +83,7 @@ namespace itk * \ingroup ImageIterators * \ingroup ITKCommon */ + template class ConnectedImageNeighborhoodShape { @@ -247,8 +248,8 @@ class ConnectedImageNeighborhoodShape { return (includeCenterPixel ? 1 : 0) + CalculateNumberOfConnectedNeighbors(maximumCityblockDistance); } -}; +}; /** Generates the offsets for a connected image neighborhood shape. */ template diff --git a/Modules/Core/Common/include/itkConstantBoundaryImageNeighborhoodPixelAccessPolicy.h b/Modules/Core/Common/include/itkConstantBoundaryImageNeighborhoodPixelAccessPolicy.h index e455ecbf35e..d2aa46b5af7 100644 --- a/Modules/Core/Common/include/itkConstantBoundaryImageNeighborhoodPixelAccessPolicy.h +++ b/Modules/Core/Common/include/itkConstantBoundaryImageNeighborhoodPixelAccessPolicy.h @@ -144,8 +144,8 @@ class ConstantBoundaryImageNeighborhoodPixelAccessPolicy final m_NeighborhoodAccessor.Set(imageBufferPointer + m_PixelIndexValue, pixelValue); } } -}; +}; } // namespace itk diff --git a/Modules/Core/Common/include/itkContinuousIndex.h b/Modules/Core/Common/include/itkContinuousIndex.h index 1028a9d8933..9effa7f3a90 100644 --- a/Modules/Core/Common/include/itkContinuousIndex.h +++ b/Modules/Core/Common/include/itkContinuousIndex.h @@ -90,6 +90,7 @@ class ITK_TEMPLATE_EXPORT ContinuousIndex : public Point(index[i]); } } + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkCovariantVector.h b/Modules/Core/Common/include/itkCovariantVector.h index 790534fbd8c..832f351a93e 100644 --- a/Modules/Core/Common/include/itkCovariantVector.h +++ b/Modules/Core/Common/include/itkCovariantVector.h @@ -257,6 +257,7 @@ class ITK_TEMPLATE_EXPORT CovariantVector : public FixedArray(pa[i]); } } + }; /** Premultiply Operator for product of a vector and a scalar. diff --git a/Modules/Core/Common/include/itkDefaultConvertPixelTraits.h b/Modules/Core/Common/include/itkDefaultConvertPixelTraits.h index 76a5fbc262a..b9b3cf842a2 100644 --- a/Modules/Core/Common/include/itkDefaultConvertPixelTraits.h +++ b/Modules/Core/Common/include/itkDefaultConvertPixelTraits.h @@ -77,6 +77,7 @@ class ITK_TEMPLATE_EXPORT DefaultConvertPixelTraits { return pixel.GetScalarValue(); } + }; #define ITK_DEFAULTCONVERTTRAITS_NATIVE_SPECIAL(type) \ diff --git a/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h b/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h index 227986d5b4e..393cbfe5c9e 100644 --- a/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h +++ b/Modules/Core/Common/include/itkExtractImageFilterRegionCopier.h @@ -155,6 +155,7 @@ class ITK_TEMPLATE_EXPORT ExtractImageFilterRegionCopier : public ImageRegionCop { ImageRegionCopier::operator()(destRegion, srcRegion); } + }; } // end namespace ImageToImageFilterDetail } // end namespace itk diff --git a/Modules/Core/Common/include/itkFixedArray.h b/Modules/Core/Common/include/itkFixedArray.h index 4727902d4fb..b2aadf14979 100644 --- a/Modules/Core/Common/include/itkFixedArray.h +++ b/Modules/Core/Common/include/itkFixedArray.h @@ -459,6 +459,7 @@ class ITK_TEMPLATE_EXPORT FixedArray { return MakeFilled(value); } + }; template diff --git a/Modules/Core/Common/include/itkForwardDifferenceOperator.h b/Modules/Core/Common/include/itkForwardDifferenceOperator.h index 966ebafd5a5..8726869eff4 100644 --- a/Modules/Core/Common/include/itkForwardDifferenceOperator.h +++ b/Modules/Core/Common/include/itkForwardDifferenceOperator.h @@ -71,6 +71,7 @@ class ITK_TEMPLATE_EXPORT ForwardDifferenceOperator : public NeighborhoodOperato { this->FillCenteredDirectional(coeff); } + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkImageIterator.h b/Modules/Core/Common/include/itkImageIterator.h index d388694dbe1..880fba35676 100644 --- a/Modules/Core/Common/include/itkImageIterator.h +++ b/Modules/Core/Common/include/itkImageIterator.h @@ -137,6 +137,7 @@ class ITK_TEMPLATE_EXPORT ImageIterator : public ImageConstIterator ImageIterator(const ImageConstIterator & it); Self & operator=(const ImageConstIterator & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageIteratorWithIndex.h b/Modules/Core/Common/include/itkImageIteratorWithIndex.h index 66e0e27589c..fb28757f8df 100644 --- a/Modules/Core/Common/include/itkImageIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageIteratorWithIndex.h @@ -127,6 +127,7 @@ class ITK_TEMPLATE_EXPORT ImageIteratorWithIndex : public ImageConstIteratorWith ImageIteratorWithIndex(const ImageConstIteratorWithIndex & it); Self & operator=(const ImageConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageLinearIteratorWithIndex.h b/Modules/Core/Common/include/itkImageLinearIteratorWithIndex.h index e87eb1f7c67..21acead9c7b 100644 --- a/Modules/Core/Common/include/itkImageLinearIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageLinearIteratorWithIndex.h @@ -120,6 +120,7 @@ class ITK_TEMPLATE_EXPORT ImageLinearIteratorWithIndex : public ImageLinearConst ImageLinearIteratorWithIndex(const ImageLinearConstIteratorWithIndex & it); Self & operator=(const ImageLinearConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRandomIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRandomIteratorWithIndex.h index 6aaf414628e..d81ee052a90 100644 --- a/Modules/Core/Common/include/itkImageRandomIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRandomIteratorWithIndex.h @@ -120,6 +120,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomIteratorWithIndex : public ImageRandomConst ImageRandomIteratorWithIndex(const ImageRandomConstIteratorWithIndex & it); Self & operator=(const ImageRandomConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRandomNonRepeatingIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRandomNonRepeatingIteratorWithIndex.h index e867a17a696..3c0d26e339c 100644 --- a/Modules/Core/Common/include/itkImageRandomNonRepeatingIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRandomNonRepeatingIteratorWithIndex.h @@ -132,6 +132,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomNonRepeatingIteratorWithIndex ImageRandomNonRepeatingIteratorWithIndex(const ImageRandomNonRepeatingConstIteratorWithIndex & it); Self & operator=(const ImageRandomNonRepeatingConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionConstIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRegionConstIteratorWithIndex.h index 326df56e92d..02a6dc879fe 100644 --- a/Modules/Core/Common/include/itkImageRegionConstIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRegionConstIteratorWithIndex.h @@ -191,6 +191,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionConstIteratorWithIndex : public ImageConstI * \sa operator++ */ Self & operator--(); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionConstIteratorWithOnlyIndex.h b/Modules/Core/Common/include/itkImageRegionConstIteratorWithOnlyIndex.h index 34a349a1665..5d25558ba8f 100644 --- a/Modules/Core/Common/include/itkImageRegionConstIteratorWithOnlyIndex.h +++ b/Modules/Core/Common/include/itkImageRegionConstIteratorWithOnlyIndex.h @@ -187,6 +187,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionConstIteratorWithOnlyIndex : public ImageCo * \sa operator++ */ Self & operator--(); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionExclusionIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRegionExclusionIteratorWithIndex.h index 0866a3f3064..28de8ea3b54 100644 --- a/Modules/Core/Common/include/itkImageRegionExclusionIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRegionExclusionIteratorWithIndex.h @@ -121,6 +121,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionExclusionIteratorWithIndex ImageRegionExclusionIteratorWithIndex(const ImageRegionExclusionConstIteratorWithIndex & it); Self & operator=(const ImageRegionExclusionConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionIterator.h b/Modules/Core/Common/include/itkImageRegionIterator.h index 7f484dc3898..d6f5ed8acc8 100644 --- a/Modules/Core/Common/include/itkImageRegionIterator.h +++ b/Modules/Core/Common/include/itkImageRegionIterator.h @@ -133,6 +133,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionIterator : public ImageRegionConstIterator< ImageRegionIterator(const ImageRegionConstIterator & it); Self & operator=(const ImageRegionConstIterator & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRegionIteratorWithIndex.h index d533998a6e5..9895e8de9bc 100644 --- a/Modules/Core/Common/include/itkImageRegionIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRegionIteratorWithIndex.h @@ -126,6 +126,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionIteratorWithIndex : public ImageRegionConst ImageRegionIteratorWithIndex(const ImageRegionConstIteratorWithIndex & it); Self & operator=(const ImageRegionConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRegionReverseIterator.h b/Modules/Core/Common/include/itkImageRegionReverseIterator.h index 1ac655fcf1d..5db06f199ae 100644 --- a/Modules/Core/Common/include/itkImageRegionReverseIterator.h +++ b/Modules/Core/Common/include/itkImageRegionReverseIterator.h @@ -122,6 +122,7 @@ class ITK_TEMPLATE_EXPORT ImageRegionReverseIterator : public ImageRegionReverse ImageRegionReverseIterator(const ImageRegionReverseConstIterator & it); Self & operator=(const ImageRegionReverseConstIterator & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageReverseIterator.h b/Modules/Core/Common/include/itkImageReverseIterator.h index 40eed13c7d2..6f431a4ca83 100644 --- a/Modules/Core/Common/include/itkImageReverseIterator.h +++ b/Modules/Core/Common/include/itkImageReverseIterator.h @@ -118,6 +118,7 @@ class ITK_TEMPLATE_EXPORT ImageReverseIterator : public ImageRegionReverseConstI ImageReverseIterator(const ImageRegionReverseConstIterator & it); Self & operator=(const ImageRegionReverseConstIterator & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageScanlineIterator.h b/Modules/Core/Common/include/itkImageScanlineIterator.h index 50104fd5057..366f683de62 100644 --- a/Modules/Core/Common/include/itkImageScanlineIterator.h +++ b/Modules/Core/Common/include/itkImageScanlineIterator.h @@ -95,6 +95,7 @@ class ITK_TEMPLATE_EXPORT ImageScanlineIterator : public ImageScanlineConstItera ImageScanlineIterator(const ImageScanlineConstIterator & it); Self & operator=(const ImageScanlineConstIterator & it); + }; // Deduction guide for class template argument deduction (CTAD). diff --git a/Modules/Core/Common/include/itkImageSink.h b/Modules/Core/Common/include/itkImageSink.h index ee14040534e..ba3b78c83a6 100644 --- a/Modules/Core/Common/include/itkImageSink.h +++ b/Modules/Core/Common/include/itkImageSink.h @@ -198,6 +198,7 @@ class ImageSink */ double m_CoordinateTolerance{ Self::GetGlobalDefaultCoordinateTolerance() }; double m_DirectionTolerance{ Self::GetGlobalDefaultDirectionTolerance() }; + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkImageSliceIteratorWithIndex.h b/Modules/Core/Common/include/itkImageSliceIteratorWithIndex.h index 38f86e4ddc2..af6b304e322 100644 --- a/Modules/Core/Common/include/itkImageSliceIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageSliceIteratorWithIndex.h @@ -122,6 +122,7 @@ class ITK_TEMPLATE_EXPORT ImageSliceIteratorWithIndex : public ImageSliceConstIt ImageSliceIteratorWithIndex(const ImageSliceConstIteratorWithIndex & it); Self & operator=(const ImageSliceConstIteratorWithIndex & it); + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkMemoryUsageObserver.h b/Modules/Core/Common/include/itkMemoryUsageObserver.h index f1c7ca2b895..12b0c62190c 100644 --- a/Modules/Core/Common/include/itkMemoryUsageObserver.h +++ b/Modules/Core/Common/include/itkMemoryUsageObserver.h @@ -87,8 +87,10 @@ class ITKCommon_EXPORT LinuxMemoryUsageObserver : public MemoryUsageObserverBase public: /** destructor */ ~LinuxMemoryUsageObserver() override; + MemoryLoadType GetMemoryUsage() override; + }; #endif // __linux__ @@ -98,8 +100,10 @@ class ITKCommon_EXPORT MacOSXMemoryUsageObserver : public MemoryUsageObserverBas public: /** destructor */ ~MacOSXMemoryUsageObserver() override; + MemoryLoadType GetMemoryUsage() override; + }; #endif // Mac OS X @@ -109,8 +113,10 @@ class ITKCommon_EXPORT SunSolarisMemoryUsageObserver : public MemoryUsageObserve public: /** destructor */ virtual ~SunSolarisMemoryUsageObserver(); + virtual MemoryLoadType GetMemoryUsage(); + }; #endif // Sun Solaris @@ -120,8 +126,10 @@ class ITKCommon_EXPORT SysResourceMemoryUsageObserver : public MemoryUsageObserv public: /** destructor */ ~SysResourceMemoryUsageObserver() override; + MemoryLoadType GetMemoryUsage() override; + }; # if defined(ITK_HAS_MALLINFO) || defined(ITK_HAS_MALLINFO2) @@ -134,9 +142,12 @@ class ITKCommon_EXPORT MallinfoMemoryUsageObserver : public MemoryUsageObserverB public: /** destructor */ ~MallinfoMemoryUsageObserver() override; + MemoryLoadType GetMemoryUsage() override; + }; + # endif // Mallinfo #endif // !defined(WIN32) && !defined(_WIN32) diff --git a/Modules/Core/Common/include/itkMultiThreaderBase.h b/Modules/Core/Common/include/itkMultiThreaderBase.h index 4af5bf37ceb..413b2afec4e 100644 --- a/Modules/Core/Common/include/itkMultiThreaderBase.h +++ b/Modules/Core/Common/include/itkMultiThreaderBase.h @@ -263,6 +263,7 @@ INTEL_PRAGMA_WARN_POP STD_EXCEPTION, UNKNOWN } ThreadExitCode; + }; // clang-format off ITK_GCC_PRAGMA_DIAG_POP() diff --git a/Modules/Core/Common/include/itkNeighborhoodIterator.h b/Modules/Core/Common/include/itkNeighborhoodIterator.h index b29c13077b9..11e1535ecc3 100644 --- a/Modules/Core/Common/include/itkNeighborhoodIterator.h +++ b/Modules/Core/Common/include/itkNeighborhoodIterator.h @@ -328,6 +328,7 @@ class ITK_TEMPLATE_EXPORT NeighborhoodIterator : public ConstNeighborhoodIterato { this->SetPixel(this->GetCenterNeighborhoodIndex() - this->GetStride(axis), v); } + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkOrientationAdapterBase.h b/Modules/Core/Common/include/itkOrientationAdapterBase.h index 52c64ae2652..87f703b9aca 100644 --- a/Modules/Core/Common/include/itkOrientationAdapterBase.h +++ b/Modules/Core/Common/include/itkOrientationAdapterBase.h @@ -64,6 +64,7 @@ class ITK_TEMPLATE_EXPORT [[deprecated("Since ITK 5.3 use SpatialOrientationAdap /** destructor, to silence "virtual class has non-virtual destructor()" warnings */ virtual ~OrientationAdapterBase() = default; + }; } // namespace itk #else // ITK_LEGACY_REMOVE diff --git a/Modules/Core/Common/include/itkPeriodicBoundaryCondition.h b/Modules/Core/Common/include/itkPeriodicBoundaryCondition.h index 1cce746060a..245bbf5cf83 100644 --- a/Modules/Core/Common/include/itkPeriodicBoundaryCondition.h +++ b/Modules/Core/Common/include/itkPeriodicBoundaryCondition.h @@ -105,6 +105,7 @@ class ITK_TEMPLATE_EXPORT PeriodicBoundaryCondition : public ImageBoundaryCondit */ OutputPixelType GetPixel(const IndexType & index, const TInputImage * image) const override; + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkPoint.h b/Modules/Core/Common/include/itkPoint.h index 3ab23f83a0d..3af2661fae5 100644 --- a/Modules/Core/Common/include/itkPoint.h +++ b/Modules/Core/Common/include/itkPoint.h @@ -123,6 +123,7 @@ class ITK_TEMPLATE_EXPORT Point : public FixedArray & i // Apply it eigenVectors = eigenVectors * perm; } + } // end namespace detail /** \class SymmetricEigenAnalysisEnums diff --git a/Modules/Core/Common/include/itkZeroFluxNeumannImageNeighborhoodPixelAccessPolicy.h b/Modules/Core/Common/include/itkZeroFluxNeumannImageNeighborhoodPixelAccessPolicy.h index 0237e55f302..88c4bd0b39d 100644 --- a/Modules/Core/Common/include/itkZeroFluxNeumannImageNeighborhoodPixelAccessPolicy.h +++ b/Modules/Core/Common/include/itkZeroFluxNeumannImageNeighborhoodPixelAccessPolicy.h @@ -124,6 +124,7 @@ class ZeroFluxNeumannImageNeighborhoodPixelAccessPolicy final { m_NeighborhoodAccessor.Set(imageBufferPointer + m_PixelIndexValue, pixelValue); } + }; } // namespace itk diff --git a/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.h b/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.h index 4ebdc2c74ed..bf3b905455e 100644 --- a/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.h +++ b/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.h @@ -102,6 +102,7 @@ class ITK_TEMPLATE_EXPORT GPUInPlaceImageFilter * \sa ProcessObject::ReleaseInputs() */ void ReleaseInputs() override; + }; } // end namespace itk diff --git a/Modules/Core/Mesh/include/itkMesh.h b/Modules/Core/Mesh/include/itkMesh.h index 1317e8f1f1a..55348fa9655 100644 --- a/Modules/Core/Mesh/include/itkMesh.h +++ b/Modules/Core/Mesh/include/itkMesh.h @@ -280,6 +280,7 @@ class ITK_TEMPLATE_EXPORT Mesh : public PointSetm_CurrentEdge); } + }; /** diff --git a/Modules/Core/SpatialObjects/include/itkMetaEvent.h b/Modules/Core/SpatialObjects/include/itkMetaEvent.h index a901d8ff716..b3e0284073a 100644 --- a/Modules/Core/SpatialObjects/include/itkMetaEvent.h +++ b/Modules/Core/SpatialObjects/include/itkMetaEvent.h @@ -44,6 +44,7 @@ class ITKSpatialObjects_EXPORT MetaEvent : public ::MetaEvent MetaEvent(); ~MetaEvent() override; }; + } // end namespace itk #endif diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSpatialObject.h index d3ccea8936c..1b3b964d1b4 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSpatialObject.h @@ -683,6 +683,7 @@ class ITK_TEMPLATE_EXPORT SpatialObject : public DataObject { return IsInsideInObjectSpace(point, depth, name); } + #endif protected: diff --git a/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h b/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h index 56b553ea3b6..fc9da5d0b0a 100644 --- a/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h +++ b/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h @@ -109,6 +109,7 @@ class ITK_TEMPLATE_EXPORT ElasticBodySplineKernelTransform : public KernelTransf * \f$ \alpha = 12 ( 1 - \nu ) - 1\f$ */ TParametersValueType m_Alpha{}; + }; } // namespace itk diff --git a/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h b/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h index 64fb503abf8..a1cfd1a9651 100644 --- a/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h +++ b/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h @@ -163,6 +163,7 @@ class ITK_TEMPLATE_EXPORT NormalizedCorrelationImageFilter { Superclass::PrintSelf(os, indent); } + }; } // end namespace itk diff --git a/Modules/Filtering/DistanceMap/include/itkReflectiveImageRegionIterator.h b/Modules/Filtering/DistanceMap/include/itkReflectiveImageRegionIterator.h index acc969fce9f..9cbba9fbc9f 100644 --- a/Modules/Filtering/DistanceMap/include/itkReflectiveImageRegionIterator.h +++ b/Modules/Filtering/DistanceMap/include/itkReflectiveImageRegionIterator.h @@ -99,8 +99,10 @@ class ITK_TEMPLATE_EXPORT ReflectiveImageRegionIterator : public ReflectiveImage /** the construction from a const iterator is declared protected in order to enforce const correctness. */ ReflectiveImageRegionIterator(const ReflectiveImageRegionConstIterator & it); + Self & operator=(const ReflectiveImageRegionConstIterator & it); + }; } // end namespace itk diff --git a/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h b/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h index 62de68a5bb7..cbddd2d959d 100644 --- a/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h +++ b/Modules/Filtering/ImageCompose/include/itkJoinImageFilter.h @@ -48,6 +48,7 @@ template class JoinFunctor { public: + /** Standard type alias */ using Self = JoinFunctor; @@ -160,6 +161,7 @@ class JoinFunctor { out[idx] = static_cast(B); } + }; // class JoinFunction template diff --git a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h index 7005679ce29..ca552716589 100644 --- a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h @@ -141,6 +141,7 @@ class ITK_TEMPLATE_EXPORT ZeroCrossingImageFilter : public ImageToImageFilterModified(); } } + itkGetConstMacro(UseLookupTable, bool); itkBooleanMacro(UseLookupTable); #endif diff --git a/Modules/Filtering/Path/include/itkParametricPath.h b/Modules/Filtering/Path/include/itkParametricPath.h index 53212cd468a..7b01bb6289b 100644 --- a/Modules/Filtering/Path/include/itkParametricPath.h +++ b/Modules/Filtering/Path/include/itkParametricPath.h @@ -139,6 +139,7 @@ class ITK_TEMPLATE_EXPORT ParametricPath * constructor of all instantiable children. Values set in child constructors * overwrite values set in parent constructors. */ InputType m_DefaultInputStepSize{}; + }; } // namespace itk diff --git a/Modules/Filtering/Path/include/itkPathAndImageToPathFilter.h b/Modules/Filtering/Path/include/itkPathAndImageToPathFilter.h index cb24cb19052..e8b3cf900bc 100644 --- a/Modules/Filtering/Path/include/itkPathAndImageToPathFilter.h +++ b/Modules/Filtering/Path/include/itkPathAndImageToPathFilter.h @@ -105,6 +105,7 @@ class ITK_TEMPLATE_EXPORT PathAndImageToPathFilter : public PathToPathFilter * \sa ProcessObject::GenerateInputRequestedRegion() */ void GenerateInputRequestedRegion() override; + }; } // end namespace itk diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h index 126943c349b..e286fccdef8 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h @@ -194,6 +194,7 @@ class ITK_TEMPLATE_EXPORT NormalQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd */ void GenerateData() override; + }; } // namespace itk diff --git a/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h b/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h index b71ca2e3da7..72639219983 100644 --- a/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h @@ -104,6 +104,7 @@ class ITK_TEMPLATE_EXPORT MedianImageFilter : public BoxImageFilter)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); + }; } // end namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h index 5219150ebc0..220bde4eec2 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h @@ -871,6 +871,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4 using MovingImagePixelValueType = typename PixelTraits::ValueType; itkConceptMacro(OnlyDefinedForFloatingPointTypes0, (itk::Concept::IsFloatingPoint)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); + }; } // namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h index d12ea1c964e..20bf6ac1919 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h @@ -120,6 +120,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4GetValueAndDerivativeThreader< { return this->m_CachedNumberOfLocalParameters; } + }; /** \class ImageToImageMetricv4GetValueAndDerivativeThreader @@ -195,6 +196,7 @@ class ITK_TEMPLATE_EXPORT { return this->m_CachedNumberOfLocalParameters; } + }; } // end namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreaderBase.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreaderBase.h index 830495ff0ec..8287cb192e2 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreaderBase.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreaderBase.h @@ -186,7 +186,9 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4GetValueAndDerivativeThreaderBase * classes for efficiency. */ JacobianType MovingTransformJacobian; JacobianType MovingTransformJacobianPositional; + }; + itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, GetValueAndDerivativePerThreadStruct, PaddedGetValueAndDerivativePerThreadStruct); diff --git a/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetFunction.h b/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetFunction.h index 73d2e88f1b2..2daf55ab199 100644 --- a/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetFunction.h +++ b/Modules/Segmentation/LevelSets/include/itkCannySegmentationLevelSetFunction.h @@ -156,6 +156,7 @@ class ITK_TEMPLATE_EXPORT CannySegmentationLevelSetFunction { m_Canny->SetInput(feature); } + }; } // end namespace itk diff --git a/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h index c8f809190c2..aa011af5ce4 100644 --- a/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h @@ -125,6 +125,7 @@ class ITK_TEMPLATE_EXPORT IsotropicFourthOrderLevelSetImageFilter return false; } + }; } // end namespace itk diff --git a/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h index 481a5f771d2..291cca403b0 100644 --- a/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h @@ -118,6 +118,7 @@ class ITK_TEMPLATE_EXPORT UnsharpMaskLevelSetImageFilter return false; } + }; } // end namespace itk diff --git a/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h b/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h index ec0f49524c6..8e356f454ab 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h @@ -267,6 +267,7 @@ class ITK_TEMPLATE_EXPORT /** Fill layers adjacent to the zero level set (i.e. layer -1 and +1 )*/ void FindPlusOneMinusOneLayer(); + }; //////////////////////////////////////////////////////////////////////////////// diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h index 80c7527bc84..b6407ba59c0 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h @@ -128,6 +128,7 @@ class ITK_TEMPLATE_EXPORT LevelSetEquationLaplacianTerm : public LevelSetEquatio * \f$ \omega_i( p ) \f$. */ LevelSetOutputRealType Value(const LevelSetInputIndexType & iP, const LevelSetDataType & iData) override; + }; } // namespace itk diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h index 4f754007e0d..bfde243d7e1 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h @@ -137,6 +137,7 @@ class ITK_TEMPLATE_EXPORT LevelSetEquationPropagationTerm : public LevelSetEquat Value(const LevelSetInputIndexType & iP) override; LevelSetOutputRealType Value(const LevelSetInputIndexType & iP, const LevelSetDataType & iData) override; + }; } // namespace itk diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h index df96b02f8fa..21ed1844c3e 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTable.h @@ -67,6 +67,7 @@ class ITK_TEMPLATE_EXPORT SegmentTable : public DataObject : label(l) , height(s) {} + IdentifierType label; ScalarType height; @@ -81,6 +82,7 @@ class ITK_TEMPLATE_EXPORT SegmentTable : public DataObject return false; } + }; /** Structure for storing lists of adjacencies (edges) and their