From 1b14a344590048a47625e639758a8f2605e6d70c Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Sat, 15 Apr 2023 01:09:04 +0200 Subject: [PATCH] STYLE: Use TImage for CTAD supporting constructors ImageScanlineIterator Replaced `ImageType` with `TImage` as argument type of constructors of `ImageScanlineIterator` and `ImageScanlineConstIterator`, in order to support C++17 class template argument deduction (CTAD). --- Modules/Core/Common/include/itkImageScanlineConstIterator.h | 2 +- Modules/Core/Common/include/itkImageScanlineIterator.h | 2 +- Modules/Core/Common/include/itkImageScanlineIterator.hxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Core/Common/include/itkImageScanlineConstIterator.h b/Modules/Core/Common/include/itkImageScanlineConstIterator.h index c27ccdc3033..aa3395e0841 100644 --- a/Modules/Core/Common/include/itkImageScanlineConstIterator.h +++ b/Modules/Core/Common/include/itkImageScanlineConstIterator.h @@ -102,7 +102,7 @@ class ITK_TEMPLATE_EXPORT ImageScanlineConstIterator : public ImageConstIterator /** Constructor establishes an iterator to walk a particular image and a * particular region of that image. */ - ImageScanlineConstIterator(const ImageType * ptr, const RegionType & region) + ImageScanlineConstIterator(const TImage * ptr, const RegionType & region) : ImageConstIterator(ptr, region) { m_SpanBeginOffset = this->m_BeginOffset; diff --git a/Modules/Core/Common/include/itkImageScanlineIterator.h b/Modules/Core/Common/include/itkImageScanlineIterator.h index d2e3da68c3a..fcd36c65225 100644 --- a/Modules/Core/Common/include/itkImageScanlineIterator.h +++ b/Modules/Core/Common/include/itkImageScanlineIterator.h @@ -63,7 +63,7 @@ class ITK_TEMPLATE_EXPORT ImageScanlineIterator : public ImageScanlineConstItera /** Constructor establishes an iterator to walk a particular image and a * particular region of that image. */ - ImageScanlineIterator(ImageType * ptr, const RegionType & region); + ImageScanlineIterator(TImage * ptr, const RegionType & region); /** Constructor that can be used to cast from an ImageIterator to an * ImageScanlineIterator. Many routines return an ImageIterator but for a diff --git a/Modules/Core/Common/include/itkImageScanlineIterator.hxx b/Modules/Core/Common/include/itkImageScanlineIterator.hxx index b2f30088a42..7149de3c52d 100644 --- a/Modules/Core/Common/include/itkImageScanlineIterator.hxx +++ b/Modules/Core/Common/include/itkImageScanlineIterator.hxx @@ -22,7 +22,7 @@ namespace itk { template -ImageScanlineIterator::ImageScanlineIterator(ImageType * ptr, const RegionType & region) +ImageScanlineIterator::ImageScanlineIterator(TImage * ptr, const RegionType & region) : ImageScanlineConstIterator(ptr, region) {}