Skip to content

FUTURE_LEGACY_REMOVE BoundaryConditionPointerType, replace with BoundaryConditionType * #4538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewtex merged 3 commits into from
Apr 1, 2024
Merged

FUTURE_LEGACY_REMOVE BoundaryConditionPointerType, replace with BoundaryConditionType * #4538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
839955e
STYLE: Replace BoundaryConditionPointerType w/ `BoundaryConditionType *`
N-Dekker Mar 18, 2024
bb00c86
STYLE: Remove unused `Superclass::BoundaryConditionPointerType`
N-Dekker Mar 26, 2024
226802f
STYLE: FUTURE_LEGACY_REMOVE BoundaryConditionPointerType type aliases
N-Dekker Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Modules/Filtering/Convolution/include/itkConvolutionImageFilterBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,15 @@ class ITK_TEMPLATE_EXPORT ConvolutionImageFilterBase : public ImageToImageFilter

/** Typedef to describe the boundary condition. */
using BoundaryConditionType = ImageBoundaryCondition<TInputImage>;
using BoundaryConditionPointerType = BoundaryConditionType *;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using BoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] =
BoundaryConditionType *;
#endif
using DefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition<TInputImage>;

/** 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);
Expand Down Expand Up @@ -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 };
};
Expand Down
1 change: 0 additions & 1 deletion Modules/Filtering/Convolution/include/itkFFTConvolutionImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion Modules/Filtering/FFT/include/itkFFTPadImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ class ITK_TEMPLATE_EXPORT FFTPadImageFilter : public PadImageFilterBase<TInputIm

/** Typedef to describe the boundary condition. */
using BoundaryConditionType = ImageBoundaryCondition<TInputImage, TOutputImage>;
using BoundaryConditionPointerType = BoundaryConditionType *;
using DefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition<TInputImage, TOutputImage>;

protected:
Expand Down
1 change: 0 additions & 1 deletion Modules/Filtering/ImageGrid/include/itkPadImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class ITK_TEMPLATE_EXPORT PadImageFilter : public PadImageFilterBase<TInputImage

/** Typedef to describe the boundary condition. */
using BoundaryConditionType = ImageBoundaryCondition<TInputImage, TOutputImage>;
using BoundaryConditionPointerType = BoundaryConditionType *;

/** \see LightObject::GetNameOfClass() */
itkOverrideGetNameOfClassMacro(PadImageFilter);
Expand Down
13 changes: 8 additions & 5 deletions Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ class ITK_TEMPLATE_EXPORT PadImageFilterBase : public ImageToImageFilter<TInputI

/** Typedef to describe the boundary condition. */
using BoundaryConditionType = ImageBoundaryCondition<TInputImage, TOutputImage>;
using BoundaryConditionPointerType = BoundaryConditionType *;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using BoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] =
BoundaryConditionType *;
#endif

/** \see LightObject::GetNameOfClass() */
itkOverrideGetNameOfClassMacro(PadImageFilterBase);
Expand All @@ -86,8 +89,8 @@ class ITK_TEMPLATE_EXPORT PadImageFilterBase : public ImageToImageFilter<TInputI
static constexpr unsigned int ImageDimension = TInputImage::ImageDimension;

/** Set/get the boundary condition. */
itkSetMacro(BoundaryCondition, BoundaryConditionPointerType);
itkGetConstMacro(BoundaryCondition, BoundaryConditionPointerType);
itkSetMacro(BoundaryCondition, BoundaryConditionType *);
itkGetConstMacro(BoundaryCondition, BoundaryConditionType *);

protected:
PadImageFilterBase();
Expand All @@ -110,10 +113,10 @@ class ITK_TEMPLATE_EXPORT PadImageFilterBase : public ImageToImageFilter<TInputI

/** Method for subclasses to set the boundary condition. */
void
InternalSetBoundaryCondition(const BoundaryConditionPointerType boundaryCondition);
InternalSetBoundaryCondition(BoundaryConditionType * const boundaryCondition);

private:
BoundaryConditionPointerType m_BoundaryCondition{};
BoundaryConditionType * m_BoundaryCondition{};
};

} // end namespace itk
Expand Down
2 changes: 1 addition & 1 deletion Modules/Filtering/ImageGrid/include/itkPadImageFilterBase.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ PadImageFilterBase<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
template <typename TInputImage, typename TOutputImage>
void
PadImageFilterBase<TInputImage, TOutputImage>::InternalSetBoundaryCondition(
const BoundaryConditionPointerType boundaryCondition)
BoundaryConditionType * const boundaryCondition)
{
m_BoundaryCondition = boundaryCondition;
}
Expand Down