Skip to content

Commit a8743b0

Browse files
committed
STYLE: Declare m_SmoothingFilters as std::array, instead of C array
Increased the consistency of `m_SmoothingFilters` declarations of recursive Gaussian filters. Following pull request #5730 commit 529d8f9 and a837ee5
1 parent 1d529f0 commit a8743b0

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Modules/Filtering/ImageFeature/include/itkLaplacianRecursiveGaussianImageFilter.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "itkRecursiveGaussianImageFilter.h"
2222
#include "itkImage.h"
2323
#include "itkCommand.h"
24+
#include <array>
2425

2526
namespace itk
2627
{
@@ -129,8 +130,8 @@ class ITK_TEMPLATE_EXPORT LaplacianRecursiveGaussianImageFilter : public ImageTo
129130
EnlargeOutputRequestedRegion(DataObject * output) override;
130131

131132
private:
132-
GaussianFilterPointer m_SmoothingFilters[NumberOfSmoothingFilters]{};
133-
DerivativeFilterPointer m_DerivativeFilter{};
133+
std::array<GaussianFilterPointer, NumberOfSmoothingFilters> m_SmoothingFilters{};
134+
DerivativeFilterPointer m_DerivativeFilter{};
134135

135136
/** Normalize the image across scale space */
136137
bool m_NormalizeAcrossScale{};

Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "itkRecursiveGaussianImageFilter.h"
2525
#include "itkSqrtImageFilter.h"
2626
#include "itkBinaryGeneratorImageFilter.h"
27+
#include <array>
2728

2829
namespace itk
2930
{
@@ -161,10 +162,10 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeRecursiveGaussianImageFilter
161162
using SqrSpacingFilterType = BinaryGeneratorImageFilter<RealImageType, RealImageType, RealImageType>;
162163
using SqrSpacingFilterPointer = typename SqrSpacingFilterType::Pointer;
163164

164-
GaussianFilterPointer m_SmoothingFilters[ImageDimension - 1]{};
165-
DerivativeFilterPointer m_DerivativeFilter{};
166-
SqrSpacingFilterPointer m_SqrSpacingFilter{};
167-
SqrtFilterPointer m_SqrtFilter{};
165+
std::array<GaussianFilterPointer, ImageDimension - 1> m_SmoothingFilters{};
166+
DerivativeFilterPointer m_DerivativeFilter{};
167+
SqrSpacingFilterPointer m_SqrSpacingFilter{};
168+
SqrtFilterPointer m_SqrtFilter{};
168169

169170
/** Normalize the image across scale space */
170171
bool m_NormalizeAcrossScale{};

Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "itkImage.h"
2525
#include "itkPixelTraits.h"
2626
#include "itkCommand.h"
27+
#include <array>
2728

2829
namespace itk
2930
{
@@ -167,9 +168,9 @@ class ITK_TEMPLATE_EXPORT SmoothingRecursiveGaussianImageFilter : public InPlace
167168
EnlargeOutputRequestedRegion(DataObject * output) override;
168169

169170
private:
170-
InternalGaussianFilterPointer m_SmoothingFilters[ImageDimension - 1]{};
171-
FirstGaussianFilterPointer m_FirstSmoothingFilter{};
172-
CastingFilterPointer m_CastingFilter{};
171+
std::array<InternalGaussianFilterPointer, ImageDimension - 1> m_SmoothingFilters{};
172+
FirstGaussianFilterPointer m_FirstSmoothingFilter{};
173+
CastingFilterPointer m_CastingFilter{};
173174

174175
bool m_NormalizeAcrossScale{ false };
175176

0 commit comments

Comments
 (0)