Skip to content

Commit c8c14a8

Browse files
authored
Merge pull request #6501 from hjmjohnson/future-legacy-smoothing-recursive-yvv
COMP: Modernize deprecated macros in SmoothingRecursiveYvvGaussianFilter
2 parents 52f1cea + dc0a809 commit c8c14a8

5 files changed

Lines changed: 10 additions & 10 deletions

Modules/Filtering/SmoothingRecursiveYvvGaussianFilter/include/itkGPUSmoothingRecursiveYvvGaussianImageFilter.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ class ITK_EXPORT GPUSmoothingRecursiveYvvGaussianImageFilter
8686
using GPUOutputImage = typename itk::GPUTraits<TOutputImage>::Type;
8787

8888
/** Runtime information support. */
89-
itkTypeMacro(GPUSmoothingRecursiveYvvGaussianImageFilter, GPUImageToImageFilter);
89+
itkOverrideGetNameOfClassMacro(GPUSmoothingRecursiveYvvGaussianImageFilter);
9090

9191
/** Image dimension. */
9292
static constexpr unsigned int ImageDimension = TInputImage::ImageDimension;
9393

9494
/** Define the type for the sigma array */
95-
using SigmaArrayType = FixedArray<ScalarRealType, itkGetStaticConstMacro(ImageDimension)>;
95+
using SigmaArrayType = FixedArray<ScalarRealType, Self::ImageDimension>;
9696

9797
/** Define the image type for internal computations
9898
RealType is usually 'double' in NumericTraits.
9999
Here we prefer float in order to save memory. */
100100

101101
using InternalRealType = typename NumericTraits<PixelType>::FloatType;
102-
using RealImageType = GPUImage<InternalRealType, itkGetStaticConstMacro(ImageDimension)>;
102+
using RealImageType = GPUImage<InternalRealType, Self::ImageDimension>;
103103

104104
/** Pointer to the Output Image */
105105
using OutputImagePointer = typename OutputImageType::Pointer;
@@ -159,7 +159,7 @@ class ITK_EXPORT GPUSmoothingRecursiveYvvGaussianImageFilter
159159
* the pipeline execution model.
160160
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
161161
void
162-
GenerateInputRequestedRegion() ITK_NOEXCEPT override;
162+
GenerateInputRequestedRegion() noexcept override;
163163

164164
// Override since the filter produces the entire dataset
165165
void

Modules/Filtering/SmoothingRecursiveYvvGaussianFilter/include/itkGPUSmoothingRecursiveYvvGaussianImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ GPUSmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::SetNorma
227227

228228
template <typename TInputImage, typename TOutputImage>
229229
void
230-
GPUSmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() ITK_NOEXCEPT
230+
GPUSmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() noexcept
231231
{
232232
// call the superclass' implementation of this method. this should
233233
// copy the output requested region to the input requested region

Modules/Filtering/SmoothingRecursiveYvvGaussianFilter/include/itkRecursiveLineYvvGaussianImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ITK_EXPORT RecursiveLineYvvGaussianImageFilter : public InPlaceImageFilter
5757
itkNewMacro(Self);
5858

5959
/** Type macro that defines a name for this class. */
60-
itkTypeMacro(RecursiveLineYvvGaussianImageFilter, InPlaceImageFilter);
60+
itkOverrideGetNameOfClassMacro(RecursiveLineYvvGaussianImageFilter);
6161

6262
/** Smart pointer type alias support. */
6363
using InputImagePointer = typename TInputImage::Pointer;

Modules/Filtering/SmoothingRecursiveYvvGaussianFilter/include/itkSmoothingRecursiveYvvGaussianImageFilter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ class ITK_EXPORT SmoothingRecursiveYvvGaussianImageFilter : public InPlaceImageF
6868
#endif
6969

7070
/** Runtime information support. */
71-
itkTypeMacro(SmoothingRecursiveYvvGaussianImageFilter, InPlaceImageFilter);
71+
itkOverrideGetNameOfClassMacro(SmoothingRecursiveYvvGaussianImageFilter);
7272

7373
/** Image dimension. */
7474
static constexpr unsigned int ImageDimension = TInputImage::ImageDimension;
7575

7676
/** Define the type for the sigma array */
77-
using SigmaArrayType = FixedArray<ScalarRealType, itkGetStaticConstMacro(ImageDimension)>;
77+
using SigmaArrayType = FixedArray<ScalarRealType, Self::ImageDimension>;
7878

7979
/** Define the image type for internal computations
8080
RealType is usually 'double' in NumericTraits.
@@ -152,7 +152,7 @@ class ITK_EXPORT SmoothingRecursiveYvvGaussianImageFilter : public InPlaceImageF
152152
* the pipeline execution model.
153153
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
154154
void
155-
GenerateInputRequestedRegion() ITK_NOEXCEPT override;
155+
GenerateInputRequestedRegion() noexcept override;
156156

157157
// Override since the filter produces the entire dataset
158158
void

Modules/Filtering/SmoothingRecursiveYvvGaussianFilter/include/itkSmoothingRecursiveYvvGaussianImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ SmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::SetNormaliz
185185

186186
template <typename TInputImage, typename TOutputImage>
187187
void
188-
SmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() ITK_NOEXCEPT
188+
SmoothingRecursiveYvvGaussianImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() noexcept
189189
{
190190
// call the superclass' implementation of this method. this should
191191
// copy the output requested region to the input requested region

0 commit comments

Comments
 (0)