diff --git a/Modules/Filtering/Convolution/include/itkConvolutionImageFilterBase.h b/Modules/Filtering/Convolution/include/itkConvolutionImageFilterBase.h index ae257a19891..9ffdb5e605a 100644 --- a/Modules/Filtering/Convolution/include/itkConvolutionImageFilterBase.h +++ b/Modules/Filtering/Convolution/include/itkConvolutionImageFilterBase.h @@ -89,12 +89,15 @@ class ITK_TEMPLATE_EXPORT ConvolutionImageFilterBase : public ImageToImageFilter /** Typedef to describe the boundary condition. */ using BoundaryConditionType = ImageBoundaryCondition; - using BoundaryConditionPointerType = BoundaryConditionType *; +#ifndef ITK_FUTURE_LEGACY_REMOVE + using BoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] = + BoundaryConditionType *; +#endif using DefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition; /** Set/get the boundary condition. */ - itkSetMacro(BoundaryCondition, BoundaryConditionPointerType); - itkGetConstMacro(BoundaryCondition, BoundaryConditionPointerType); + itkSetMacro(BoundaryCondition, BoundaryConditionType *); + itkGetConstMacro(BoundaryCondition, BoundaryConditionType *); /** Set/get the image kernel. */ itkSetInputMacro(KernelImage, KernelImageType); @@ -157,7 +160,7 @@ class ITK_TEMPLATE_EXPORT ConvolutionImageFilterBase : public ImageToImageFilter bool m_Normalize{ false }; DefaultBoundaryConditionType m_DefaultBoundaryCondition{}; - BoundaryConditionPointerType m_BoundaryCondition{}; + BoundaryConditionType * m_BoundaryCondition{}; OutputRegionModeEnum m_OutputRegionMode{ ConvolutionImageFilterBaseEnums::ConvolutionImageFilterOutputRegion::SAME }; }; diff --git a/Modules/Filtering/Convolution/include/itkFFTConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/itkFFTConvolutionImageFilter.h index 3acf247cbdd..55231a32139 100644 --- a/Modules/Filtering/Convolution/include/itkFFTConvolutionImageFilter.h +++ b/Modules/Filtering/Convolution/include/itkFFTConvolutionImageFilter.h @@ -107,7 +107,6 @@ class ITK_TEMPLATE_EXPORT FFTConvolutionImageFilter /** Typedef to describe the boundary condition. */ using typename Superclass::BoundaryConditionType; - using typename Superclass::BoundaryConditionPointerType; itkSetMacro(SizeGreatestPrimeFactor, SizeValueType); itkGetMacro(SizeGreatestPrimeFactor, SizeValueType); diff --git a/Modules/Filtering/FFT/include/itkFFTPadImageFilter.h b/Modules/Filtering/FFT/include/itkFFTPadImageFilter.h index 88526e0ff66..e98f3c5496e 100644 --- a/Modules/Filtering/FFT/include/itkFFTPadImageFilter.h +++ b/Modules/Filtering/FFT/include/itkFFTPadImageFilter.h @@ -95,7 +95,6 @@ class ITK_TEMPLATE_EXPORT FFTPadImageFilter : public PadImageFilterBase; - using BoundaryConditionPointerType = BoundaryConditionType *; using DefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition; protected: diff --git a/Modules/Filtering/ImageGrid/include/itkPadImageFilter.h b/Modules/Filtering/ImageGrid/include/itkPadImageFilter.h index bb6a0bd1acd..daec48033b2 100644 --- a/Modules/Filtering/ImageGrid/include/itkPadImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkPadImageFilter.h @@ -77,7 +77,6 @@ class ITK_TEMPLATE_EXPORT PadImageFilter : public PadImageFilterBase; - using BoundaryConditionPointerType = BoundaryConditionType *; /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(PadImageFilter); diff --git a/Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.h b/Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.h index 75b728d081a..b44e0d96481 100644 --- a/Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.h +++ b/Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.h @@ -77,7 +77,10 @@ class ITK_TEMPLATE_EXPORT PadImageFilterBase : public ImageToImageFilter; - using BoundaryConditionPointerType = BoundaryConditionType *; +#ifndef ITK_FUTURE_LEGACY_REMOVE + using BoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] = + BoundaryConditionType *; +#endif /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(PadImageFilterBase); @@ -86,8 +89,8 @@ class ITK_TEMPLATE_EXPORT PadImageFilterBase : public ImageToImageFilter::DynamicThreadedGenerateData( template void PadImageFilterBase::InternalSetBoundaryCondition( - const BoundaryConditionPointerType boundaryCondition) + BoundaryConditionType * const boundaryCondition) { m_BoundaryCondition = boundaryCondition; }