Skip to content

FUTURE_LEGACY_REMOVE InternalPixelPointerType, EdgeListPointerType, InputBoundaryConditionPointerType #4554

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 5 commits into from
May 22, 2024
Merged

FUTURE_LEGACY_REMOVE InternalPixelPointerType, EdgeListPointerType, InputBoundaryConditionPointerType #4554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
187ddb5
STYLE: FUTURE_LEGACY_REMOVE `ImageAdaptor::InternalPixelPointerType`
N-Dekker Apr 2, 2024
eb47dd2
STYLE: Replace EdgeListPointerType with `EdgeListType *`
N-Dekker Apr 2, 2024
7b2ce06
STYLE: FUTURE_LEGACY_REMOVE `QuadEdgeMesh::EdgeListPointerType`
N-Dekker Apr 2, 2024
9d1af1b
STYLE: Replace InputBoundaryConditionPointerType w BoundaryConditionType
N-Dekker Apr 2, 2024
825b705
STYLE: FUTURE_LEGACY_REMOVE InputBoundaryConditionPointerType
N-Dekker Apr 2, 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
4 changes: 3 additions & 1 deletion Modules/Core/ImageAdaptors/include/itkImageAdaptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,10 @@ class ITK_TEMPLATE_EXPORT ImageAdaptor : public ImageBase<TImage::ImageDimension
virtual void
Graft(const Self * imgData);

#ifndef ITK_FUTURE_LEGACY_REMOVE
/** Convenient type alias. */
using InternalPixelPointerType = InternalPixelType *;
using InternalPixelPointerType [[deprecated("Please just use `InternalPixelType *` instead!")]] = InternalPixelType *;
#endif

/** Return a pointer to the beginning of the buffer. This is used by
* the image iterator class. */
Expand Down
5 changes: 3 additions & 2 deletions Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMesh : public Mesh<TPixel, VDimension, TTraits
/** Auxiliary types. */
using PointIdList = std::vector<PointIdentifier>;
using EdgeListType = std::list<QEPrimal *>;
using EdgeListPointerType = EdgeListType *;

#ifndef ITK_FUTURE_LEGACY_REMOVE
using EdgeListPointerType [[deprecated("Please just use `EdgeListType *` instead!")]] = EdgeListType *;
#endif
using MeshClassCellsAllocationMethodEnum = itk::MeshEnums::MeshClassCellsAllocationMethod;

/** Reserved PointIdentifier designated to represent the absence of Point */
Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshBoundaryEdgesMeshFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace itk
*/
template <typename TMesh>
class ITK_TEMPLATE_EXPORT QuadEdgeMeshBoundaryEdgesMeshFunction
: public FunctionBase<TMesh, typename TMesh::EdgeListPointerType>
: public FunctionBase<TMesh, typename TMesh::EdgeListType *>
{
public:
ITK_DISALLOW_COPY_AND_MOVE(QuadEdgeMeshBoundaryEdgesMeshFunction);
Expand All @@ -44,7 +44,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshBoundaryEdgesMeshFunction
using Self = QuadEdgeMeshBoundaryEdgesMeshFunction;
using Pointer = SmartPointer<Self>;
using ConstPointer = SmartPointer<const Self>;
using Superclass = FunctionBase<TMesh, typename TMesh::EdgeListPointerType>;
using Superclass = FunctionBase<TMesh, typename TMesh::EdgeListType *>;

// Types in superclass:
using typename Superclass::InputType;
Expand Down
11 changes: 7 additions & 4 deletions Modules/Filtering/Smoothing/include/itkDiscreteGaussianImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte

/** Typedef to describe the boundary condition. */
using BoundaryConditionType = ImageBoundaryCondition<TInputImage>;
using InputBoundaryConditionPointerType = BoundaryConditionType *;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputBoundaryConditionPointerType [[deprecated("Please just use `BoundaryConditionType *` instead!")]] =
BoundaryConditionType *;
#endif
using InputDefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition<TInputImage>;
using RealBoundaryConditionPointerType = ImageBoundaryCondition<RealOutputImageType> *;
using RealDefaultBoundaryConditionType = ZeroFluxNeumannBoundaryCondition<RealOutputImageType>;
Expand Down Expand Up @@ -147,8 +150,8 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte
itkSetMacro(FilterDimensionality, unsigned int);

/** Set/get the boundary condition. */
itkSetMacro(InputBoundaryCondition, InputBoundaryConditionPointerType);
itkGetConstMacro(InputBoundaryCondition, InputBoundaryConditionPointerType);
itkSetMacro(InputBoundaryCondition, BoundaryConditionType *);
itkGetConstMacro(InputBoundaryCondition, BoundaryConditionType *);
itkSetMacro(RealBoundaryCondition, RealBoundaryConditionPointerType);
itkGetConstMacro(RealBoundaryCondition, RealBoundaryConditionPointerType);

Expand Down Expand Up @@ -387,7 +390,7 @@ class ITK_TEMPLATE_EXPORT DiscreteGaussianImageFilter : public ImageToImageFilte

/** Pointer to a persistent boundary condition object used
** for the image iterator. */
InputBoundaryConditionPointerType m_InputBoundaryCondition{};
BoundaryConditionType * m_InputBoundaryCondition{};

/** Default boundary condition */
InputDefaultBoundaryConditionType m_InputDefaultBoundaryCondition{};
Expand Down
3 changes: 1 addition & 2 deletions Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ class ITK_TEMPLATE_EXPORT FFTDiscreteGaussianImageFilter : public DiscreteGaussi

/** Typedef to describe the boundary condition. */
using typename Superclass::BoundaryConditionType;
using typename Superclass::InputBoundaryConditionPointerType;
using typename Superclass::InputDefaultBoundaryConditionType;
using typename Superclass::RealBoundaryConditionPointerType;
using typename Superclass::RealDefaultBoundaryConditionType;
Expand All @@ -144,7 +143,7 @@ class ITK_TEMPLATE_EXPORT FFTDiscreteGaussianImageFilter : public DiscreteGaussi
/** Overridden accessors for unused parameters */

void
SetInputBoundaryCondition(const InputBoundaryConditionPointerType) override;
SetInputBoundaryCondition(BoundaryConditionType *) override;

itkSetMacro(KernelSource, FFTDiscreteGaussianImageFilterEnums::KernelSource);
itkGetConstMacro(KernelSource, FFTDiscreteGaussianImageFilterEnums::KernelSource);
Expand Down
3 changes: 1 addition & 2 deletions Modules/Filtering/Smoothing/include/itkFFTDiscreteGaussianImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ FFTDiscreteGaussianImageFilter<TInputImage, TOutputImage>::GenerateInputRequeste

template <typename TInputImage, typename TOutputImage>
void
FFTDiscreteGaussianImageFilter<TInputImage, TOutputImage>::SetInputBoundaryCondition(
const InputBoundaryConditionPointerType)
FFTDiscreteGaussianImageFilter<TInputImage, TOutputImage>::SetInputBoundaryCondition(BoundaryConditionType *)
{
itkWarningMacro("FFTDiscreteGaussianImageFilter ignores InputBoundaryCondition, use RealBoundaryCondition instead");
}
Expand Down