diff --git a/Modules/Core/Common/include/itkAutoPointer.h b/Modules/Core/Common/include/itkAutoPointer.h index aa3abf945ee..ebba56c2fcf 100644 --- a/Modules/Core/Common/include/itkAutoPointer.h +++ b/Modules/Core/Common/include/itkAutoPointer.h @@ -250,6 +250,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 4da2b65cb10..18c1312a431 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 91c9be76411..fe028412dad 100644 --- a/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h +++ b/Modules/Core/Common/include/itkBSplineInterpolationWeightFunction.h @@ -116,6 +116,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 63dbd17b2ae..c65ae556fae 100644 --- a/Modules/Core/Common/include/itkBSplineKernelFunction.h +++ b/Modules/Core/Common/include/itkBSplineKernelFunction.h @@ -182,6 +182,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 0c982185a90..34c0f48076e 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 19eb29a0a12..1c81c1eedbb 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 { @@ -246,8 +247,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 a322baeec21..159479e6f9b 100644 --- a/Modules/Core/Common/include/itkContinuousIndex.h +++ b/Modules/Core/Common/include/itkContinuousIndex.h @@ -86,6 +86,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 05885d24ec3..dd615827c41 100644 --- a/Modules/Core/Common/include/itkCovariantVector.h +++ b/Modules/Core/Common/include/itkCovariantVector.h @@ -254,6 +254,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 e2e3ccba324..a410a9cb4a3 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 ffd0a4aa626..f4994189a81 100644 --- a/Modules/Core/Common/include/itkFixedArray.h +++ b/Modules/Core/Common/include/itkFixedArray.h @@ -435,6 +435,7 @@ ITK_GCC_PRAGMA_POP { 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 18d6b4f24b4..b89489ea760 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 34f8a527722..620e3e5766f 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 3eb85da1121..9b55aba8870 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 f09f2aad88a..06098ce148b 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 d3fb5a28729..7067c51ee5a 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 37bc0db072c..f0d341ac82d 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 72a420ab090..c94ab7d507d 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 dddf36a837e..c81e1e3e7a9 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 c3da858580f..1853e35444f 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 8b732558d6b..9363c163967 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 c2ea15dfc9a..d1fa3e10f9f 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 56041825b9f..d29123da39f 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 a9aa8043e28..7ce950e065e 100644 --- a/Modules/Core/Common/include/itkMultiThreaderBase.h +++ b/Modules/Core/Common/include/itkMultiThreaderBase.h @@ -260,6 +260,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 626b71ca88c..99fef95d5ab 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 30f47b3b0b8..294dd33c75b 100644 --- a/Modules/Core/Common/include/itkOrientationAdapterBase.h +++ b/Modules/Core/Common/include/itkOrientationAdapterBase.h @@ -62,6 +62,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 acce71b6565..e171fe63ba7 100644 --- a/Modules/Core/Common/include/itkPoint.h +++ b/Modules/Core/Common/include/itkPoint.h @@ -119,6 +119,7 @@ class ITK_TEMPLATE_EXPORT Point : public FixedArray Point(const TPointValueType & v) : BaseArray(v) {} + Point(const ValueType & v) : BaseArray(v) {} diff --git a/Modules/Core/Common/include/itkShapedFloodFilledFunctionConditionalConstIterator.h b/Modules/Core/Common/include/itkShapedFloodFilledFunctionConditionalConstIterator.h index 5d42b304544..6e7e629179d 100644 --- a/Modules/Core/Common/include/itkShapedFloodFilledFunctionConditionalConstIterator.h +++ b/Modules/Core/Common/include/itkShapedFloodFilledFunctionConditionalConstIterator.h @@ -294,6 +294,7 @@ class ITK_TEMPLATE_EXPORT ShapedFloodFilledFunctionConditionalConstIterator : pu * 8 (26 in 3D). */ bool m_FullyConnected{}; + }; } // end namespace itk diff --git a/Modules/Core/Common/include/itkShapedImageNeighborhoodRange.h b/Modules/Core/Common/include/itkShapedImageNeighborhoodRange.h index a6594c22c9b..62f2fbe54e5 100644 --- a/Modules/Core/Common/include/itkShapedImageNeighborhoodRange.h +++ b/Modules/Core/Common/include/itkShapedImageNeighborhoodRange.h @@ -795,6 +795,7 @@ class ShapedImageNeighborhoodRange final m_RelativeLocation = location; SubtractIndex(m_RelativeLocation, m_BufferedRegionData.m_Index); } + }; } // namespace itk diff --git a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h index 7ef6d7077fd..4b547c1a36d 100644 --- a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h +++ b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h @@ -110,6 +110,7 @@ permuteColumnsWithSortIndices(QMatrix & eigenVectors, const std::vector & 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 4f1edf0ae9d..2b785bc4db3 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 03580acfbdf..bb86d1a112d 100644 --- a/Modules/Core/Mesh/include/itkMesh.h +++ b/Modules/Core/Mesh/include/itkMesh.h @@ -276,6 +276,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 063aa62fc39..69915c0ff92 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 c91abfe50d1..0581f945fba 100644 --- a/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h +++ b/Modules/Core/Transform/include/itkElasticBodySplineKernelTransform.h @@ -110,6 +110,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 c02a87aa527..83aa79cd9d7 100644 --- a/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h +++ b/Modules/Filtering/Convolution/include/itkNormalizedCorrelationImageFilter.h @@ -167,6 +167,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 9576841112c..98037e7cc9e 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; @@ -158,6 +159,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 9d173d54b82..f2dd118a9b9 100644 --- a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.h @@ -145,6 +145,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 d7e73d7e04f..4c84679f85e 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkNormalQuadEdgeMeshFilter.h @@ -203,6 +203,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 304a3498822..73cbe2a2730 100644 --- a/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h +++ b/Modules/Filtering/Smoothing/include/itkMedianImageFilter.h @@ -108,6 +108,7 @@ class ITK_TEMPLATE_EXPORT MedianImageFilter : public BoxImageFilterSetNumberOfWorkUnits(number); } itkLegacyMacro(virtual const ThreadIdType & GetNumberOfThreads() const) { return this->m_NumberOfWorkUnits; } + #endif // !ITK_LEGACY_REMOVE /** Get the number of work units set to be used. */ @@ -274,6 +275,7 @@ class ITK_TEMPLATE_EXPORT ObjectToObjectOptimizerBaseTemplate : public Object protected: /** Default constructor */ ObjectToObjectOptimizerBaseTemplate(); + ~ObjectToObjectOptimizerBaseTemplate() override; MetricTypePointer m_Metric{}; diff --git a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h index acc22b28c60..387b4bf1917 100644 --- a/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h +++ b/Modules/Numerics/Statistics/include/itkSampleToSubsampleFilter.h @@ -96,6 +96,7 @@ class ITK_TEMPLATE_EXPORT SampleToSubsampleFilter : public ProcessObject using Superclass::MakeOutput; DataObjectPointer MakeOutput(DataObjectPointerArraySizeType idx) override; + }; // end of class } // end of namespace Statistics } // end of namespace itk diff --git a/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h b/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h index 12a52c711c8..e5805a11326 100644 --- a/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkMatchCardinalityImageToImageMetric.h @@ -185,6 +185,7 @@ class ITK_TEMPLATE_EXPORT MatchCardinalityImageToImageMetric : public ImageToIma /** Support processing data in multiple threads. Used by subclasses * (e.g., ImageSource). */ MultiThreaderBase::Pointer m_Threader{ MultiThreaderBase::New() }; + }; } // end namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h b/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h index c935a05fb2c..5744fa42eaf 100644 --- a/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h +++ b/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h @@ -110,6 +110,7 @@ class DefaultImageToImageMetricTraitsv4 itkConceptMacro(OnlyDefinedForFloatingPointTypes0, (itk::Concept::IsFloatingPoint)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); #endif // ITK_USE_CONCEPT_CHECKING + }; } // end namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h index bd97c52e312..befafbea241 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4.h @@ -469,6 +469,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4 itkLegacyMacro(virtual bool GetUseFixedSampledPointSet() const) { return this->GetUseSampledPointSet(); } itkLegacyMacro(virtual void UseFixedSampledPointSetOn()) { return this->UseSampledPointSetOn(); } itkLegacyMacro(virtual void UseFixedSampledPointSetOff()) { return this->UseSampledPointSetOff(); } + #endif @@ -528,6 +529,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4 this->SetMaximumNumberOfWorkUnits(count); } itkLegacyMacro(virtual ThreadIdType GetMaximumNumberOfThreads() const) { return this->GetMaximumNumberOfWorkUnits(); } + #endif // !ITK_LEGACY_REMOVE @@ -855,6 +857,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4 itkConceptMacro(OnlyDefinedForFloatingPointTypes0, (itk::Concept::IsFloatingPoint)); itkConceptMacro(OnlyDefinedForFloatingPointTypes1, (itk::Concept::IsFloatingPoint)); #endif // ITK_USE_CONCEPT_CHECKING + }; } // namespace itk diff --git a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h index dbf1bddee9e..eb4d1162215 100644 --- a/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h +++ b/Modules/Registration/Metricsv4/include/itkImageToImageMetricv4GetValueAndDerivativeThreader.h @@ -121,6 +121,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4GetValueAndDerivativeThreader< { return this->m_CachedNumberOfLocalParameters; } + }; /** \class ImageToImageMetricv4GetValueAndDerivativeThreader @@ -196,6 +197,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 57ebfdf5664..af724b4888a 100644 --- a/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkIsotropicFourthOrderLevelSetImageFilter.h @@ -127,6 +127,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 b86ee88d9ca..a33637b9b44 100644 --- a/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkUnsharpMaskLevelSetImageFilter.h @@ -120,6 +120,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 3fffab90458..bc9f3ed665e 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkBinaryImageToLevelSetImageAdaptor.h @@ -268,6 +268,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 cd1fb5fb51d..8b3c9f41c8d 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationLaplacianTerm.h @@ -127,6 +127,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 a17140305b4..197b6f5c4af 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationPropagationTerm.h @@ -136,6 +136,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 4720ec31ee2..3fb507dd7ed 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; @@ -83,6 +84,7 @@ class ITK_TEMPLATE_EXPORT SegmentTable : public DataObject return false; } } + }; /** Structure for storing lists of adjacencies (edges) and their