diff --git a/Examples/Filtering/SpatialObjectToImage1.cxx b/Examples/Filtering/SpatialObjectToImage1.cxx index 6fccf268ebb..5f4a884ac62 100644 --- a/Examples/Filtering/SpatialObjectToImage1.cxx +++ b/Examples/Filtering/SpatialObjectToImage1.cxx @@ -186,9 +186,9 @@ main(int argc, char * argv[]) // Software Guide : BeginCodeSnippet ellipse->SetRadiusInObjectSpace(size[0] * 0.2 * spacing[0]); - typename TubeType::PointType point; - typename TubeType::TubePointType tubePoint; - typename TubeType::TubePointListType tubePointList; + TubeType::PointType point; + TubeType::TubePointType tubePoint; + TubeType::TubePointListType tubePointList; point[0] = size[0] * 0.2 * spacing[0]; point[1] = size[1] * 0.2 * spacing[1]; point[2] = size[2] * 0.2 * spacing[2]; diff --git a/Examples/Filtering/SpatialObjectToImage3.cxx b/Examples/Filtering/SpatialObjectToImage3.cxx index 8535b93ed74..189743e85bb 100644 --- a/Examples/Filtering/SpatialObjectToImage3.cxx +++ b/Examples/Filtering/SpatialObjectToImage3.cxx @@ -142,21 +142,21 @@ main(int argc, char * argv[]) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - constexpr unsigned int numberOfPoints = 6; - typename PolygonType::PointType point; - typename PolygonType::PointType::VectorType radial; + constexpr unsigned int numberOfPoints = 6; + PolygonType::PointType point; + PolygonType::PointType::VectorType radial; radial[0] = 0.0; radial[1] = 0.0; radial[2] = 0.0; - typename PolygonType::PointType center; + PolygonType::PointType center; center[0] = 50.0; center[1] = 50.0; center[2] = 0.0; constexpr double radius = 40.0; - typename PolygonType::PolygonPointType polygonPoint; + PolygonType::PolygonPointType polygonPoint; for (unsigned int i = 0; i < numberOfPoints; ++i) { diff --git a/Modules/Core/Common/include/itkAnatomicalOrientation.h b/Modules/Core/Common/include/itkAnatomicalOrientation.h index 839fdf2ebd1..d1fe1efc900 100644 --- a/Modules/Core/Common/include/itkAnatomicalOrientation.h +++ b/Modules/Core/Common/include/itkAnatomicalOrientation.h @@ -54,7 +54,7 @@ class ITKCommon_EXPORT AnatomicalOrientation { public: static constexpr unsigned int Dimension = 3; - using DirectionType = typename ImageBase::DirectionType; + using DirectionType = ImageBase::DirectionType; static constexpr unsigned int ImageDimension = Dimension; #ifndef ITK_FUTURE_LEGACY_REMOVE @@ -563,16 +563,16 @@ class ITKCommon_EXPORT AnatomicalOrientation /** Outputs unambiguous anatomical orientation names such as "right-to-left". */ ITKCommon_EXPORT std::ostream & - operator<<(std::ostream & out, typename AnatomicalOrientation::CoordinateEnum value); + operator<<(std::ostream & out, AnatomicalOrientation::CoordinateEnum value); /** Outputs the PositiveEnum encoding as a string such as "LPS". */ ITKCommon_EXPORT std::ostream & - operator<<(std::ostream & out, typename AnatomicalOrientation::PositiveEnum value); + operator<<(std::ostream & out, AnatomicalOrientation::PositiveEnum value); /** Outputs the NegativeEnum encoding as a string such as "RAI" */ ITKCommon_EXPORT std::ostream & - operator<<(std::ostream & out, typename AnatomicalOrientation::NegativeEnum value); + operator<<(std::ostream & out, AnatomicalOrientation::NegativeEnum value); ITKCommon_EXPORT std::ostream & operator<<(std::ostream & out, const AnatomicalOrientation & orientation); diff --git a/Modules/Core/Common/include/itkCompensatedSummation.hxx b/Modules/Core/Common/include/itkCompensatedSummation.hxx index 66c924d55b9..72d883f06d2 100644 --- a/Modules/Core/Common/include/itkCompensatedSummation.hxx +++ b/Modules/Core/Common/include/itkCompensatedSummation.hxx @@ -142,7 +142,7 @@ CompensatedSummation::GetSum() const -> const AccumulateType & template -CompensatedSummation::operator typename CompensatedSummation::FloatType() const +CompensatedSummation::operator FloatType() const { return this->m_Sum; } diff --git a/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.h b/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.h index 3af4af3b649..9e0353d18e4 100644 --- a/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.h +++ b/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.h @@ -52,7 +52,7 @@ class ITK_TEMPLATE_EXPORT FloodFilledFunctionConditionalConstIterator : public C using IndexType = typename TImage::IndexType; /** Index ContainerType */ - using SeedsContainerType = typename std::vector; + using SeedsContainerType = std::vector; /** Size type alias support. */ using SizeType = typename TImage::SizeType; diff --git a/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.hxx b/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.hxx index c64d64fb190..c5da5199fe4 100644 --- a/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.hxx +++ b/Modules/Core/Common/include/itkFloodFilledFunctionConditionalConstIterator.hxx @@ -105,7 +105,7 @@ void FloodFilledFunctionConditionalConstIterator::FindSeedPixel() { // Create an iterator that will walk the input image - using IRIType = typename itk::ImageRegionConstIterator; + using IRIType = itk::ImageRegionConstIterator; // Now we search the input image for the first pixel which is inside // the function of interest diff --git a/Modules/Core/Common/include/itkImageDuplicator.hxx b/Modules/Core/Common/include/itkImageDuplicator.hxx index 55c469a8321..156d5dd4d65 100644 --- a/Modules/Core/Common/include/itkImageDuplicator.hxx +++ b/Modules/Core/Common/include/itkImageDuplicator.hxx @@ -64,8 +64,7 @@ ImageDuplicator::PrintSelf(std::ostream & os, Indent indent) const itkPrintSelfObjectMacro(InputImage); itkPrintSelfObjectMacro(DuplicateImage); - os << indent - << "InternalImageTime: " << static_cast::PrintType>(m_InternalImageTime) + os << indent << "InternalImageTime: " << static_cast::PrintType>(m_InternalImageTime) << std::endl; } } // end namespace itk diff --git a/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h index 0096614a648..7dc36db8280 100644 --- a/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h @@ -230,7 +230,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithIndex : public ImageConstI void RandomJump(); - using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer; + using GeneratorPointer = Statistics::MersenneTwisterRandomVariateGenerator::Pointer; GeneratorPointer m_Generator{ Statistics::MersenneTwisterRandomVariateGenerator::New() }; SizeValueType m_NumberOfSamplesRequested{}; SizeValueType m_NumberOfSamplesDone{}; diff --git a/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h b/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h index bef6a21b26a..5389d375ce2 100644 --- a/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h +++ b/Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h @@ -232,7 +232,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithOnlyIndex : public ImageCo void RandomJump(); - using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer; + using GeneratorPointer = Statistics::MersenneTwisterRandomVariateGenerator::Pointer; GeneratorPointer m_Generator{ Statistics::MersenneTwisterRandomVariateGenerator::New() }; SizeValueType m_NumberOfSamplesRequested{}; SizeValueType m_NumberOfSamplesDone{}; diff --git a/Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.h b/Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.h index 9517926b119..3a0ee2f3856 100644 --- a/Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.h +++ b/Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.h @@ -65,7 +65,7 @@ class NodeOfPermutation class RandomPermutation { public: - using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer; + using GeneratorPointer = Statistics::MersenneTwisterRandomVariateGenerator::Pointer; NodeOfPermutation * m_Permutation; GeneratorPointer m_Generator; SizeValueType m_Size; diff --git a/Modules/Core/Common/include/itkImageSink.h b/Modules/Core/Common/include/itkImageSink.h index ed9d9de7954..655ccbc323a 100644 --- a/Modules/Core/Common/include/itkImageSink.h +++ b/Modules/Core/Common/include/itkImageSink.h @@ -77,7 +77,7 @@ class ImageSink /** SmartPointer to a region splitting object */ using SplitterType = ImageRegionSplitterBase; - using RegionSplitterPointer = typename SplitterType::Pointer; + using RegionSplitterPointer = SplitterType::Pointer; using typename Superclass::DataObjectIdentifierType; diff --git a/Modules/Core/Common/include/itkObjectStore.hxx b/Modules/Core/Common/include/itkObjectStore.hxx index d52f7bf0615..d0b80f86a50 100644 --- a/Modules/Core/Common/include/itkObjectStore.hxx +++ b/Modules/Core/Common/include/itkObjectStore.hxx @@ -134,9 +134,8 @@ ObjectStore::PrintSelf(std::ostream & os, Indent indent) const Superclass::PrintSelf(os, indent); os << indent << "GrowthStrategy: " << m_GrowthStrategy << std::endl; - os << indent << "Size: " << static_cast::PrintType>(m_Size) << std::endl; - os << indent - << "LinearGrowthSize: " << static_cast::PrintType>(m_LinearGrowthSize) + os << indent << "Size: " << static_cast::PrintType>(m_Size) << std::endl; + os << indent << "LinearGrowthSize: " << static_cast::PrintType>(m_LinearGrowthSize) << std::endl; os << indent << "FreeList: " << m_FreeList << std::endl; } diff --git a/Modules/Core/Common/include/itkResourceProbe.hxx b/Modules/Core/Common/include/itkResourceProbe.hxx index ddeb6608cfc..e05c818e532 100644 --- a/Modules/Core/Common/include/itkResourceProbe.hxx +++ b/Modules/Core/Common/include/itkResourceProbe.hxx @@ -72,12 +72,9 @@ ResourceProbe::Print(std::ostream & os, Indent indent) cons os << indent << "StandardError: " << static_cast::PrintType>(m_StandardError) << std::endl; - os << indent << "NumberOfStarts: " << static_cast::PrintType>(m_NumberOfStarts) - << std::endl; - os << indent << "NumberOfStops: " << static_cast::PrintType>(m_NumberOfStops) - << std::endl; - os << indent - << "NumberOfIteration: " << static_cast::PrintType>(m_NumberOfIteration) + os << indent << "NumberOfStarts: " << static_cast::PrintType>(m_NumberOfStarts) << std::endl; + os << indent << "NumberOfStops: " << static_cast::PrintType>(m_NumberOfStops) << std::endl; + os << indent << "NumberOfIteration: " << static_cast::PrintType>(m_NumberOfIteration) << std::endl; os << indent << "ProbeValueList: " << m_ProbeValueList << std::endl; diff --git a/Modules/Core/Common/include/itkSpatialOrientationAdapter.h b/Modules/Core/Common/include/itkSpatialOrientationAdapter.h index 016c3b4c606..b3fad552b67 100644 --- a/Modules/Core/Common/include/itkSpatialOrientationAdapter.h +++ b/Modules/Core/Common/include/itkSpatialOrientationAdapter.h @@ -88,7 +88,7 @@ class ITKCommon_EXPORT SpatialOrientationAdapter using ImageType = ImageBase<3>; /** Direction Cosines type alias. */ - using DirectionType = typename ImageType::DirectionType; + using DirectionType = ImageType::DirectionType; /** Constructor */ SpatialOrientationAdapter() = default; diff --git a/Modules/Core/Common/include/itkStreamingImageFilter.h b/Modules/Core/Common/include/itkStreamingImageFilter.h index b8da3792a17..5feea09dcf9 100644 --- a/Modules/Core/Common/include/itkStreamingImageFilter.h +++ b/Modules/Core/Common/include/itkStreamingImageFilter.h @@ -76,7 +76,7 @@ class ITK_TEMPLATE_EXPORT StreamingImageFilter : public ImageToImageFilter & stringToCode = GetStringToCode(); - auto iter = stringToCode.find(str); + const std::map & stringToCode = GetStringToCode(); + auto iter = stringToCode.find(str); if (iter == stringToCode.end()) { return { PositiveEnum::INVALID }; @@ -136,7 +136,7 @@ AnatomicalOrientation::GetCoordinateTerm(CoordinateMajornessTermsEnum cmt) const } -const std::map & +const std::map & AnatomicalOrientation::GetCodeToString() { auto createCodeToString = []() -> std::map { @@ -247,7 +247,7 @@ AnatomicalOrientation::ConvertDirectionToPositiveEnum(const DirectionType & dir) } -typename AnatomicalOrientation::DirectionType +AnatomicalOrientation::DirectionType AnatomicalOrientation::ConvertPositiveEnumToDirection(PositiveEnum orientationEnum) { const AnatomicalOrientation o(orientationEnum); @@ -281,7 +281,7 @@ AnatomicalOrientation::ConvertPositiveEnumToDirection(PositiveEnum orientationEn } std::ostream & -operator<<(std::ostream & out, typename AnatomicalOrientation::CoordinateEnum value) +operator<<(std::ostream & out, AnatomicalOrientation::CoordinateEnum value) { switch (value) { @@ -305,13 +305,13 @@ operator<<(std::ostream & out, typename AnatomicalOrientation::CoordinateEnum va } std::ostream & -operator<<(std::ostream & out, typename AnatomicalOrientation::PositiveEnum value) +operator<<(std::ostream & out, AnatomicalOrientation::PositiveEnum value) { return out << AnatomicalOrientation(value).GetAsPositiveStringEncoding(); } std::ostream & -operator<<(std::ostream & out, typename AnatomicalOrientation::NegativeEnum value) +operator<<(std::ostream & out, AnatomicalOrientation::NegativeEnum value) { return out << AnatomicalOrientation(value).GetAsNegativeStringEncoding(); } diff --git a/Modules/Core/Common/test/itkAnnulusOperatorTest.cxx b/Modules/Core/Common/test/itkAnnulusOperatorTest.cxx index e079850adcd..6ffcf85c164 100644 --- a/Modules/Core/Common/test/itkAnnulusOperatorTest.cxx +++ b/Modules/Core/Common/test/itkAnnulusOperatorTest.cxx @@ -118,15 +118,15 @@ itkAnnulusOperatorTest(int, char *[]) annulus.SetThickness(thickness); ITK_TEST_SET_GET_VALUE(thickness, annulus.GetThickness()); - constexpr typename OperatorType::PixelType exteriorValue{ 1 }; + constexpr OperatorType::PixelType exteriorValue{ 1 }; annulus.SetExteriorValue(exteriorValue); ITK_TEST_SET_GET_VALUE(exteriorValue, annulus.GetExteriorValue()); - constexpr typename OperatorType::PixelType annulusValue{ 8 }; + constexpr OperatorType::PixelType annulusValue{ 8 }; annulus.SetAnnulusValue(annulusValue); ITK_TEST_SET_GET_VALUE(annulusValue, annulus.GetAnnulusValue()); - constexpr typename OperatorType::PixelType interiorValue{ 4 }; + constexpr OperatorType::PixelType interiorValue{ 4 }; annulus.SetInteriorValue(interiorValue); ITK_TEST_SET_GET_VALUE(interiorValue, annulus.GetInteriorValue()); diff --git a/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx b/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx index f9e1f7e3190..9753c3e4096 100644 --- a/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx +++ b/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx @@ -519,7 +519,7 @@ template class MyDerivedCSNI : public itk::ConstShapedNeighborhoodIterator { public: - using Superclass = typename itk::ConstShapedNeighborhoodIterator; + using Superclass = itk::ConstShapedNeighborhoodIterator; using typename Superclass::SizeType; using typename Superclass::IndexType; using typename Superclass::RadiusType; diff --git a/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest2.cxx b/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest2.cxx index 92ee8bd3a31..59549923c43 100644 --- a/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest2.cxx +++ b/Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest2.cxx @@ -27,7 +27,7 @@ template class MyDerivedCSNI : public itk::ConstShapedNeighborhoodIterator { public: - using Superclass = typename itk::ConstShapedNeighborhoodIterator; + using Superclass = itk::ConstShapedNeighborhoodIterator; using typename Superclass::SizeType; using typename Superclass::IndexType; using typename Superclass::RadiusType; diff --git a/Modules/Core/Common/test/itkMetaDataDictionaryGTest.cxx b/Modules/Core/Common/test/itkMetaDataDictionaryGTest.cxx index 2bf349764b3..f404797843f 100644 --- a/Modules/Core/Common/test/itkMetaDataDictionaryGTest.cxx +++ b/Modules/Core/Common/test/itkMetaDataDictionaryGTest.cxx @@ -39,7 +39,7 @@ createMetaDataDictionary() itk::EncapsulateMetaData(metaDataDictionary, "two", static_cast(2)); using ObjectType = itk::LightObject; - using PointerType = typename ObjectType::Pointer; + using PointerType = ObjectType::Pointer; const PointerType obj = ObjectType::New(); itk::EncapsulateMetaData(metaDataDictionary, "object", obj); diff --git a/Modules/Core/Common/test/itkPointSetTest.cxx b/Modules/Core/Common/test/itkPointSetTest.cxx index 74f0b8835d7..f78b1cc0ffa 100644 --- a/Modules/Core/Common/test/itkPointSetTest.cxx +++ b/Modules/Core/Common/test/itkPointSetTest.cxx @@ -31,7 +31,7 @@ using PointSet = itk::PointSet; using PointType = PointSet::PointType; using PointsVectorContainer = PointSet::PointsVectorContainer; -using PointsVectorContainerPointer = typename PointsVectorContainer::Pointer; +using PointsVectorContainerPointer = PointsVectorContainer::Pointer; /** * The point set that is created consists of a 100 random points. diff --git a/Modules/Core/Common/test/itkPointSetToImageFilterTest1.cxx b/Modules/Core/Common/test/itkPointSetToImageFilterTest1.cxx index 49045cbdd10..27f0377cb77 100644 --- a/Modules/Core/Common/test/itkPointSetToImageFilterTest1.cxx +++ b/Modules/Core/Common/test/itkPointSetToImageFilterTest1.cxx @@ -76,14 +76,13 @@ itkPointSetToImageFilterTest1(int argc, char * argv[]) filter->SetOrigin(origin); ITK_TEST_SET_GET_VALUE(origin, filter->GetOrigin()); - typename BinaryImageType::DirectionType direction; + BinaryImageType::DirectionType direction; direction.SetIdentity(); filter->SetDirection(direction); ITK_TEST_SET_GET_VALUE(direction, filter->GetDirection()); - constexpr typename BinaryImageType::ValueType insideValue{ - itk::NumericTraits::OneValue() - }; + constexpr + typename BinaryImageType::ValueType insideValue{ itk::NumericTraits::OneValue() }; filter->SetInsideValue(insideValue); ITK_TEST_SET_GET_VALUE(insideValue, filter->GetInsideValue()); diff --git a/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx b/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx index fa6c5629e3d..4201a3348f6 100644 --- a/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx +++ b/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx @@ -24,7 +24,7 @@ TEST(SpatialOrientationAdaptor, test1) { using ImageType = itk::Image; - using DirectionType = typename ImageType::DirectionType; + using DirectionType = ImageType::DirectionType; itk::SpatialOrientationAdapter adapter; diff --git a/Modules/Core/GPUCommon/include/itkGPUImageDataManager.h b/Modules/Core/GPUCommon/include/itkGPUImageDataManager.h index 3b8e29fe291..c2064cc74a2 100644 --- a/Modules/Core/GPUCommon/include/itkGPUImageDataManager.h +++ b/Modules/Core/GPUCommon/include/itkGPUImageDataManager.h @@ -88,10 +88,10 @@ class ITK_TEMPLATE_EXPORT GPUImageDataManager : public GPUDataManager private: WeakPointer m_Image{}; // WeakPointer has to be used here // to avoid SmartPointer loop - int m_BufferedRegionIndex[ImageType::ImageDimension]{}; - int m_BufferedRegionSize[ImageType::ImageDimension]{}; - typename GPUDataManager::Pointer m_GPUBufferedRegionIndex{}; - typename GPUDataManager::Pointer m_GPUBufferedRegionSize{}; + int m_BufferedRegionIndex[ImageType::ImageDimension]{}; + int m_BufferedRegionSize[ImageType::ImageDimension]{}; + GPUDataManager::Pointer m_GPUBufferedRegionIndex{}; + GPUDataManager::Pointer m_GPUBufferedRegionSize{}; }; } // namespace itk diff --git a/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.h b/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.h index 1c816f3af06..f8ccda6002d 100644 --- a/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.h +++ b/Modules/Core/GPUCommon/include/itkGPUImageToImageFilter.h @@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT GPUImageToImageFilter : public TParentImageFilter {} // GPU kernel manager - typename GPUKernelManager::Pointer m_GPUKernelManager{}; + GPUKernelManager::Pointer m_GPUKernelManager{}; // GPU kernel handle - kernel should be defined in specific filter (not in the // base class) diff --git a/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h index d598d3fda78..0c737652538 100644 --- a/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h +++ b/Modules/Core/ImageAdaptors/include/itkImageAdaptor.h @@ -522,7 +522,7 @@ class ITK_TEMPLATE_EXPORT ImageAdaptor : public ImageBase void - UpdateAccessor(typename itk::VectorImage * itkNotUsed(dummy)) + UpdateAccessor(itk::VectorImage * itkNotUsed(dummy)) { this->m_PixelAccessor.SetVectorLength(this->m_Image->GetNumberOfComponentsPerPixel()); } diff --git a/Modules/Core/ImageFunction/include/itkBSplineInterpolateImageFunction.hxx b/Modules/Core/ImageFunction/include/itkBSplineInterpolateImageFunction.hxx index c16dd892b06..21d0e6b1715 100644 --- a/Modules/Core/ImageFunction/include/itkBSplineInterpolateImageFunction.hxx +++ b/Modules/Core/ImageFunction/include/itkBSplineInterpolateImageFunction.hxx @@ -75,8 +75,7 @@ BSplineInterpolateImageFunction::Prin itkPrintSelfBooleanMacro(UseImageDirection); - os << indent - << "NumberOfWorkUnits: " << static_cast::PrintType>(m_NumberOfWorkUnits) + os << indent << "NumberOfWorkUnits: " << static_cast::PrintType>(m_NumberOfWorkUnits) << std::endl; os << indent << "ThreadedEvaluateIndex: "; diff --git a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx index 1a310faafb5..c8a7b0b75f1 100644 --- a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx @@ -41,16 +41,15 @@ RunLinearInterpolateTest() using IndexType = typename ImageType::IndexType; using CoordinateType = float; - using ContinuousIndexType = typename itk::ContinuousIndex; + using ContinuousIndexType = itk::ContinuousIndex; using AccumulatorType = typename ContinuousIndexType::ValueType; - using PointType = typename itk::Point; + using PointType = itk::Point; - using InterpolatorType = typename itk::LinearInterpolateImageFunction; - using VectorInterpolatorType = typename itk::LinearInterpolateImageFunction; - using VariableVectorInterpolatorType = - typename itk::LinearInterpolateImageFunction; + using InterpolatorType = itk::LinearInterpolateImageFunction; + using VectorInterpolatorType = itk::LinearInterpolateImageFunction; + using VariableVectorInterpolatorType = itk::LinearInterpolateImageFunction; using InterpolatedVectorType = typename VectorInterpolatorType::OutputType; using InterpolatedVariableVectorType = typename VariableVectorInterpolatorType::OutputType; diff --git a/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx index d25bb0a427d..0637c9f2199 100644 --- a/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx @@ -126,7 +126,7 @@ itkNearestNeighborInterpolateImageFunctionTest(int, char *[]) interpolator->SetInputImage(image); - typename ImageType::SizeType radius{}; + ImageType::SizeType radius{}; for (unsigned int d = 0; d < Dimension; ++d) { ITK_TEST_SET_GET_VALUE(radius[d], interpolator->GetRadius()[d]); diff --git a/Modules/Core/Mesh/include/itkBinaryMask3DMeshSource.hxx b/Modules/Core/Mesh/include/itkBinaryMask3DMeshSource.hxx index 5beb30fb9bd..0b2d917eeb9 100644 --- a/Modules/Core/Mesh/include/itkBinaryMask3DMeshSource.hxx +++ b/Modules/Core/Mesh/include/itkBinaryMask3DMeshSource.hxx @@ -2650,9 +2650,8 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I os << indent << "LUT: " << m_LUT << std::endl; - os << indent << "LastVoxel: " << static_cast::PrintType>(*m_LastVoxel) - << std::endl; - os << indent << "CurrentVoxel: " << static_cast::PrintType>(*m_CurrentVoxel) + os << indent << "LastVoxel: " << static_cast::PrintType>(*m_LastVoxel) << std::endl; + os << indent << "CurrentVoxel: " << static_cast::PrintType>(*m_CurrentVoxel) << std::endl; os << indent << "LastRow: "; @@ -2660,7 +2659,7 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I { if (*m_LastRow != nullptr) { - os << static_cast::PrintType>(**m_LastRow) << std::endl; + os << static_cast::PrintType>(**m_LastRow) << std::endl; } } else @@ -2673,7 +2672,7 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I { if (*m_LastFrame != nullptr) { - os << static_cast::PrintType>(**m_LastFrame) << std::endl; + os << static_cast::PrintType>(**m_LastFrame) << std::endl; } } else @@ -2686,7 +2685,7 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I { if (*m_CurrentRow != nullptr) { - os << static_cast::PrintType>(**m_CurrentRow) << std::endl; + os << static_cast::PrintType>(**m_CurrentRow) << std::endl; } } else @@ -2699,7 +2698,7 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I { if (*m_CurrentFrame != nullptr) { - os << static_cast::PrintType>(**m_CurrentFrame) << std::endl; + os << static_cast::PrintType>(**m_CurrentFrame) << std::endl; } } else @@ -2717,9 +2716,9 @@ BinaryMask3DMeshSource::PrintSelf(std::ostream & os, I os << indent << "LocationOffset: " << m_LocationOffset << std::endl; - os << indent << "NumberOfNodes: " << static_cast::PrintType>(m_NumberOfNodes) + os << indent << "NumberOfNodes: " << static_cast::PrintType>(m_NumberOfNodes) << std::endl; - os << indent << "NumberOfCells: " << static_cast::PrintType>(m_NumberOfCells) + os << indent << "NumberOfCells: " << static_cast::PrintType>(m_NumberOfCells) << std::endl; os << indent << "NodeLimit: " << m_NodeLimit << std::endl; diff --git a/Modules/Core/Mesh/include/itkMesh.h b/Modules/Core/Mesh/include/itkMesh.h index eb13e3f6a21..8129a8f630e 100644 --- a/Modules/Core/Mesh/include/itkMesh.h +++ b/Modules/Core/Mesh/include/itkMesh.h @@ -188,8 +188,8 @@ class ITK_TEMPLATE_EXPORT Mesh : public PointSet; - using CellsVectorContainerPointer = typename CellsVectorContainer::Pointer; + using CellsVectorContainer = itk::VectorContainer; + using CellsVectorContainerPointer = CellsVectorContainer::Pointer; /** Used to support geometric operations on the toolkit. */ using BoundingBoxType = BoundingBox; diff --git a/Modules/Core/Mesh/include/itkSimplexMesh.h b/Modules/Core/Mesh/include/itkSimplexMesh.h index aabf1f0a9ed..5ff0c2b50ae 100644 --- a/Modules/Core/Mesh/include/itkSimplexMesh.h +++ b/Modules/Core/Mesh/include/itkSimplexMesh.h @@ -62,13 +62,13 @@ class ITK_TEMPLATE_EXPORT SimplexMesh : public Mesh; /** definition for array of indices. */ - using IndexArray = typename SimplexMeshGeometry::IndexArray; + using IndexArray = SimplexMeshGeometry::IndexArray; /** definition for a set of neighbor indices */ using NeighborSetType = std::set; /** */ - using NeighborSetIterator = typename NeighborSetType::iterator; + using NeighborSetIterator = NeighborSetType::iterator; /** */ using NeighborListType = std::vector; @@ -99,11 +99,11 @@ class ITK_TEMPLATE_EXPORT SimplexMesh : public Mesh; /** smartpointer def for the geometry map */ - using GeometryMapPointer = typename GeometryMapType::Pointer; + using GeometryMapPointer = GeometryMapType::Pointer; /** iterator definition for iterating over a geometry map */ - using GeometryMapIterator = typename GeometryMapType::Iterator; - using GeometryMapConstIterator = typename GeometryMapType::ConstIterator; + using GeometryMapIterator = GeometryMapType::Iterator; + using GeometryMapConstIterator = GeometryMapType::ConstIterator; // Backward compatibility to expose enum from class. using MeshClassCellsAllocationMethodEnum = itk::MeshEnums::MeshClassCellsAllocationMethod; diff --git a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx index 4c5147dddab..46acef5b193 100644 --- a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx +++ b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx @@ -273,11 +273,10 @@ SimplexMeshVolumeCalculator::PrintSelf(std::ostream & os, Indent ind os << indent << "Wxy: " << m_Wxy << std::endl; os << indent << "Wxz: " << m_Wxz << std::endl; os << indent << "Wyz: " << m_Wyz << std::endl; - os << indent << "Muncx: " << static_cast::PrintType>(m_Muncx) << std::endl; - os << indent << "Muncy: " << static_cast::PrintType>(m_Muncy) << std::endl; - os << indent << "Muncz: " << static_cast::PrintType>(m_Muncz) << std::endl; - os << indent - << "NumberOfTriangles: " << static_cast::PrintType>(m_NumberOfTriangles) + os << indent << "Muncx: " << static_cast::PrintType>(m_Muncx) << std::endl; + os << indent << "Muncy: " << static_cast::PrintType>(m_Muncy) << std::endl; + os << indent << "Muncz: " << static_cast::PrintType>(m_Muncz) << std::endl; + os << indent << "NumberOfTriangles: " << static_cast::PrintType>(m_NumberOfTriangles) << std::endl; } } // namespace itk diff --git a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.h b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.h index b8137289aeb..74af96c6f83 100644 --- a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.h +++ b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.h @@ -108,7 +108,7 @@ class ITK_TEMPLATE_EXPORT TriangleMeshToBinaryImageFilter : public ImageSource; - using PointsContainer = typename PointSetType::PointsContainer; + using PointsContainer = PointSetType::PointsContainer; using PointType = itk::Point; using Point2DType = itk::Point; diff --git a/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.h b/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.h index bc5624efeef..dcdd3666cce 100644 --- a/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.h @@ -103,7 +103,7 @@ class ITK_TEMPLATE_EXPORT ArrowSpatialObject : public SpatialObject void PrintSelf(std::ostream & os, Indent indent) const override; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.hxx index 09d71cef399..8ba5bf9facb 100644 --- a/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkArrowSpatialObject.hxx @@ -134,12 +134,12 @@ ArrowSpatialObject::GetLengthInWorldSpace() const } template -typename LightObject::Pointer +LightObject::Pointer ArrowSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) @@ -159,8 +159,6 @@ ArrowSpatialObject::PrintSelf(std::ostream & os, Indent indent) cons { Superclass::PrintSelf(os, indent); - os << indent << "DirectionInObjectSpace: " - << static_cast::PrintType>(m_DirectionInObjectSpace) << std::endl; os << indent << "PositionInObjectSpace: " << static_cast::PrintType>(m_PositionInObjectSpace) << std::endl; diff --git a/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h b/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h index 5c2d8c52c4c..13ef4fc9e5f 100644 --- a/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h @@ -77,7 +77,7 @@ class ITK_TEMPLATE_EXPORT BlobSpatialObject : public PointBasedSpatialObject::BlobSpatialObject() } template -typename LightObject::Pointer +LightObject::Pointer BlobSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.h b/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.h index 72d347b5db6..713e9ac7a7b 100644 --- a/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.h @@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT BoxSpatialObject : public SpatialObject void PrintSelf(std::ostream & os, Indent indent) const override; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.hxx index 79d4d605bdd..66edcacca14 100644 --- a/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkBoxSpatialObject.hxx @@ -75,14 +75,14 @@ BoxSpatialObject::ComputeMyBoundingBox() } template -typename LightObject::Pointer +LightObject::Pointer BoxSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h index 938cad41022..d474c45b5f5 100644 --- a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.h @@ -200,7 +200,7 @@ class ITK_TEMPLATE_EXPORT ContourSpatialObject void PrintSelf(std::ostream & os, Indent indent) const override; - typename LightObject::Pointer + LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx index 8c2c02f1647..2bde60a753f 100644 --- a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx @@ -125,14 +125,14 @@ ContourSpatialObject::AddControlPoint(const ContourPointType & point } template -typename LightObject::Pointer +LightObject::Pointer ContourSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); @@ -160,7 +160,7 @@ ContourSpatialObject::PrintSelf(std::ostream & os, Indent indent) co itkPrintSelfBooleanMacro(IsClosed); os << indent << "OrientationInObjectSpace: " << m_OrientationInObjectSpace << std::endl; os << indent << "OrientationInObjectSpaceMTime: " - << static_cast::PrintType>(m_OrientationInObjectSpaceMTime) << std::endl; + << static_cast::PrintType>(m_OrientationInObjectSpaceMTime) << std::endl; os << indent << "AttachedToSlice: " << m_AttachedToSlice << std::endl; } diff --git a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h index 666f7d3d798..40395392de4 100644 --- a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.h @@ -72,7 +72,7 @@ class ITK_TEMPLATE_EXPORT DTITubeSpatialObject DTITubeSpatialObject(); ~DTITubeSpatialObject() override = default; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; }; } // end namespace itk diff --git a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.hxx index 5087902682a..4ec45a28677 100644 --- a/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkDTITubeSpatialObject.hxx @@ -29,14 +29,14 @@ DTITubeSpatialObject::DTITubeSpatialObject() } template -typename LightObject::Pointer +LightObject::Pointer DTITubeSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h b/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h index b1220479a37..698e7ebaff2 100644 --- a/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkEllipseSpatialObject.h @@ -133,7 +133,7 @@ class ITK_TEMPLATE_EXPORT EllipseSpatialObject : public SpatialObject::ComputeMyBoundingBox() } template -typename LightObject::Pointer +LightObject::Pointer EllipseSpatialObject::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("Downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/SpatialObjects/include/itkGaussianSpatialObject.h b/Modules/Core/SpatialObjects/include/itkGaussianSpatialObject.h index a5386c35db6..b6aabd3f05b 100644 --- a/Modules/Core/SpatialObjects/include/itkGaussianSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkGaussianSpatialObject.h @@ -148,7 +148,7 @@ class ITK_TEMPLATE_EXPORT GaussianSpatialObject : public SpatialObject::GetEllipsoid() const } template -typename LightObject::Pointer +LightObject::Pointer GaussianSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.h b/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.h index d7b95dee67f..2d8cc05ba3d 100644 --- a/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.h @@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT GroupSpatialObject : public SpatialObject GroupSpatialObject(); ~GroupSpatialObject() override = default; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; }; } // end namespace itk diff --git a/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.hxx index 8c4744c2ab5..5888255d1bd 100644 --- a/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkGroupSpatialObject.hxx @@ -29,12 +29,12 @@ GroupSpatialObject::GroupSpatialObject() } template -typename LightObject::Pointer +LightObject::Pointer GroupSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h b/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h index eb8ce14f609..4e9e2bfd890 100644 --- a/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkImageMaskSpatialObject.h @@ -131,7 +131,7 @@ class ITK_TEMPLATE_EXPORT ImageMaskSpatialObject : public ImageSpatialObject::ComputeMyBoundingBox() } template -typename LightObject::Pointer +LightObject::Pointer ImageMaskSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkImageSpatialObject.h b/Modules/Core/SpatialObjects/include/itkImageSpatialObject.h index c7e68bd1fbb..ff576285858 100644 --- a/Modules/Core/SpatialObjects/include/itkImageSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkImageSpatialObject.h @@ -145,7 +145,7 @@ class ITK_TEMPLATE_EXPORT ImageSpatialObject : public SpatialObject void PrintSelf(std::ostream & os, Indent indent) const override; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkImageSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkImageSpatialObject.hxx index e7436d399e6..e74fdfd2222 100644 --- a/Modules/Core/SpatialObjects/include/itkImageSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkImageSpatialObject.hxx @@ -168,12 +168,12 @@ ImageSpatialObject::GetImage() const -> const ImageType * } template -typename LightObject::Pointer +LightObject::Pointer ImageSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h index 3de6929c9ff..db9c2f59a1b 100644 --- a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.h @@ -67,7 +67,7 @@ class ITK_TEMPLATE_EXPORT LandmarkSpatialObject : public PointBasedSpatialObject LandmarkSpatialObject(); ~LandmarkSpatialObject() override = default; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; }; } // end namespace itk diff --git a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.hxx index bf5c52ce66b..24311ce1a91 100644 --- a/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkLandmarkSpatialObject.hxx @@ -36,12 +36,12 @@ LandmarkSpatialObject::LandmarkSpatialObject() } template -typename LightObject::Pointer +LightObject::Pointer LandmarkSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h index 4d9ffb97e92..04c98211e35 100644 --- a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.h @@ -81,7 +81,7 @@ class ITK_TEMPLATE_EXPORT LineSpatialObject LineSpatialObject(); ~LineSpatialObject() override = default; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; }; } // end namespace itk diff --git a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.hxx index 45fe2cc35b0..fd37b54e991 100644 --- a/Modules/Core/SpatialObjects/include/itkLineSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkLineSpatialObject.hxx @@ -33,12 +33,12 @@ LineSpatialObject::LineSpatialObject() } template -typename LightObject::Pointer +LightObject::Pointer LineSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h b/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h index 5f168cfe653..5fd75bd7020 100644 --- a/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h @@ -124,7 +124,7 @@ class ITK_TEMPLATE_EXPORT MeshSpatialObject : public SpatialObject::GetMesh() const -> const MeshType * } template -typename LightObject::Pointer +LightObject::Pointer MeshSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkMetaMeshConverter.hxx b/Modules/Core/SpatialObjects/include/itkMetaMeshConverter.hxx index e74ddda8fd8..6e29c50d94e 100644 --- a/Modules/Core/SpatialObjects/include/itkMetaMeshConverter.hxx +++ b/Modules/Core/SpatialObjects/include/itkMetaMeshConverter.hxx @@ -60,7 +60,7 @@ MetaMeshConverter::MetaObjectToSpatialObject auto mesh = MeshType::New(); // Add Points - using PointListType = typename MeshMetaObjectType::PointListType; + using PointListType = MeshMetaObjectType::PointListType; const PointListType points = _mesh->GetPoints(); auto it_points = points.begin(); @@ -82,7 +82,7 @@ MetaMeshConverter::MetaObjectToSpatialObject for (unsigned int celltype = 0; celltype < MET_NUM_CELL_TYPES; ++celltype) { - using CellListType = typename MetaMesh::CellListType; + using CellListType = MetaMesh::CellListType; const CellListType cells = _mesh->GetCells(static_cast(celltype)); auto it_cells = cells.begin(); @@ -145,7 +145,7 @@ MetaMeshConverter::MetaObjectToSpatialObject } // Add cell links - using CellLinkListType = typename MetaMesh::CellLinkListType; + using CellLinkListType = MetaMesh::CellLinkListType; const CellLinkListType links = _mesh->GetCellLinks(); auto it_links = links.begin(); diff --git a/Modules/Core/SpatialObjects/include/itkPointBasedSpatialObject.h b/Modules/Core/SpatialObjects/include/itkPointBasedSpatialObject.h index b10d031d0c9..ba89052305d 100644 --- a/Modules/Core/SpatialObjects/include/itkPointBasedSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkPointBasedSpatialObject.h @@ -145,7 +145,7 @@ class ITK_TEMPLATE_EXPORT PointBasedSpatialObject : public SpatialObject::IsInsideInObjectSp } template -typename LightObject::Pointer +LightObject::Pointer PointBasedSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.h b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.h index d9f288e15ae..3b8deebcd65 100644 --- a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.h @@ -105,7 +105,7 @@ class ITK_TEMPLATE_EXPORT PolygonSpatialObject void PrintSelf(std::ostream & os, Indent indent) const override; - typename LightObject::Pointer + LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx index d96b12a7867..51f36adbf02 100644 --- a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx @@ -283,12 +283,12 @@ PolygonSpatialObject::IsInsideInObjectSpace(const PointType & point) /** InternalClone */ template -typename LightObject::Pointer +LightObject::Pointer PolygonSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSpatialObject.h index d4d9ad046ce..4b2b6f1c527 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSpatialObject.h @@ -733,7 +733,7 @@ class ITK_TEMPLATE_EXPORT SpatialObject : public DataObject return m_MyBoundingBoxInObjectSpace.GetPointer(); } - typename LightObject::Pointer + LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkSpatialObject.hxx index 7586249ef37..d306162b27f 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkSpatialObject.hxx @@ -322,10 +322,10 @@ SpatialObject::ValueAtChildrenInObjectSpace(const PointType & poin } template -typename LightObject::Pointer +LightObject::Pointer SpatialObject::InternalClone() const { - typename LightObject::Pointer loPtr = CreateAnother(); + LightObject::Pointer loPtr = CreateAnother(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx b/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx index 044117b385c..2819f9abd40 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx +++ b/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx @@ -131,7 +131,7 @@ SpatialObjectPoint::PrintSelf(std::ostream & os, Indent indent) os << indent << "PositionInObjectSpace: " << static_cast::PrintType>(m_PositionInObjectSpace) << std::endl; - os << indent << "Color: " << static_cast::PrintType>(m_Color) << std::endl; + os << indent << "Color: " << static_cast::PrintType>(m_Color) << std::endl; os << indent << "ScalarDictionary: " << std::endl; for (const auto & keyval : m_ScalarDictionary) diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageStatisticsCalculator.hxx b/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageStatisticsCalculator.hxx index 829337a0427..80e8448cb0e 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageStatisticsCalculator.hxx +++ b/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageStatisticsCalculator.hxx @@ -222,17 +222,15 @@ SpatialObjectToImageStatisticsCalculator::PrintType>(m_Sum) << std::endl; - os << indent << "NumberOfPixels: " << static_cast::PrintType>(m_NumberOfPixels) + os << indent << "NumberOfPixels: " << static_cast::PrintType>(m_NumberOfPixels) << std::endl; os << indent << "CovarianceMatrix: " << m_CovarianceMatrix << std::endl; os << indent << "SampleDirection: " << m_SampleDirection << std::endl; - os << indent - << "InternalImageTime: " << static_cast::PrintType>(m_InternalImageTime) + os << indent << "InternalImageTime: " << static_cast::PrintType>(m_InternalImageTime) << std::endl; os << indent << "InternalSpatialObjectTime: " - << static_cast::PrintType>(m_InternalSpatialObjectTime) << std::endl; - os << indent << "ModifiedTime: " << static_cast::PrintType>(m_ModifiedTime) - << std::endl; + << static_cast::PrintType>(m_InternalSpatialObjectTime) << std::endl; + os << indent << "ModifiedTime: " << static_cast::PrintType>(m_ModifiedTime) << std::endl; itkPrintSelfObjectMacro(Sample); } diff --git a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h index 3a44ad68bd2..4e927715467 100644 --- a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.h @@ -85,7 +85,7 @@ class ITK_TEMPLATE_EXPORT SurfaceSpatialObject SurfaceSpatialObject(); ~SurfaceSpatialObject() override = default; - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; }; diff --git a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.hxx index 922c6fbd179..e5734d79738 100644 --- a/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkSurfaceSpatialObject.hxx @@ -49,12 +49,12 @@ SurfaceSpatialObject::Clear() } template -typename LightObject::Pointer +LightObject::Pointer SurfaceSpatialObject::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h b/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h index 72a9444a843..ae540728f01 100644 --- a/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h @@ -141,7 +141,7 @@ class ITK_TEMPLATE_EXPORT TubeSpatialObject : public PointBasedSpatialObject::CopyInformation(const DataObject } template -typename LightObject::Pointer +LightObject::Pointer TubeSpatialObject::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx b/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx index 0dc1aef774f..b62e42a1a9f 100644 --- a/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx @@ -67,7 +67,7 @@ itkImageSpatialObjectTest(int, char *[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(imageSO, ImageSpatialObject, SpatialObject); - constexpr typename ImageSpatialObject::IndexType sliceNumber{}; + constexpr ImageSpatialObject::IndexType sliceNumber{}; imageSO->SetSliceNumber(sliceNumber); ITK_TEST_SET_GET_VALUE(sliceNumber, imageSO->GetSliceNumber()); diff --git a/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h b/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h index c5e80dfd72b..6d97a42f5e8 100644 --- a/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h +++ b/Modules/Core/TestKernel/include/itkTestingHashImageFilter.h @@ -80,7 +80,7 @@ class ITK_TEMPLATE_EXPORT HashImageFilter : public InPlaceImageFilter; diff --git a/Modules/Core/Transform/include/itkCompositeTransform.h b/Modules/Core/Transform/include/itkCompositeTransform.h index 85be6973456..41f6054baaa 100644 --- a/Modules/Core/Transform/include/itkCompositeTransform.h +++ b/Modules/Core/Transform/include/itkCompositeTransform.h @@ -426,7 +426,7 @@ class ITK_TEMPLATE_EXPORT CompositeTransform : public MultiTransform::PrintSelf(std::ostream & o } os << indent << "PreviousTransformsToOptimizeUpdateTime: " - << static_cast::PrintType>(m_PreviousTransformsToOptimizeUpdateTime) - << std::endl; + << static_cast::PrintType>(m_PreviousTransformsToOptimizeUpdateTime) << std::endl; } template -typename LightObject::Pointer +LightObject::Pointer CompositeTransform::InternalClone() const { // This class doesn't use its superclass implementation // TODO: is it really the right behavior? // LightObject::Pointer loPtr = Superclass::InternalClone(); - LightObject::Pointer loPtr = CreateAnother(); - const typename Self::Pointer clone = dynamic_cast(loPtr.GetPointer()); + LightObject::Pointer loPtr = CreateAnother(); + const Self::Pointer clone = dynamic_cast(loPtr.GetPointer()); if (clone.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); diff --git a/Modules/Core/Transform/include/itkTransform.h b/Modules/Core/Transform/include/itkTransform.h index 18ecf6d0893..f01d54b5c94 100644 --- a/Modules/Core/Transform/include/itkTransform.h +++ b/Modules/Core/Transform/include/itkTransform.h @@ -564,7 +564,7 @@ class ITK_TEMPLATE_EXPORT Transform : public TransformBaseTemplate::GetTransform template -typename LightObject::Pointer +LightObject::Pointer Transform::InternalClone() const { // Default implementation just copies the parameters from // this to new transform. - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest2.cxx b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest2.cxx index 4198e12f840..516a278e678 100644 --- a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest2.cxx +++ b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest2.cxx @@ -86,7 +86,7 @@ class BSplineDeformableTransformTest2Helper movingReader->SetFileName(argv[3]); - const typename FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); + const FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); using FilterType = itk::ResampleImageFilter; @@ -99,17 +99,16 @@ class BSplineDeformableTransformTest2Helper resampler->SetInterpolator(interpolator); - typename FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); - typename FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); - const typename FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); + FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); + FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); + const FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); resampler->SetOutputSpacing(fixedSpacing); resampler->SetOutputOrigin(fixedOrigin); resampler->SetOutputDirection(fixedDirection); - - const typename FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); - typename FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); + const FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); + FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); resampler->SetSize(fixedSize); resampler->SetOutputStartIndex(fixedRegion.GetIndex()); diff --git a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest3.cxx b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest3.cxx index c9802b53e86..47a7b9ad88f 100644 --- a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest3.cxx +++ b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest3.cxx @@ -87,7 +87,7 @@ class BSplineDeformableTransformTest3Helper movingReader->SetFileName(argv[3]); - const typename FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); + const FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); using FilterType = itk::ResampleImageFilter; @@ -100,17 +100,16 @@ class BSplineDeformableTransformTest3Helper resampler->SetInterpolator(interpolator); - typename FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); - typename FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); - const typename FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); + FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); + FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); + const FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); resampler->SetOutputSpacing(fixedSpacing); resampler->SetOutputOrigin(fixedOrigin); resampler->SetOutputDirection(fixedDirection); - - const typename FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); - typename FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); + const FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); + FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); resampler->SetSize(fixedSize); resampler->SetOutputStartIndex(fixedRegion.GetIndex()); diff --git a/Modules/Core/Transform/test/itkBSplineTransformGTest.cxx b/Modules/Core/Transform/test/itkBSplineTransformGTest.cxx index 5f58de75813..38790376be0 100644 --- a/Modules/Core/Transform/test/itkBSplineTransformGTest.cxx +++ b/Modules/Core/Transform/test/itkBSplineTransformGTest.cxx @@ -109,9 +109,9 @@ TEST(ITKBSplineTransform, CopyingClone) using namespace itk::GTest::TypedefsAndConstructors::Dimension2; using BSplineType = itk::BSplineTransform; - using ImageType = typename BSplineType::ImageType; + using ImageType = BSplineType::ImageType; - typename BSplineType::CoefficientImageArray coeffImageArray; + BSplineType::CoefficientImageArray coeffImageArray; ASSERT_EQ(coeffImageArray.Size(), 2); diff --git a/Modules/Core/Transform/test/itkBSplineTransformTest2.cxx b/Modules/Core/Transform/test/itkBSplineTransformTest2.cxx index 56a6e929267..947d7191bf8 100644 --- a/Modules/Core/Transform/test/itkBSplineTransformTest2.cxx +++ b/Modules/Core/Transform/test/itkBSplineTransformTest2.cxx @@ -86,7 +86,7 @@ class BSplineTransformTest2Helper movingReader->SetFileName(argv[3]); - const typename FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); + const FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); using FilterType = itk::ResampleImageFilter; @@ -99,17 +99,17 @@ class BSplineTransformTest2Helper resampler->SetInterpolator(interpolator); - typename FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); - const typename FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); - const typename FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); + FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); + const FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); + const FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); resampler->SetOutputSpacing(fixedSpacing); resampler->SetOutputOrigin(fixedOrigin); resampler->SetOutputDirection(fixedDirection); - const typename FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); - typename FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); + const FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); + FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); resampler->SetSize(fixedSize); resampler->SetOutputStartIndex(fixedRegion.GetIndex()); diff --git a/Modules/Core/Transform/test/itkBSplineTransformTest3.cxx b/Modules/Core/Transform/test/itkBSplineTransformTest3.cxx index e9f124b00d2..1dfec23a8e5 100644 --- a/Modules/Core/Transform/test/itkBSplineTransformTest3.cxx +++ b/Modules/Core/Transform/test/itkBSplineTransformTest3.cxx @@ -86,7 +86,7 @@ class BSplineTransformTest3Helper movingReader->SetFileName(argv[3]); - const typename FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); + const FixedImageType::ConstPointer fixedImage = fixedReader->GetOutput(); using FilterType = itk::ResampleImageFilter; @@ -99,17 +99,17 @@ class BSplineTransformTest3Helper resampler->SetInterpolator(interpolator); - typename FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); - const typename FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); - const typename FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); + FixedImageType::SpacingType fixedSpacing = fixedImage->GetSpacing(); + const FixedImageType::PointType fixedOrigin = fixedImage->GetOrigin(); + const FixedImageType::DirectionType fixedDirection = fixedImage->GetDirection(); resampler->SetOutputSpacing(fixedSpacing); resampler->SetOutputOrigin(fixedOrigin); resampler->SetOutputDirection(fixedDirection); - const typename FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); - typename FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); + const FixedImageType::RegionType fixedRegion = fixedImage->GetBufferedRegion(); + FixedImageType::SizeType fixedSize = fixedRegion.GetSize(); resampler->SetSize(fixedSize); resampler->SetOutputStartIndex(fixedRegion.GetIndex()); diff --git a/Modules/Core/Transform/test/itkFixedCenterOfRotationAffineTransformTest.cxx b/Modules/Core/Transform/test/itkFixedCenterOfRotationAffineTransformTest.cxx index bd74f8f8890..e6d5afc5dfd 100644 --- a/Modules/Core/Transform/test/itkFixedCenterOfRotationAffineTransformTest.cxx +++ b/Modules/Core/Transform/test/itkFixedCenterOfRotationAffineTransformTest.cxx @@ -108,7 +108,7 @@ itkFixedCenterOfRotationAffineTransformTest(int, char *[]) ITK_TEST_EXPECT_EQUAL(scale1[i], scale3[i]); } - const typename FCoRAffine2DType::InputVectorType vScale = itk::MakeVector(2.0, 4.0); + const FCoRAffine2DType::InputVectorType vScale = itk::MakeVector(2.0, 4.0); aff2->SetScaleComponent(vScale); ITK_TEST_SET_GET_VALUE(vScale, aff2->GetScaleComponent()); diff --git a/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx b/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx index 1de7c6e75ca..3413f5b2bc6 100644 --- a/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx +++ b/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx @@ -42,15 +42,15 @@ itkRigid3DPerspectiveTransformTest(int, char *[]) const typename TransformType::InputVectorType vector = itk::MakeVector(1.0, 4.0, 9.0); ITK_TRY_EXPECT_EXCEPTION(transform->TransformVector(vector)); - typename TransformType::InputVnlVectorType vnlVector; + TransformType::InputVnlVectorType vnlVector; vnlVector.fill(1.0); ITK_TRY_EXPECT_EXCEPTION(transform->TransformVector(vnlVector)); - auto covVector = itk::MakeFilled(1.0); + auto covVector = itk::MakeFilled(1.0); ITK_TRY_EXPECT_EXCEPTION(transform->TransformCovariantVector(covVector)); - auto point = itk::MakeFilled(1.0); - typename TransformType::JacobianPositionType jacobianPosition; + auto point = itk::MakeFilled(1.0); + TransformType::JacobianPositionType jacobianPosition; ITK_TRY_EXPECT_EXCEPTION(transform->ComputeJacobianWithRespectToPosition(point, jacobianPosition)); } diff --git a/Modules/Core/Transform/test/itkScaleTransformTest.cxx b/Modules/Core/Transform/test/itkScaleTransformTest.cxx index 82dc5bc2830..c30419a862f 100644 --- a/Modules/Core/Transform/test/itkScaleTransformTest.cxx +++ b/Modules/Core/Transform/test/itkScaleTransformTest.cxx @@ -63,7 +63,7 @@ itkScaleTransformTest(int, char *[]) identityTransform->SetIdentity(); - typename TransformType::ScaleType identityScale{ 1.0 }; + TransformType::ScaleType identityScale{ 1.0 }; ITK_TEST_SET_GET_VALUE(identityScale, identityTransform->GetScale()); if (!Ok) diff --git a/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx b/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx index a55dd664e28..de2a5283aaf 100644 --- a/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx +++ b/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx @@ -942,7 +942,7 @@ MRIBiasFieldCorrectionFilter::PrintSelf(s os << indent << "BiasFieldDegree: " << m_BiasFieldDegree << std::endl; os << indent << "NumberOfLevels: " << m_NumberOfLevels << std::endl; - os << indent << "Schedule: " << static_cast::PrintType>(m_Schedule) << std::endl; + os << indent << "Schedule: " << static_cast::PrintType>(m_Schedule) << std::endl; os << indent << "VolumeCorrectionMaximumIteration: " << m_VolumeCorrectionMaximumIteration << std::endl; os << indent << "InterSliceCorrectionMaximumIteration: " << m_InterSliceCorrectionMaximumIteration << std::endl; diff --git a/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryClosingByReconstructionImageFilterTest.cxx b/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryClosingByReconstructionImageFilterTest.cxx index aa50dc4cc16..7ed1bfd671b 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryClosingByReconstructionImageFilterTest.cxx +++ b/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryClosingByReconstructionImageFilterTest.cxx @@ -66,7 +66,7 @@ itkBinaryClosingByReconstructionImageFilterTest(int argc, char * argv[]) auto fullyConnected = static_cast(std::stoi(argv[3])); ITK_TEST_SET_GET_BOOLEAN(reconstructionFilter, FullyConnected, fullyConnected); - const typename FilterType::InputImagePixelType foregroundValue = std::stoi(argv[4]); + const FilterType::InputImagePixelType foregroundValue = std::stoi(argv[4]); reconstructionFilter->SetForegroundValue(foregroundValue); ITK_TEST_SET_GET_VALUE(foregroundValue, reconstructionFilter->GetForegroundValue()); diff --git a/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryOpeningByReconstructionImageFilterTest.cxx b/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryOpeningByReconstructionImageFilterTest.cxx index 16cb2d3c7d8..aa4e72ddd73 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryOpeningByReconstructionImageFilterTest.cxx +++ b/Modules/Filtering/BinaryMathematicalMorphology/test/itkBinaryOpeningByReconstructionImageFilterTest.cxx @@ -64,11 +64,11 @@ itkBinaryOpeningByReconstructionImageFilterTest(int argc, char * argv[]) auto fullyConnected = static_cast(std::stoi(argv[4])); ITK_TEST_SET_GET_BOOLEAN(reconstruction, FullyConnected, fullyConnected); - auto foregroundValue = static_cast(std::stoi(argv[5])); + auto foregroundValue = static_cast(std::stoi(argv[5])); reconstruction->SetForegroundValue(foregroundValue); ITK_TEST_SET_GET_VALUE(foregroundValue, reconstruction->GetForegroundValue()); - auto backgroundValue = static_cast(std::stoi(argv[6])); + auto backgroundValue = static_cast(std::stoi(argv[6])); reconstruction->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, reconstruction->GetBackgroundValue()); diff --git a/Modules/Filtering/Convolution/test/itkConvolutionImageFilterStreamingTest.cxx b/Modules/Filtering/Convolution/test/itkConvolutionImageFilterStreamingTest.cxx index e83efa091cf..64dd6bc9fda 100644 --- a/Modules/Filtering/Convolution/test/itkConvolutionImageFilterStreamingTest.cxx +++ b/Modules/Filtering/Convolution/test/itkConvolutionImageFilterStreamingTest.cxx @@ -28,11 +28,11 @@ using KernelImageType = itk::Image; -typename KernelImageType::Pointer +KernelImageType::Pointer GenerateKernelForStreamingTest() { using SourceType = itk::GaussianImageSource; - using KernelSizeType = typename SourceType::SizeType; + using KernelSizeType = SourceType::SizeType; auto source = SourceType::New(); constexpr KernelSizeType kernelSize{ 3, 5 }; source->SetSize(kernelSize); @@ -52,9 +52,9 @@ doConvolutionImageFilterStreamingTest(int argc, char * argv[]) using PixelType = float; using ImageType = itk::Image; - using RegionType = typename ImageType::RegionType; - using SizeType = typename RegionType::SizeType; - using IndexType = typename RegionType::IndexType; + using RegionType = ImageType::RegionType; + using SizeType = RegionType::SizeType; + using IndexType = RegionType::IndexType; // Request a subregion of the largest possible output IndexType requestedIndex; diff --git a/Modules/Filtering/Convolution/test/itkConvolutionImageFilterSubregionTest.cxx b/Modules/Filtering/Convolution/test/itkConvolutionImageFilterSubregionTest.cxx index 454632d7c63..58614cbe5b8 100644 --- a/Modules/Filtering/Convolution/test/itkConvolutionImageFilterSubregionTest.cxx +++ b/Modules/Filtering/Convolution/test/itkConvolutionImageFilterSubregionTest.cxx @@ -26,11 +26,11 @@ using KernelImageType = itk::Image; -typename KernelImageType::Pointer +KernelImageType::Pointer GenerateGaussianKernelForSubregionTest() { using SourceType = itk::GaussianImageSource; - using KernelSizeType = typename SourceType::SizeType; + using KernelSizeType = SourceType::SizeType; auto source = SourceType::New(); constexpr KernelSizeType kernelSize{ 3, 5 }; source->SetSize(kernelSize); @@ -51,9 +51,9 @@ doConvolutionImageFilterSubregionTest(int argc, char * argv[]) using PixelType = float; using ImageType = itk::Image; - using RegionType = typename ImageType::RegionType; - using SizeType = typename RegionType::SizeType; - using IndexType = typename RegionType::IndexType; + using RegionType = ImageType::RegionType; + using SizeType = RegionType::SizeType; + using IndexType = RegionType::IndexType; // Request a subregion of the largest possible output IndexType requestedIndex; diff --git a/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.hxx b/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.hxx index e1780d52c9d..5d38aa40349 100644 --- a/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.hxx +++ b/Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.hxx @@ -90,7 +90,7 @@ DiffusionTensor3DReconstructionImageFilter::Pointer maskSpatialObject = + const ImageMaskSpatialObject<3>::Pointer maskSpatialObject = dynamic_cast *>(this->ProcessObject::GetInput(1)); if (maskSpatialObject.IsNull()) { @@ -176,7 +176,7 @@ DiffusionTensor3DReconstructionImageFilter D(6); // if a mask is present, iterate through mask image and skip zero voxels - typename MaskSpatialObjectType::Pointer maskSpatialObject; + MaskSpatialObjectType::Pointer maskSpatialObject; if (this->m_MaskImagePresent) { maskSpatialObject = static_cast(this->ProcessObject::GetInput(1)); diff --git a/Modules/Filtering/DisplacementField/include/itkBSplineExponentialDiffeomorphicTransform.hxx b/Modules/Filtering/DisplacementField/include/itkBSplineExponentialDiffeomorphicTransform.hxx index c9a415ce5d4..d0c828ed36a 100644 --- a/Modules/Filtering/DisplacementField/include/itkBSplineExponentialDiffeomorphicTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkBSplineExponentialDiffeomorphicTransform.hxx @@ -195,8 +195,7 @@ BSplineExponentialDiffeomorphicTransform::Prin << "NumberOfControlPointsForTheConstantVelocityField: " << m_NumberOfControlPointsForTheConstantVelocityField << std::endl; os << indent << "NumberOfControlPointsForTheUpdateField: " << m_NumberOfControlPointsForTheUpdateField << std::endl; - os << indent << "SplineOrder: " << static_cast::PrintType>(m_SplineOrder) - << std::endl; + os << indent << "SplineOrder: " << static_cast::PrintType>(m_SplineOrder) << std::endl; } } // namespace itk diff --git a/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.h b/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.h index f934cd88d51..ef7eb7c49d0 100644 --- a/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.h +++ b/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.h @@ -181,7 +181,7 @@ class ITK_TEMPLATE_EXPORT BSplineSmoothingOnUpdateDisplacementFieldTransform PrintSelf(std::ostream & os, Indent indent) const override; /** Clone the current transform */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; /** Smooth the displacement field using B-splines. diff --git a/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.hxx b/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.hxx index 81f1d63b569..79d001431be 100644 --- a/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransform.hxx @@ -182,12 +182,12 @@ BSplineSmoothingOnUpdateDisplacementFieldTransform -typename LightObject::Pointer +LightObject::Pointer BSplineSmoothingOnUpdateDisplacementFieldTransform::InternalClone() const { LightObject::Pointer loPtr = Superclass::InternalClone(); - const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); + const Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) { itkExceptionMacro("downcast to type " << this->GetNameOfClass() << " failed."); @@ -214,8 +214,7 @@ BSplineSmoothingOnUpdateDisplacementFieldTransform::PrintType>(m_SplineOrder) - << std::endl; + os << indent << "SplineOrder: " << static_cast::PrintType>(m_SplineOrder) << std::endl; itkPrintSelfBooleanMacro(EnforceStationaryBoundary); os << indent << "NumberOfControlPointsForTheUpdateField: " << m_NumberOfControlPointsForTheUpdateField << std::endl; os << indent << "NumberOfControlPointsForTheTotalField: " << m_NumberOfControlPointsForTheTotalField << std::endl; diff --git a/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.h b/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.h index b310ef9d63f..bb442765199 100644 --- a/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.h +++ b/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.h @@ -199,7 +199,7 @@ class ITK_TEMPLATE_EXPORT ConstantVelocityFieldTransform PrintSelf(std::ostream & os, Indent indent) const override; /** Clone the current transform */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; typename DisplacementFieldType::Pointer diff --git a/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.hxx b/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.hxx index 2ee1fb30b7b..4d8a45911b4 100644 --- a/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkConstantVelocityFieldTransform.hxx @@ -313,7 +313,7 @@ ConstantVelocityFieldTransform::CopyDisplaceme } template -typename LightObject::Pointer +LightObject::Pointer ConstantVelocityFieldTransform::InternalClone() const { // create a new instance diff --git a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldJacobianDeterminantFilter.hxx b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldJacobianDeterminantFilter.hxx index fce8877f2f7..891407e8030 100644 --- a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldJacobianDeterminantFilter.hxx +++ b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldJacobianDeterminantFilter.hxx @@ -235,7 +235,7 @@ DisplacementFieldJacobianDeterminantFilter os << indent << "HalfDerivativeWeights: " << m_HalfDerivativeWeights << std::endl; itkPrintSelfBooleanMacro(UseImageSpacing); os << indent << "RequestedNumberOfThreads: " - << static_cast::PrintType>(m_RequestedNumberOfWorkUnits) << std::endl; + << static_cast::PrintType>(m_RequestedNumberOfWorkUnits) << std::endl; os << indent << "RealValuedInputImage: " << m_RealValuedInputImage.GetPointer() << std::endl; os << indent << "NeighborhoodRadius: " << static_cast::PrintType>(m_NeighborhoodRadius) diff --git a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldTransform.hxx b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldTransform.hxx index 9c1697837d2..f3f275b4e5d 100644 --- a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldTransform.hxx @@ -588,7 +588,7 @@ DisplacementFieldTransform::PrintSelf(std::ost itkPrintSelfObjectMacro(InverseInterpolator); os << indent << "DisplacementFieldSetTime: " - << static_cast::PrintType>(m_DisplacementFieldSetTime) << std::endl; + << static_cast::PrintType>(m_DisplacementFieldSetTime) << std::endl; os << indent << "IdentityJacobian: " << static_cast::PrintType>(m_IdentityJacobian) diff --git a/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.h b/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.h index eb7cc7b2f67..7583bdfc7b2 100644 --- a/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.h +++ b/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.h @@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT GaussianSmoothingOnUpdateDisplacementFieldTransform PrintSelf(std::ostream & os, Indent indent) const override; /** Clone the current transform */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; /** Used in GaussianSmoothDisplacementField as variance for the diff --git a/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.hxx b/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.hxx index 162c18b7c3a..84c107b4fa8 100644 --- a/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransform.hxx @@ -216,7 +216,7 @@ GaussianSmoothingOnUpdateDisplacementFieldTransform -typename LightObject::Pointer +LightObject::Pointer GaussianSmoothingOnUpdateDisplacementFieldTransform::InternalClone() const { LightObject::Pointer loPtr = Superclass::InternalClone(); diff --git a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h index bd63f2f06ee..b9e966a1615 100644 --- a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h +++ b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.h @@ -214,7 +214,7 @@ class ITK_TEMPLATE_EXPORT VelocityFieldTransform : public DisplacementFieldTrans PrintSelf(std::ostream & os, Indent indent) const override; /** Clone the current transform */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; typename DisplacementFieldType::Pointer diff --git a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.hxx b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.hxx index 27b4c4d1c0a..b35487489ce 100644 --- a/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.hxx +++ b/Modules/Filtering/DisplacementField/include/itkVelocityFieldTransform.hxx @@ -240,7 +240,7 @@ VelocityFieldTransform::CopyDisplacementField( } template -typename LightObject::Pointer +LightObject::Pointer VelocityFieldTransform::InternalClone() const { // create a new instance diff --git a/Modules/Filtering/DisplacementField/test/itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest.cxx index 8344b6d32da..9d22506933b 100644 --- a/Modules/Filtering/DisplacementField/test/itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest.cxx @@ -42,14 +42,12 @@ itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest(int, char *[]) displacementTransform, BSplineSmoothingOnUpdateDisplacementFieldTransform, DisplacementFieldTransform); - constexpr typename DisplacementTransformType::ArrayType::ValueType controlPointsUpdateFieldVal = 4; - auto controlPointsUpdateField = - itk::MakeFilled(controlPointsUpdateFieldVal); + constexpr DisplacementTransformType::ArrayType::ValueType controlPointsUpdateFieldVal = 4; + auto controlPointsUpdateField = itk::MakeFilled(controlPointsUpdateFieldVal); ITK_TEST_SET_GET_VALUE(controlPointsUpdateField, displacementTransform->GetNumberOfControlPointsForTheUpdateField()); - constexpr typename DisplacementTransformType::ArrayType::ValueType controlPointsTotalFieldVal = 0; - auto controlPointsTotalField = - itk::MakeFilled(controlPointsTotalFieldVal); + constexpr DisplacementTransformType::ArrayType::ValueType controlPointsTotalFieldVal = 0; + auto controlPointsTotalField = itk::MakeFilled(controlPointsTotalFieldVal); ITK_TEST_SET_GET_VALUE(controlPointsTotalField, displacementTransform->GetNumberOfControlPointsForTheTotalField()); using FieldType = DisplacementTransformType::DisplacementFieldType; @@ -83,7 +81,7 @@ itkBSplineSmoothingOnUpdateDisplacementFieldTransformTest(int, char *[]) auto meshSizeForTotalField = itk::MakeFilled(30); displacementTransform->SetMeshSizeForTheTotalField(meshSizeForTotalField); - constexpr typename DisplacementTransformType::SplineOrderType splineOrder = 3; + constexpr DisplacementTransformType::SplineOrderType splineOrder = 3; displacementTransform->SetSplineOrder(splineOrder); ITK_TEST_SET_GET_VALUE(splineOrder, displacementTransform->GetSplineOrder()); diff --git a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx index 18ac02b4eb4..02c3e18ba95 100644 --- a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx @@ -106,8 +106,8 @@ itkDisplacementFieldToBSplineImageFilterTest(int, char *[]) bspliner->SetSplineOrder(splineOrder); ITK_TEST_SET_GET_VALUE(splineOrder, bspliner->GetSplineOrder()); - typename BSplineFilterType::ArrayType::ValueType numberOfFittingLevelsVal = 8; - auto numberOfFittingLevels = itk::MakeFilled(numberOfFittingLevelsVal); + BSplineFilterType::ArrayType::ValueType numberOfFittingLevelsVal = 8; + auto numberOfFittingLevels = itk::MakeFilled(numberOfFittingLevelsVal); bspliner->SetNumberOfFittingLevels(numberOfFittingLevelsVal); ITK_TEST_SET_GET_VALUE(numberOfFittingLevels, bspliner->GetNumberOfFittingLevels()); @@ -118,19 +118,19 @@ itkDisplacementFieldToBSplineImageFilterTest(int, char *[]) ITK_TEST_SET_GET_BOOLEAN(bspliner, EstimateInverse, false); - constexpr typename BSplineFilterType::OriginType::ValueType bSplineDomainOriginVal = 0.0; - auto bSplineDomainOrigin = itk::MakeFilled(bSplineDomainOriginVal); + constexpr BSplineFilterType::OriginType::ValueType bSplineDomainOriginVal = 0.0; + auto bSplineDomainOrigin = itk::MakeFilled(bSplineDomainOriginVal); ITK_TEST_EXPECT_EQUAL(bSplineDomainOrigin, bspliner->GetBSplineDomainOrigin()); - constexpr typename BSplineFilterType::SpacingType::ValueType bSplineDomainSpacingVal = 1.0; - auto bSplineDomainSpacing = itk::MakeFilled(bSplineDomainSpacingVal); + constexpr BSplineFilterType::SpacingType::ValueType bSplineDomainSpacingVal = 1.0; + auto bSplineDomainSpacing = itk::MakeFilled(bSplineDomainSpacingVal); ITK_TEST_EXPECT_EQUAL(bSplineDomainSpacing, bspliner->GetBSplineDomainSpacing()); - constexpr typename BSplineFilterType::SizeType::value_type bSplineDomainSizeVal = 0; + constexpr BSplineFilterType::SizeType::value_type bSplineDomainSizeVal = 0; auto bSplineDomainSize = BSplineFilterType::SizeType::Filled(bSplineDomainSizeVal); ITK_TEST_EXPECT_EQUAL(bSplineDomainSize, bspliner->GetBSplineDomainSize()); - typename BSplineFilterType::DirectionType bSplineDomainDirection; + BSplineFilterType::DirectionType bSplineDomainDirection; bSplineDomainDirection.SetIdentity(); ITK_TEST_EXPECT_EQUAL(bSplineDomainDirection, bspliner->GetBSplineDomainDirection()); diff --git a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx index e6d78e8dc61..74334864598 100644 --- a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx @@ -568,16 +568,14 @@ itkDisplacementFieldTransformTest(int argc, char * argv[]) { std::cerr << "Test failed!" << std::endl; std::cerr << "Error in UpdateTransformParameters at index [" << i << "]" << std::endl; - std::cerr - << "Expected value " - << static_cast::PrintType>( - updateTruth[i]) - << std::endl; - std::cerr - << " differs from " - << static_cast::PrintType>( - params[i]) - << std::endl; + std::cerr << "Expected value " + << static_cast::PrintType>( + updateTruth[i]) + << std::endl; + std::cerr << " differs from " + << static_cast::PrintType>( + params[i]) + << std::endl; return EXIT_FAILURE; } } diff --git a/Modules/Filtering/DisplacementField/test/itkInvertDisplacementFieldImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkInvertDisplacementFieldImageFilterTest.cxx index fd39c5077e3..df487bdd7a9 100644 --- a/Modules/Filtering/DisplacementField/test/itkInvertDisplacementFieldImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkInvertDisplacementFieldImageFilterTest.cxx @@ -101,11 +101,11 @@ itkInvertDisplacementFieldImageFilterTest(int argc, char * argv[]) inverter->SetMaximumNumberOfIterations(numberOfIterations); ITK_TEST_SET_GET_VALUE(numberOfIterations, inverter->GetMaximumNumberOfIterations()); - auto meanTolerance = static_cast(std::stod(argv[2])); + auto meanTolerance = static_cast(std::stod(argv[2])); inverter->SetMeanErrorToleranceThreshold(meanTolerance); ITK_TEST_SET_GET_VALUE(meanTolerance, inverter->GetMeanErrorToleranceThreshold()); - auto maxTolerance = static_cast(std::stod(argv[3])); + auto maxTolerance = static_cast(std::stod(argv[3])); inverter->SetMaxErrorToleranceThreshold(maxTolerance); ITK_TEST_SET_GET_VALUE(maxTolerance, inverter->GetMaxErrorToleranceThreshold()); diff --git a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx index b0b4be1b27c..4a38779f422 100644 --- a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx @@ -84,11 +84,11 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) integrator->SetInitialDiffeomorphism(initialDiffeomorphism); ITK_TEST_SET_GET_VALUE(initialDiffeomorphism, integrator->GetInitialDiffeomorphism()); - auto lowerTimeBound = static_cast(std::stod(argv[1])); + auto lowerTimeBound = static_cast(std::stod(argv[1])); integrator->SetLowerTimeBound(lowerTimeBound); ITK_TEST_SET_GET_VALUE(lowerTimeBound, integrator->GetLowerTimeBound()); - auto upperTimeBound = static_cast(std::stod(argv[2])); + auto upperTimeBound = static_cast(std::stod(argv[2])); integrator->SetUpperTimeBound(upperTimeBound); ITK_TEST_SET_GET_VALUE(upperTimeBound, integrator->GetUpperTimeBound()); @@ -107,11 +107,11 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) auto inverseIntegrator = IntegratorType::New(); - auto invLowerTimeBound = static_cast(std::stod(argv[7])); + auto invLowerTimeBound = static_cast(std::stod(argv[7])); inverseIntegrator->SetLowerTimeBound(invLowerTimeBound); ITK_TEST_SET_GET_VALUE(invLowerTimeBound, inverseIntegrator->GetLowerTimeBound()); - auto invUpperTimeBound = static_cast(std::stod(argv[8])); + auto invUpperTimeBound = static_cast(std::stod(argv[8])); inverseIntegrator->SetUpperTimeBound(invUpperTimeBound); ITK_TEST_SET_GET_VALUE(invUpperTimeBound, inverseIntegrator->GetUpperTimeBound()); @@ -213,10 +213,10 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) const TimeVaryingVelocityFieldType::Pointer timeVaryingVelocityField = importFilter->GetOutput(); - lowerTimeBound = static_cast(std::stod(argv[4])); + lowerTimeBound = static_cast(std::stod(argv[4])); integrator->SetLowerTimeBound(lowerTimeBound); - upperTimeBound = static_cast(std::stod(argv[5])); + upperTimeBound = static_cast(std::stod(argv[5])); integrator->SetUpperTimeBound(upperTimeBound); integrator->SetInput(timeVaryingVelocityField); diff --git a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx index ef3f229c88d..3fe420da471 100644 --- a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx @@ -201,8 +201,7 @@ DirectedHausdorffDistanceImageFilter::PrintSelf(std: os << indent << "MaxDistance: " << static_cast::PrintType>(m_MaxDistance) << std::endl; - os << indent << "PixelCount: " << static_cast::PrintType>(m_PixelCount) - << std::endl; + os << indent << "PixelCount: " << static_cast::PrintType>(m_PixelCount) << std::endl; os << indent << "Sum: " << m_Sum.GetSum(); os << std::endl; diff --git a/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest.cxx b/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest.cxx index b4fa36942cd..7dff1c78a83 100644 --- a/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest.cxx @@ -59,11 +59,11 @@ itkDirectedHausdorffDistanceImageFilterTest(int argc, char * argv[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, DirectedHausdorffDistanceImageFilter, ImageToImageFilter); - const typename ImageType::Pointer image1 = reader1->GetOutput(); + const ImageType::Pointer image1 = reader1->GetOutput(); filter->SetInput1(image1); ITK_TEST_SET_GET_VALUE(image1, filter->GetInput1()); - const typename ImageType::Pointer image2 = reader2->GetOutput(); + const ImageType::Pointer image2 = reader2->GetOutput(); filter->SetInput2(image2); ITK_TEST_SET_GET_VALUE(image2, filter->GetInput2()); diff --git a/Modules/Filtering/FFT/include/itkFFTWComplexToComplex1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkFFTWComplexToComplex1DFFTImageFilter.h index 763da6b71a8..955bb31a507 100644 --- a/Modules/Filtering/FFT/include/itkFFTWComplexToComplex1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkFFTWComplexToComplex1DFFTImageFilter.h @@ -59,8 +59,8 @@ class ITK_TEMPLATE_EXPORT FFTWComplexToComplex1DFFTImageFilter * configured in, or float if only double is configured. */ using FFTW1DProxyType = typename fftw::ComplexToComplexProxy; - using PlanArrayType = typename std::vector; - using PlanBufferPointerType = typename std::vector; + using PlanArrayType = std::vector; + using PlanBufferPointerType = std::vector; /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Modules/Filtering/FFT/include/itkFFTWForward1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkFFTWForward1DFFTImageFilter.h index 5640bebe976..5959d0f01cd 100644 --- a/Modules/Filtering/FFT/include/itkFFTWForward1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkFFTWForward1DFFTImageFilter.h @@ -61,8 +61,8 @@ class ITK_TEMPLATE_EXPORT FFTWForward1DFFTImageFilter : public Forward1DFFTImage * configured in, or float if only double is configured. */ using FFTW1DProxyType = typename fftw::ComplexToComplexProxy; - using PlanArrayType = typename std::vector; - using PlanBufferPointerType = typename std::vector; + using PlanArrayType = std::vector; + using PlanBufferPointerType = std::vector; /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Modules/Filtering/FFT/include/itkFFTWInverse1DFFTImageFilter.h b/Modules/Filtering/FFT/include/itkFFTWInverse1DFFTImageFilter.h index c6aaa9129cd..44298d07e56 100644 --- a/Modules/Filtering/FFT/include/itkFFTWInverse1DFFTImageFilter.h +++ b/Modules/Filtering/FFT/include/itkFFTWInverse1DFFTImageFilter.h @@ -61,8 +61,8 @@ class ITK_TEMPLATE_EXPORT FFTWInverse1DFFTImageFilter : public Inverse1DFFTImage * configured in, or float if only double is configured. */ using FFTW1DProxyType = typename fftw::ComplexToComplexProxy; - using PlanArrayType = typename std::vector; - using PlanBufferPointerType = typename std::vector; + using PlanArrayType = std::vector; + using PlanBufferPointerType = std::vector; /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.hxx b/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.hxx index be8c559bdf3..4666e9a0f9d 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.hxx +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingUpwindGradientImageFilter.hxx @@ -49,8 +49,7 @@ FastMarchingUpwindGradientImageFilter::PrintSelf(std::os os << indent << "TargetOffset: " << m_TargetOffset << std::endl; os << indent << "TargetReachedMode: " << m_TargetReachedMode << std::endl; os << indent << "TargetValue: " << m_TargetValue << std::endl; - os << indent - << "NumberOfTargets: " << static_cast::PrintType>(m_NumberOfTargets) + os << indent << "NumberOfTargets: " << static_cast::PrintType>(m_NumberOfTargets) << std::endl; } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx index 1d1df60c91a..75beb9b1a5c 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx @@ -144,7 +144,7 @@ itkFastMarchingBaseTest(int argc, char * argv[]) double normalizationFactor = 1.0; ITK_TEST_SET_GET_VALUE(normalizationFactor, fmm->GetNormalizationFactor()); - constexpr typename ImageFastMarching::OutputPixelType targetReachedValue{}; + constexpr ImageFastMarching::OutputPixelType targetReachedValue{}; ITK_TEST_EXPECT_EQUAL(targetReachedValue, fmm->GetTargetReachedValue()); bool collectPoints = false; @@ -155,9 +155,9 @@ itkFastMarchingBaseTest(int argc, char * argv[]) fmm->SetTopologyCheck(topologyCheck); ITK_TEST_SET_GET_VALUE(topologyCheck, fmm->GetTopologyCheck()); - auto processedPoints = ImageFastMarching::NodePairContainerType::New(); - typename ImageFastMarching::NodePairType node_pair; - constexpr ImageType::OffsetType offset{ 28, 35 }; + auto processedPoints = ImageFastMarching::NodePairContainerType::New(); + ImageFastMarching::NodePairType node_pair; + constexpr ImageType::OffsetType offset{ 28, 35 }; constexpr itk::Index index{}; diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx index ebb947c5e20..e05c41422f0 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx @@ -59,7 +59,7 @@ itkFastMarchingImageFilterRealTest1(int itkNotUsed(argc), char * itkNotUsed(argv auto criterion = CriterionType::New(); - constexpr typename FloatImageType::PixelType threshold = 100.0; + constexpr FloatImageType::PixelType threshold = 100.0; criterion->SetThreshold(threshold); ITK_TEST_SET_GET_VALUE(threshold, criterion->GetThreshold()); diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx index b991691658c..f85e3dbe16f 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx @@ -159,14 +159,14 @@ itkFastMarchingImageFilterRealTest2(int itkNotUsed(argc), char * itkNotUsed(argv adaptor->SetAliveImage(aliveImage.GetPointer()); ITK_TEST_SET_GET_VALUE(aliveImage.GetPointer(), adaptor->GetAliveImage()); - constexpr typename AdaptorType::OutputPixelType aliveValue = 0.0; + constexpr AdaptorType::OutputPixelType aliveValue = 0.0; adaptor->SetAliveValue(aliveValue); ITK_TEST_SET_GET_VALUE(aliveValue, adaptor->GetAliveValue()); adaptor->SetTrialImage(trialImage.GetPointer()); ITK_TEST_SET_GET_VALUE(trialImage.GetPointer(), adaptor->GetTrialImage()); - constexpr typename AdaptorType::OutputPixelType trialValue = 1.0; + constexpr AdaptorType::OutputPixelType trialValue = 1.0; adaptor->SetTrialValue(trialValue); ITK_TEST_SET_GET_VALUE(trialValue, adaptor->GetTrialValue()); diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx index 56c1dcf429d..ad383cbe591 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx @@ -145,29 +145,29 @@ itkFastMarchingTest(int argc, char * argv[]) auto collectPoints = static_cast(std::stoi(argv[4])); ITK_TEST_SET_GET_BOOLEAN(marcher, CollectPoints, collectPoints); - constexpr typename FloatImage::SizeType size = { { 64, 64 } }; + constexpr FloatImage::SizeType size = { { 64, 64 } }; marcher->SetOutputSize(size); ITK_TEST_SET_GET_VALUE(size, marcher->GetOutputSize()); auto outputRegionIndexValue = - static_cast(std::stoi(argv[5])); + static_cast(std::stoi(argv[5])); auto outputRegionIndex = FloatFMType::LevelSetImageType::IndexType::Filled(outputRegionIndexValue); - const typename FloatFMType::OutputRegionType outputRegion{ outputRegionIndex, size }; + const FloatFMType::OutputRegionType outputRegion{ outputRegionIndex, size }; marcher->SetOutputRegion(outputRegion); ITK_TEST_SET_GET_VALUE(outputRegion, marcher->GetOutputRegion()); - auto outputSpacingValue = static_cast(std::stod(argv[6])); - auto outputSpacing = itk::MakeFilled(outputSpacingValue); + auto outputSpacingValue = static_cast(std::stod(argv[6])); + auto outputSpacing = itk::MakeFilled(outputSpacingValue); marcher->SetOutputSpacing(outputSpacing); ITK_TEST_SET_GET_VALUE(outputSpacing, marcher->GetOutputSpacing()); - typename FloatFMType::OutputDirectionType outputDirection; + FloatFMType::OutputDirectionType outputDirection; outputDirection.SetIdentity(); marcher->SetOutputDirection(outputDirection); ITK_TEST_SET_GET_VALUE(outputDirection, marcher->GetOutputDirection()); - auto outputOriginValue = static_cast(std::stod(argv[7])); - auto outputOrigin = itk::MakeFilled(outputOriginValue); + auto outputOriginValue = static_cast(std::stod(argv[7])); + auto outputOrigin = itk::MakeFilled(outputOriginValue); marcher->SetOutputOrigin(outputOrigin); ITK_TEST_SET_GET_VALUE(outputOrigin, marcher->GetOutputOrigin()); diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx index 5dee4df7fbe..a93bcce0320 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx @@ -195,7 +195,7 @@ itkFastMarchingUpwindGradientBaseTest(int, char *[]) } criterion->SetTargetNodes(TargetNodes); - constexpr typename CriterionType::OutputPixelType targetOffset{}; + constexpr CriterionType::OutputPixelType targetOffset{}; criterion->SetTargetOffset(targetOffset); ITK_TEST_SET_GET_VALUE(targetOffset, criterion->GetTargetOffset()); diff --git a/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx index 982f97180eb..4b381d2e010 100644 --- a/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx @@ -69,7 +69,7 @@ itkTestingComparisonImageFilterTest(int argc, char * argv[]) auto ignoreBoundaryPixels = static_cast(std::stoi(argv[4])); ITK_TEST_SET_GET_BOOLEAN(filter, IgnoreBoundaryPixels, ignoreBoundaryPixels); - auto differenceThreshold = static_cast(std::stoi(argv[5])); + auto differenceThreshold = static_cast(std::stoi(argv[5])); filter->SetDifferenceThreshold(differenceThreshold); ITK_TEST_SET_GET_VALUE(differenceThreshold, filter->GetDifferenceThreshold()); @@ -99,13 +99,13 @@ itkTestingComparisonImageFilterTest(int argc, char * argv[]) char * end = nullptr; ITK_TEST_EXPECT_EQUAL(numberOfPixelsWithDifferences, std::strtoul(argv[7], &end, 10)); - auto minimumDifference = static_cast(std::stod(argv[8])); + auto minimumDifference = static_cast(std::stod(argv[8])); ITK_TEST_EXPECT_EQUAL(minimumDifference, filter->GetMinimumDifference()); - auto maximumDifference = static_cast(std::stod(argv[9])); + auto maximumDifference = static_cast(std::stod(argv[9])); ITK_TEST_EXPECT_EQUAL(maximumDifference, filter->GetMaximumDifference()); - auto meanDifference = static_cast(std::stod(argv[10])); + auto meanDifference = static_cast(std::stod(argv[10])); constexpr double epsilon{ 1e-4 }; std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); @@ -120,7 +120,7 @@ itkTestingComparisonImageFilterTest(int argc, char * argv[]) return EXIT_FAILURE; } - auto totalDifference = static_cast(std::stod(argv[11])); + auto totalDifference = static_cast(std::stod(argv[11])); ITK_TEST_EXPECT_EQUAL(totalDifference, filter->GetTotalDifference()); // Change test input spacing to test that comparison filter fails if spacings are different diff --git a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h index cbd0a182ca7..9bcb3853446 100644 --- a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DCirclesImageFilter.h @@ -94,10 +94,10 @@ class ITK_TEMPLATE_EXPORT HoughTransform2DCirclesImageFilter /** Circle type alias. */ using CircleType = EllipseSpatialObject<2>; - using CirclePointer = typename CircleType::Pointer; + using CirclePointer = CircleType::Pointer; using CirclesListType = std::list; - using CirclesListSizeType = typename CirclesListType::size_type; + using CirclesListSizeType = CirclesListType::size_type; /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(HoughTransform2DCirclesImageFilter); diff --git a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h index f9b0d0b6cd7..0848141132a 100644 --- a/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.h @@ -83,11 +83,11 @@ class ITK_TEMPLATE_EXPORT HoughTransform2DLinesImageFilter /** Line type alias */ using LineType = LineSpatialObject<2>; - using LinePointer = typename LineType::Pointer; + using LinePointer = LineType::Pointer; using LinesListType = std::list; using LinePointType = LineType::LinePointType; - using LinesListSizeType = typename LinesListType::size_type; + using LinesListSizeType = LinesListType::size_type; /** Standard "Superclass" type alias. */ using Superclass = ImageToImageFilter; diff --git a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx index cbddbd54246..6a628a9933e 100644 --- a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx @@ -50,8 +50,7 @@ MaskFeaturePointSelectionFilter::PrintSelf(std::ostrea os << indent << "NonConnectivity: " << m_NonConnectivity << std::endl; os << indent << "NonConnectivityOffsets: " << m_NonConnectivityOffsets << std::endl; - os << indent << "BlockRadius: " << static_cast::PrintType>(m_BlockRadius) - << std::endl; + os << indent << "BlockRadius: " << static_cast::PrintType>(m_BlockRadius) << std::endl; os << indent << "SelectFraction: " << m_SelectFraction << std::endl; itkPrintSelfBooleanMacro(ComputeStructureTensors); } @@ -196,7 +195,7 @@ MaskFeaturePointSelectionFilter::GenerateData() const double meanOfSquares = sumOfSquares.GetSum() / numPixelsInNeighborhood; const double variance = meanOfSquares - squaredMean; - using PairType = typename MultiMapType::value_type; + using PairType = MultiMapType::value_type; // we only insert blocks with variance > 0 if (itk::NumericTraits::IsPositive(variance)) diff --git a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx index cd63ad69b82..1992ff8fec1 100644 --- a/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkBilateralImageFilterTest.cxx @@ -37,8 +37,8 @@ itkBilateralImageFilterTest(int, char *[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, BilateralImageFilter, ImageToImageFilter); - double domainSigmaVal = 2.0; - typename FilterType::ArrayType domainSigma = FilterType::ArrayType::Filled(domainSigmaVal); + double domainSigmaVal = 2.0; + FilterType::ArrayType domainSigma = FilterType::ArrayType::Filled(domainSigmaVal); filter->SetDomainSigma(domainSigmaVal); ITK_TEST_SET_GET_VALUE(domainSigma, filter->GetDomainSigma()); @@ -61,8 +61,8 @@ itkBilateralImageFilterTest(int, char *[]) constexpr bool automaticKernelSize{ true }; ITK_TEST_SET_GET_BOOLEAN(filter, AutomaticKernelSize, automaticKernelSize); - constexpr typename FilterType::SizeType::SizeValueType radiusVal = 2; - constexpr typename FilterType::SizeType radius = FilterType::SizeType::Filled(radiusVal); + constexpr FilterType::SizeType::SizeValueType radiusVal = 2; + constexpr FilterType::SizeType radius = FilterType::SizeType::Filled(radiusVal); filter->SetRadius(radius); ITK_TEST_SET_GET_VALUE(radius, filter->GetRadius()); diff --git a/Modules/Filtering/ImageFeature/test/itkHessian3DToVesselnessMeasureImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkHessian3DToVesselnessMeasureImageFilterTest.cxx index 5112d8c6e37..ed87646c36f 100644 --- a/Modules/Filtering/ImageFeature/test/itkHessian3DToVesselnessMeasureImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkHessian3DToVesselnessMeasureImageFilterTest.cxx @@ -106,7 +106,7 @@ itkHessian3DToVesselnessMeasureImageFilterTest(int argc, char * argv[]) filterVesselness->SetInput(filterHessian->GetOutput()); // Select the value of Sigma - auto sigma = static_cast(std::stod(argv[1])); + auto sigma = static_cast(std::stod(argv[1])); filterHessian->SetSigma(sigma); auto alpha1 = std::stod(argv[2]); diff --git a/Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx index 5b5e819b84f..83f7028b1de 100644 --- a/Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx @@ -91,7 +91,7 @@ itkHessianRecursiveGaussianFilterTest(int argc, char * argv[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, HessianRecursiveGaussianImageFilter, ImageToImageFilter); - auto sigma = static_cast(std::stod(argv[1])); + auto sigma = static_cast(std::stod(argv[1])); filter->SetSigma(sigma); ITK_TEST_SET_GET_VALUE(sigma, filter->GetSigma()); diff --git a/Modules/Filtering/ImageFeature/test/itkMaskFeaturePointSelectionFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkMaskFeaturePointSelectionFilterTest.cxx index 6d81bdb4115..4b1169c587e 100644 --- a/Modules/Filtering/ImageFeature/test/itkMaskFeaturePointSelectionFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkMaskFeaturePointSelectionFilterTest.cxx @@ -78,7 +78,7 @@ itkMaskFeaturePointSelectionFilterTest(int argc, char * argv[]) filter->SetNonConnectivity(nonConnectivity); ITK_TEST_SET_GET_VALUE(nonConnectivity, filter->GetNonConnectivity()); - auto blockRadiusValue = static_cast(std::stod(argv[4])); + auto blockRadiusValue = static_cast(std::stod(argv[4])); auto blockRadius = FilterType::SizeType::Filled(blockRadiusValue); filter->SetBlockRadius(blockRadius); ITK_TEST_SET_GET_VALUE(blockRadius, filter->GetBlockRadius()); diff --git a/Modules/Filtering/ImageFeature/test/itkZeroCrossingBasedEdgeDetectionImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkZeroCrossingBasedEdgeDetectionImageFilterTest.cxx index 840345def2a..4fcb67fda10 100644 --- a/Modules/Filtering/ImageFeature/test/itkZeroCrossingBasedEdgeDetectionImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkZeroCrossingBasedEdgeDetectionImageFilterTest.cxx @@ -79,11 +79,11 @@ itkZeroCrossingBasedEdgeDetectionImageFilterTest(int argc, char * argv[]) filter->SetMaximumError(maximumError); ITK_TEST_SET_GET_VALUE(maximumError, filter->GetMaximumError()); - auto backgroundValue = static_cast(std::stod(argv[3])); + auto backgroundValue = static_cast(std::stod(argv[3])); filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); - auto foregroundValue = static_cast(std::stod(argv[4])); + auto foregroundValue = static_cast(std::stod(argv[4])); filter->SetForegroundValue(foregroundValue); ITK_TEST_SET_GET_VALUE(foregroundValue, filter->GetForegroundValue()); diff --git a/Modules/Filtering/ImageFeature/test/itkZeroCrossingImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkZeroCrossingImageFilterTest.cxx index ce45307ffa8..488d538b27f 100644 --- a/Modules/Filtering/ImageFeature/test/itkZeroCrossingImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkZeroCrossingImageFilterTest.cxx @@ -44,12 +44,12 @@ itkZeroCrossingImageFilterTest(int, char *[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, ZeroCrossingImageFilter, ImageToImageFilter); - constexpr typename FilterType::OutputImagePixelType foregroundValue = - itk::NumericTraits::OneValue(); + constexpr FilterType::OutputImagePixelType foregroundValue = + itk::NumericTraits::OneValue(); filter->SetForegroundValue(foregroundValue); ITK_TEST_SET_GET_VALUE(foregroundValue, filter->GetForegroundValue()); - constexpr typename FilterType::OutputImagePixelType backgroundValue{}; + constexpr FilterType::OutputImagePixelType backgroundValue{}; filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); diff --git a/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.hxx b/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.hxx index a43271e3f12..884c30a6f06 100644 --- a/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.hxx +++ b/Modules/Filtering/ImageFusion/include/itkLabelOverlayImageFilter.hxx @@ -100,7 +100,7 @@ LabelOverlayImageFilter::PrintSelf(std:: { Superclass::PrintSelf(os, indent); - os << indent << "Opacity: " << static_cast::PrintType>(m_Opacity) << std::endl + os << indent << "Opacity: " << static_cast::PrintType>(m_Opacity) << std::endl << indent << "BackgroundValue: " << static_cast::PrintType>(m_BackgroundValue) << std::endl; diff --git a/Modules/Filtering/ImageFusion/test/itkLabelToRGBImageFilterTest.cxx b/Modules/Filtering/ImageFusion/test/itkLabelToRGBImageFilterTest.cxx index cd5cea64ef1..fd93d349700 100644 --- a/Modules/Filtering/ImageFusion/test/itkLabelToRGBImageFilterTest.cxx +++ b/Modules/Filtering/ImageFusion/test/itkLabelToRGBImageFilterTest.cxx @@ -56,7 +56,7 @@ itkLabelToRGBImageFilterTest(int argc, char * argv[]) // Exercising Background Value methods - typename FilterType::LabelPixelType backgroundValue = 10; + FilterType::LabelPixelType backgroundValue = 10; filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); diff --git a/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.hxx b/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.hxx index 1aec542dc57..540f6ed1050 100644 --- a/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.hxx +++ b/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.hxx @@ -54,7 +54,7 @@ VectorGradientMagnitudeImageFilter::PrintS itkPrintSelfBooleanMacro(UseImageSpacing); os << indent << "UsePrincipleComponents: " << m_UsePrincipleComponents << std::endl; os << indent << "RequestedNumberOfThreads: " - << static_cast::PrintType>(m_RequestedNumberOfWorkUnits) << std::endl; + << static_cast::PrintType>(m_RequestedNumberOfWorkUnits) << std::endl; itkPrintSelfObjectMacro(RealValuedInputImage); } diff --git a/Modules/Filtering/ImageGradient/test/itkGradientMagnitudeRecursiveGaussianFilterTest.cxx b/Modules/Filtering/ImageGradient/test/itkGradientMagnitudeRecursiveGaussianFilterTest.cxx index 81f64f32232..9954dd47c72 100644 --- a/Modules/Filtering/ImageGradient/test/itkGradientMagnitudeRecursiveGaussianFilterTest.cxx +++ b/Modules/Filtering/ImageGradient/test/itkGradientMagnitudeRecursiveGaussianFilterTest.cxx @@ -109,7 +109,7 @@ itkGradientMagnitudeRecursiveGaussianFilterTest(int argc, char * argv[]) const itk::SimpleFilterWatcher watcher(filter); - auto sigma = static_cast(std::stod(argv[1])); + auto sigma = static_cast(std::stod(argv[1])); filter->SetSigma(sigma); ITK_TEST_SET_GET_VALUE(sigma, filter->GetSigma()); diff --git a/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest.cxx b/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest.cxx index b27ff887c44..a284ff96b93 100644 --- a/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest.cxx +++ b/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest.cxx @@ -105,7 +105,7 @@ itkGradientRecursiveGaussianFilterTest(int argc, char * argv[]) ITK_TEST_SET_GET_BOOLEAN(filter, UseImageDirection, useImageDirection); // Select the value of Sigma - constexpr typename myFilterType::ScalarRealType sigma = 2.5; + constexpr myFilterType::ScalarRealType sigma = 2.5; filter->SetSigma(sigma); ITK_TEST_SET_GET_VALUE(sigma, filter->GetSigma()); diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.h b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.h index df4a6f674b7..e3238325232 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.h @@ -252,11 +252,11 @@ class ITK_TEMPLATE_EXPORT BSplineControlPointImageFilter : public ImageToImageFi vnl_matrix m_RefinedLatticeCoefficients[ImageDimension]{}; - typename KernelType::Pointer m_Kernel[ImageDimension]{}; - typename KernelOrder0Type::Pointer m_KernelOrder0{}; - typename KernelOrder1Type::Pointer m_KernelOrder1{}; - typename KernelOrder2Type::Pointer m_KernelOrder2{}; - typename KernelOrder3Type::Pointer m_KernelOrder3{}; + KernelType::Pointer m_Kernel[ImageDimension]{}; + KernelOrder0Type::Pointer m_KernelOrder0{}; + KernelOrder1Type::Pointer m_KernelOrder1{}; + KernelOrder2Type::Pointer m_KernelOrder2{}; + KernelOrder3Type::Pointer m_KernelOrder3{}; RealType m_BSplineEpsilon{ static_cast(1e-3) }; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx index 2434c506f12..d44883b2b63 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx @@ -114,7 +114,7 @@ BSplineControlPointImageFilter::SetSplineOrder(ArrayT if (this->m_DoMultilevel) { - typename KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval(); + KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval(); vnl_matrix R; vnl_matrix S; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h index 3e24d6ca4c1..b240ad60f7b 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h @@ -302,11 +302,11 @@ class ITK_TEMPLATE_EXPORT BSplineControlPointImageFunction RealImagePointer m_NeighborhoodWeightImage{}; - typename KernelType::Pointer m_Kernel[ImageDimension]{}; - typename KernelOrder0Type::Pointer m_KernelOrder0{}; - typename KernelOrder1Type::Pointer m_KernelOrder1{}; - typename KernelOrder2Type::Pointer m_KernelOrder2{}; - typename KernelOrder3Type::Pointer m_KernelOrder3{}; + KernelType::Pointer m_Kernel[ImageDimension]{}; + KernelOrder0Type::Pointer m_KernelOrder0{}; + KernelOrder1Type::Pointer m_KernelOrder1{}; + KernelOrder2Type::Pointer m_KernelOrder2{}; + KernelOrder3Type::Pointer m_KernelOrder3{}; CoordinateType m_BSplineEpsilon{}; }; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.h b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.h index b7d20ecffbc..c6a61da36ea 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.h @@ -356,7 +356,7 @@ class ITK_TEMPLATE_EXPORT BSplineScatteredDataPointSetToImageFilter ArrayType m_SplineOrder{}; ArrayType m_NumberOfLevels{}; - typename WeightsContainerType::Pointer m_PointWeights{}; + WeightsContainerType::Pointer m_PointWeights{}; typename PointDataImageType::Pointer m_PhiLattice{}; typename PointDataImageType::Pointer m_PsiLattice{}; @@ -365,12 +365,12 @@ class ITK_TEMPLATE_EXPORT BSplineScatteredDataPointSetToImageFilter PointDataContainerPointer m_ResidualPointSetValues{}; - typename KernelType::Pointer m_Kernel[ImageDimension]{}; + KernelType::Pointer m_Kernel[ImageDimension]{}; - typename KernelOrder0Type::Pointer m_KernelOrder0{}; - typename KernelOrder1Type::Pointer m_KernelOrder1{}; - typename KernelOrder2Type::Pointer m_KernelOrder2{}; - typename KernelOrder3Type::Pointer m_KernelOrder3{}; + KernelOrder0Type::Pointer m_KernelOrder0{}; + KernelOrder1Type::Pointer m_KernelOrder1{}; + KernelOrder2Type::Pointer m_KernelOrder2{}; + KernelOrder3Type::Pointer m_KernelOrder3{}; std::vector m_OmegaLatticePerThread{}; std::vector m_DeltaLatticePerThread{}; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx index 5a5835a4dfd..79df89dce56 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx @@ -93,7 +93,7 @@ BSplineScatteredDataPointSetToImageFilter::SetSpli if (this->m_DoMultilevel) { - typename KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval(); + KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval(); vnl_matrix R; vnl_matrix S; diff --git a/Modules/Filtering/ImageGrid/test/itkPasteImageFilterGTest.cxx b/Modules/Filtering/ImageGrid/test/itkPasteImageFilterGTest.cxx index 0511281edfa..d335c09bb9c 100644 --- a/Modules/Filtering/ImageGrid/test/itkPasteImageFilterGTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkPasteImageFilterGTest.cxx @@ -161,7 +161,7 @@ TEST_F(PasteFixture, ConstantPaste) TEST_F(PasteFixture, ConstantPaste3_2) { using Utils = FixtureUtilities, itk::Image>; - using SkipType = typename Utils::FilterType::InputSkipAxesArrayType; + using SkipType = Utils::FilterType::InputSkipAxesArrayType; auto filter = Utils::FilterType::New(); @@ -297,7 +297,7 @@ TEST_F(PasteFixture, Paste3_2) { using Utils = FixtureUtilities, itk::Image>; - using SkipType = typename Utils::FilterType::InputSkipAxesArrayType; + using SkipType = Utils::FilterType::InputSkipAxesArrayType; constexpr int constantValue{ -53 }; auto filter = Utils::FilterType::New(); diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx index 5cad64f1a4a..8864f657cf3 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx @@ -153,13 +153,13 @@ itkResampleImageTest2(int argc, char * argv[]) else { // Set a fixed, isotropic output spacing - typename ImageType::SpacingType::ValueType outputSpacingValue = 1.5; + ImageType::SpacingType::ValueType outputSpacingValue = 1.5; if (argc > 7) { outputSpacingValue = std::stod(argv[8]); } - typename ImageType::SpacingType outputSpacing; + ImageType::SpacingType outputSpacing; for (unsigned int i = 0; i < VDimension; ++i) { outputSpacing[i] = outputSpacingValue; @@ -168,9 +168,9 @@ itkResampleImageTest2(int argc, char * argv[]) const typename ImageType::SizeType & inputSize = resample->GetInput()->GetLargestPossibleRegion().GetSize(); const typename ImageType::SpacingType & inputSpacing = resample->GetInput()->GetSpacing(); - typename ImageType::SizeType outputSize; + ImageType::SizeType outputSize; - using SizeValueType = typename ImageType::SizeType::SizeValueType; + using SizeValueType = ImageType::SizeType::SizeValueType; for (unsigned int i = 0; i < VDimension; ++i) { outputSize[i] = diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx index 82005b4ca3d..6ed129829c9 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx @@ -98,8 +98,7 @@ class ProjectTransform : public itk::Transform OutputPointType TransformPoint(const InputPointType & inputPoint) const override { - auto outputPoint = - itk::MakeFilled(std::numeric_limits::max()); + auto outputPoint = itk::MakeFilled(std::numeric_limits::max()); for (unsigned int d = 0; d < 2; ++d) { outputPoint[d] = inputPoint[d] * 0.5; diff --git a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx index 3905342b53b..acb0cddabea 100644 --- a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx @@ -200,18 +200,18 @@ itkWarpImageFilterTest(int, char *[]) warper->SetOutputOrigin(ptarray.GetDataPointer()); ITK_TEST_SET_GET_VALUE(ptarray, warper->GetOutputOrigin()); - typename WarperType::DirectionType outputDirection; + WarperType::DirectionType outputDirection; outputDirection.SetIdentity(); warper->SetOutputDirection(outputDirection); ITK_TEST_SET_GET_VALUE(outputDirection, warper->GetOutputDirection()); - constexpr typename WarperType::IndexType::value_type outputStartIndexVal = 0; - auto outputStartIndex = WarperType::IndexType::Filled(outputStartIndexVal); + constexpr WarperType::IndexType::value_type outputStartIndexVal = 0; + auto outputStartIndex = WarperType::IndexType::Filled(outputStartIndexVal); warper->SetOutputStartIndex(outputStartIndex); ITK_TEST_SET_GET_VALUE(outputStartIndex, warper->GetOutputStartIndex()); - constexpr typename WarperType::SizeType::value_type outputSizeVal = 0; - auto outputSize = WarperType::SizeType::Filled(outputSizeVal); + constexpr WarperType::SizeType::value_type outputSizeVal = 0; + auto outputSize = WarperType::SizeType::Filled(outputSizeVal); warper->SetOutputSize(outputSize); ITK_TEST_SET_GET_VALUE(outputSize, warper->GetOutputSize()); diff --git a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest2.cxx b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest2.cxx index 23cff006e46..1026b8b3726 100644 --- a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest2.cxx +++ b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest2.cxx @@ -69,7 +69,7 @@ MakeCheckerboard() } template -typename DisplacementFieldType::Pointer +DisplacementFieldType::Pointer MakeDisplacementField() { using IteratorType = itk::ImageRegionIterator; diff --git a/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx index 1a680d9ef2c..b56f0c34f12 100644 --- a/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx @@ -197,7 +197,7 @@ itkWarpVectorImageFilterTest(int, char *[]) warper->SetOutputOrigin(ptarray.GetDataPointer()); ITK_TEST_SET_GET_VALUE(ptarray, warper->GetOutputOrigin()); - typename WarperType::DirectionType outputDirection; + WarperType::DirectionType outputDirection; outputDirection.SetIdentity(); warper->SetOutputDirection(outputDirection); ITK_TEST_SET_GET_VALUE(outputDirection, warper->GetOutputDirection()); diff --git a/Modules/Filtering/ImageIntensity/test/itkWeightedAddImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkWeightedAddImageFilterTest.cxx index 1a577a61bf5..4e48f220c54 100644 --- a/Modules/Filtering/ImageIntensity/test/itkWeightedAddImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkWeightedAddImageFilterTest.cxx @@ -114,7 +114,7 @@ itkWeightedAddImageFilterTest(int argc, char * argv[]) filter->SetInput1(inputImageA); filter->SetInput2(inputImageB); - auto alpha = static_cast(std::stod(argv[1])); + auto alpha = static_cast(std::stod(argv[1])); filter->SetAlpha(alpha); ITK_TEST_SET_GET_VALUE(alpha, filter->GetAlpha()); diff --git a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h index 9a0b2e2d331..180bbc4b936 100644 --- a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h +++ b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h @@ -126,7 +126,7 @@ class ScanlineFilterCommon using LineEncodingConstIterator = typename LineEncodingType::const_iterator; using OffsetVectorType = std::vector; - using OffsetVectorConstIterator = typename OffsetVectorType::const_iterator; + using OffsetVectorConstIterator = OffsetVectorType::const_iterator; using LineMapType = std::vector; diff --git a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx index 7f0dfb86a97..19d909337f1 100644 --- a/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx +++ b/Modules/Filtering/ImageNoise/include/itkAdditiveGaussianNoiseImageFilter.hxx @@ -87,8 +87,8 @@ AdditiveGaussianNoiseImageFilter::PrintSelf(std::ostr { Superclass::PrintSelf(os, indent); - os << indent << "Mean: " << static_cast::PrintType>(m_Mean) << std::endl; - os << indent << "StandardDeviation: " << static_cast::PrintType>(m_StandardDeviation) + os << indent << "Mean: " << static_cast::PrintType>(m_Mean) << std::endl; + os << indent << "StandardDeviation: " << static_cast::PrintType>(m_StandardDeviation) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageNoise/include/itkNoiseBaseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkNoiseBaseImageFilter.hxx index 08834e1db64..a42eac8e41c 100644 --- a/Modules/Filtering/ImageNoise/include/itkNoiseBaseImageFilter.hxx +++ b/Modules/Filtering/ImageNoise/include/itkNoiseBaseImageFilter.hxx @@ -70,7 +70,7 @@ NoiseBaseImageFilter::PrintSelf(std::ostream & os, In { Superclass::PrintSelf(os, indent); - os << indent << "Seed: " << static_cast::PrintType>(m_Seed) << std::endl; + os << indent << "Seed: " << static_cast::PrintType>(m_Seed) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx index 10fed16e959..eafc00deb43 100644 --- a/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx +++ b/Modules/Filtering/ImageNoise/include/itkSaltAndPepperNoiseImageFilter.hxx @@ -102,7 +102,7 @@ SaltAndPepperNoiseImageFilter::PrintSelf(std::ostream { Superclass::PrintSelf(os, indent); - os << indent << "Probability: " << static_cast::PrintType>(m_Probability) << std::endl; + os << indent << "Probability: " << static_cast::PrintType>(m_Probability) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx index 6e089e09796..e825cd39271 100644 --- a/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx +++ b/Modules/Filtering/ImageNoise/include/itkShotNoiseImageFilter.hxx @@ -113,7 +113,7 @@ ShotNoiseImageFilter::PrintSelf(std::ostream & os, In { Superclass::PrintSelf(os, indent); - os << indent << "Scale: " << static_cast::PrintType>(m_Scale) << std::endl; + os << indent << "Scale: " << static_cast::PrintType>(m_Scale) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx index 5c35c6eb9b8..7c3975bad45 100644 --- a/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx +++ b/Modules/Filtering/ImageNoise/include/itkSpeckleNoiseImageFilter.hxx @@ -122,7 +122,7 @@ SpeckleNoiseImageFilter::PrintSelf(std::ostream & os, { Superclass::PrintSelf(os, indent); - os << indent << "StandardDeviation: " << static_cast::PrintType>(m_StandardDeviation) + os << indent << "StandardDeviation: " << static_cast::PrintType>(m_StandardDeviation) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageSources/include/itkGridImageSource.h b/Modules/Filtering/ImageSources/include/itkGridImageSource.h index 327b477e6c8..63562febcaa 100644 --- a/Modules/Filtering/ImageSources/include/itkGridImageSource.h +++ b/Modules/Filtering/ImageSources/include/itkGridImageSource.h @@ -139,9 +139,9 @@ class ITK_TEMPLATE_EXPORT GridImageSource : public GenerateImageSource>; + using MapType = std::unordered_map>; MapType m_Map; diff --git a/Modules/Filtering/ImageStatistics/include/itkAdaptiveHistogramEqualizationImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkAdaptiveHistogramEqualizationImageFilter.h index 5e06ce59a11..fa3fadcd36f 100644 --- a/Modules/Filtering/ImageStatistics/include/itkAdaptiveHistogramEqualizationImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkAdaptiveHistogramEqualizationImageFilter.h @@ -72,7 +72,7 @@ class ITK_TEMPLATE_EXPORT AdaptiveHistogramEqualizationImageFilter TImageType, TImageType, TKernel, - typename Function::AdaptiveEqualizationHistogram> + Function::AdaptiveEqualizationHistogram> { public: @@ -86,7 +86,7 @@ class ITK_TEMPLATE_EXPORT AdaptiveHistogramEqualizationImageFilter TImageType, TImageType, TKernel, - typename Function::AdaptiveEqualizationHistogram>; + Function::AdaptiveEqualizationHistogram>; using Pointer = SmartPointer; using ConstPointer = SmartPointer; diff --git a/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx b/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx index 34d9b9047b8..cec32df429d 100644 --- a/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx +++ b/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx @@ -149,8 +149,7 @@ ImagePCADecompositionCalculator::PrintSelf(std::ostrea os << indent << "BasisMatrix: " << m_BasisMatrix << std::endl; itkPrintSelfBooleanMacro(BasisMatrixCalculated); - os << indent << "NumPixels: " << static_cast::PrintType>(m_NumPixels) - << std::endl; + os << indent << "NumPixels: " << static_cast::PrintType>(m_NumPixels) << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h index 0f01f586596..46fb92c4f52 100644 --- a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h @@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsImageFilter : public ImageSink::RealType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Type of DataObjects used for scalar outputs */ using RealObjectType = SimpleDataObjectDecorator; @@ -218,8 +218,7 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsImageFilter : public ImageSink::PrintType>(labelStatistics.m_Count) - << std::endl; + os << "Count: " << static_cast::PrintType>(labelStatistics.m_Count) << std::endl; os << "Minimum: " << static_cast::PrintType>(labelStatistics.m_Minimum) << std::endl; os << "Maximum: " << static_cast::PrintType>(labelStatistics.m_Maximum) diff --git a/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h index c1e5fc54549..aca59bbda44 100644 --- a/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkMinimumMaximumImageFilter.h @@ -68,7 +68,7 @@ class ITK_TEMPLATE_EXPORT MinimumMaximumImageFilter : public ImageSink using RealType = typename NumericTraits::RealType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Type of DataObjects used for scalar outputs */ using RealObjectType = SimpleDataObjectDecorator; diff --git a/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.hxx b/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.hxx index d48b35fb693..6be13e48c7d 100644 --- a/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.hxx +++ b/Modules/Filtering/ImageStatistics/include/itkStatisticsImageFilter.hxx @@ -139,8 +139,7 @@ StatisticsImageFilter::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); - os << indent << "Count: " << static_cast::PrintType>(this->m_Count) - << std::endl; + os << indent << "Count: " << static_cast::PrintType>(this->m_Count) << std::endl; os << indent << "Minimum: " << static_cast::PrintType>(this->GetMinimum()) << std::endl; os << indent << "Maximum: " << static_cast::PrintType>(this->GetMaximum()) diff --git a/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx b/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx index 38dd68c4c6e..7d4229e35a2 100644 --- a/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx @@ -124,7 +124,7 @@ itkImageMomentsTest(int argc, char * argv[]) maskimg->FillBuffer(itk::NumericTraits::OneValue()); // convert mask image to mask - using LFFImageMaskSpatialObjectType = typename itk::ImageMaskSpatialObject; + using LFFImageMaskSpatialObjectType = itk::ImageMaskSpatialObject; auto mask = LFFImageMaskSpatialObjectType::New(); mask->SetImage(maskimg.GetPointer()); mask->Update(); diff --git a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h index 6c888d16597..fac6f4eea04 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.h @@ -40,8 +40,7 @@ namespace itk * \ingroup ITKLabelMap */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT AttributeKeepNObjectsLabelMapFilter : public InPlaceLabelMapFilter { public: diff --git a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.hxx index 8b6e7c84646..5e36c7f5826 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkAttributeKeepNObjectsLabelMapFilter.hxx @@ -50,7 +50,7 @@ AttributeKeepNObjectsLabelMapFilter::GenerateData() ProgressReporter progress(this, 0, 2 * output->GetNumberOfLabelObjects()); // get the label objects in a vector, so they can be sorted - using VectorType = typename std::vector; + using VectorType = std::vector; VectorType labelObjects; labelObjects.reserve(output->GetNumberOfLabelObjects()); for (typename ImageType::Iterator it(output); !it.IsAtEnd(); ++it) diff --git a/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h index 83440f21b39..4b8b4048126 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeOpeningLabelMapFilter.h @@ -41,8 +41,7 @@ namespace itk * \ingroup ITKLabelMap */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT AttributeOpeningLabelMapFilter : public InPlaceLabelMapFilter { public: diff --git a/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h index c8304c5ab81..f4e72a30f2f 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributePositionLabelMapFilter.h @@ -41,8 +41,7 @@ namespace itk * \ingroup ITKLabelMap */ template , + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor, bool VPhysicalPosition = true> class ITK_TEMPLATE_EXPORT AttributePositionLabelMapFilter : public InPlaceLabelMapFilter { diff --git a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h index af75047e7c1..d23d080a628 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.h @@ -41,8 +41,7 @@ namespace itk * \ingroup ITKLabelMap */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT AttributeRelabelLabelMapFilter : public InPlaceLabelMapFilter { public: diff --git a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.hxx index e9fdbcb2c97..7af1f12f4e9 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkAttributeRelabelLabelMapFilter.hxx @@ -34,7 +34,7 @@ AttributeRelabelLabelMapFilter::GenerateData() ImageType * output = this->GetOutput(); - using VectorType = typename std::vector; + using VectorType = std::vector; ProgressReporter progress(this, 0, 2 * output->GetNumberOfLabelObjects()); diff --git a/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h index e2a42fc6326..999b458c8aa 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeSelectionLabelMapFilter.h @@ -48,8 +48,7 @@ namespace itk * \ingroup ITKLabelMap */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT AttributeSelectionLabelMapFilter : public InPlaceLabelMapFilter { public: @@ -72,7 +71,7 @@ class ITK_TEMPLATE_EXPORT AttributeSelectionLabelMapFilter : public InPlaceLabel using AttributeAccessorType = TAttributeAccessor; using AttributeValueType = typename AttributeAccessorType::AttributeValueType; - using AttributeSetType = typename std::set; + using AttributeSetType = std::set; /** ImageDimension constants */ static constexpr unsigned int ImageDimension = TImage::ImageDimension; diff --git a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h index c2d7b4716d7..e09f382a3df 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.h @@ -44,8 +44,7 @@ namespace itk * \ingroup ITKLabelMap */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT AttributeUniqueLabelMapFilter : public InPlaceLabelMapFilter { public: diff --git a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.hxx index 1742db10f38..23403e62db7 100644 --- a/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkAttributeUniqueLabelMapFilter.hxx @@ -34,7 +34,7 @@ AttributeUniqueLabelMapFilter::GenerateData() // the priority queue to store all the lines of all the objects sorted using PriorityQueueType = - typename std::priority_queue, LineOfLabelObjectComparator>; + std::priority_queue, LineOfLabelObjectComparator>; PriorityQueueType pq; auto labelMap = this->GetLabelMap(); @@ -72,7 +72,7 @@ AttributeUniqueLabelMapFilter::GenerateData() ProgressReporter progress2(this, 0, numberOfLines, 100, 0.3f, 0.60f); - using LinesType = typename std::deque; + using LinesType = std::deque; LinesType lines; lines.push_back(pq.top()); diff --git a/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.hxx b/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.hxx index 101378ccc1c..25a0d26c47c 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkBinaryFillholeImageFilter.hxx @@ -88,7 +88,7 @@ BinaryFillholeImageFilter::GenerateData() notInput->SetReleaseDataFlag(true); progress->RegisterInternalFilter(notInput, .2f); - using LabelizerType = typename itk::BinaryImageToShapeLabelMapFilter; + using LabelizerType = itk::BinaryImageToShapeLabelMapFilter; auto labelizer = LabelizerType::New(); labelizer->SetInput(notInput->GetOutput()); labelizer->SetInputForegroundValue(m_ForegroundValue); @@ -98,7 +98,7 @@ BinaryFillholeImageFilter::GenerateData() progress->RegisterInternalFilter(labelizer, .5f); using LabelMapType = typename LabelizerType::OutputImageType; - using OpeningType = typename itk::ShapeOpeningLabelMapFilter; + using OpeningType = itk::ShapeOpeningLabelMapFilter; auto opening = OpeningType::New(); opening->SetInput(labelizer->GetOutput()); opening->SetAttribute(LabelMapType::LabelObjectType::NUMBER_OF_PIXELS_ON_BORDER); @@ -107,7 +107,7 @@ BinaryFillholeImageFilter::GenerateData() progress->RegisterInternalFilter(opening, .1f); // invert the image during the binarization - using BinarizerType = typename itk::LabelMapMaskImageFilter; + using BinarizerType = itk::LabelMapMaskImageFilter; auto binarizer = BinarizerType::New(); binarizer->SetInput(opening->GetOutput()); binarizer->SetLabel(backgroundValue); diff --git a/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.hxx b/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.hxx index 0f575caf1f6..375c0a764fc 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkBinaryGrindPeakImageFilter.hxx @@ -65,7 +65,7 @@ BinaryGrindPeakImageFilter::GenerateData() // Allocate the output this->AllocateOutputs(); - using LabelizerType = typename itk::BinaryImageToShapeLabelMapFilter; + using LabelizerType = itk::BinaryImageToShapeLabelMapFilter; auto labelizer = LabelizerType::New(); labelizer->SetInput(this->GetInput()); labelizer->SetInputForegroundValue(m_ForegroundValue); @@ -75,7 +75,7 @@ BinaryGrindPeakImageFilter::GenerateData() progress->RegisterInternalFilter(labelizer, .65f); using LabelMapType = typename LabelizerType::OutputImageType; - using OpeningType = typename itk::ShapeOpeningLabelMapFilter; + using OpeningType = itk::ShapeOpeningLabelMapFilter; auto opening = OpeningType::New(); opening->SetInput(labelizer->GetOutput()); opening->SetAttribute(LabelMapType::LabelObjectType::NUMBER_OF_PIXELS_ON_BORDER); @@ -83,7 +83,7 @@ BinaryGrindPeakImageFilter::GenerateData() opening->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits()); progress->RegisterInternalFilter(opening, .1f); - using BinarizerType = typename itk::LabelMapToBinaryImageFilter; + using BinarizerType = itk::LabelMapToBinaryImageFilter; auto binarizer = BinarizerType::New(); binarizer->SetInput(opening->GetOutput()); binarizer->SetForegroundValue(m_ForegroundValue); diff --git a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h index 1ea37b5e30a..738aaeda3ca 100644 --- a/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkBinaryReconstructionLabelMapFilter.h @@ -43,8 +43,7 @@ namespace itk */ template > + typename TAttributeAccessor = Functor::AttributeLabelObjectAccessor> class ITK_TEMPLATE_EXPORT BinaryReconstructionLabelMapFilter : public InPlaceLabelMapFilter { public: diff --git a/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h b/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h index 0b3ddd1a2c5..603a4af4b06 100644 --- a/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h +++ b/Modules/Filtering/LabelMap/include/itkChangeLabelLabelMapFilter.h @@ -74,7 +74,7 @@ class ITK_TEMPLATE_EXPORT ChangeLabelLabelMapFilter : public InPlaceLabelMapFilt /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ChangeLabelLabelMapFilter); - using ChangeMapType = typename std::map; + using ChangeMapType = std::map; using ChangeMapIterator = typename ChangeMapType::const_iterator; /*itkConceptMacro(InputEqualityComparableCheck, diff --git a/Modules/Filtering/LabelMap/include/itkLabelMapMaskImageFilter.hxx b/Modules/Filtering/LabelMap/include/itkLabelMapMaskImageFilter.hxx index 51a63b12a0d..e9faaafc3e8 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelMapMaskImageFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkLabelMapMaskImageFilter.hxx @@ -387,8 +387,7 @@ LabelMapMaskImageFilter::PrintSelf(std::ostream & os, os << indent << "Negated: " << m_Negated << std::endl; os << indent << "Crop: " << m_Crop << std::endl; os << indent << "CropBorder: " << m_CropBorder << std::endl; - os << indent << "CropTimeStamp: " << static_cast::PrintType>(m_CropTimeStamp) - << std::endl; + os << indent << "CropTimeStamp: " << static_cast::PrintType>(m_CropTimeStamp) << std::endl; } diff --git a/Modules/Filtering/LabelMap/include/itkLabelObject.hxx b/Modules/Filtering/LabelMap/include/itkLabelObject.hxx index 9a2fc9caa48..759bcf74fa2 100644 --- a/Modules/Filtering/LabelMap/include/itkLabelObject.hxx +++ b/Modules/Filtering/LabelMap/include/itkLabelObject.hxx @@ -192,7 +192,7 @@ template auto LabelObject::GetNumberOfLines() const -> SizeValueType { - return static_cast::SizeValueType>(m_LineContainer.size()); + return static_cast::SizeValueType>(m_LineContainer.size()); } template diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx index 80c488cfb80..803b3f2abf3 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx @@ -71,7 +71,7 @@ ShapeLabelMapFilter::ThreadedProcessLabelObject(LabelObject sizePerPixel *= output->GetSpacing()[i]; } - typename std::vector sizePerPixelPerDimension; + std::vector sizePerPixelPerDimension; for (unsigned int i = 0; i < ImageDimension; ++i) { sizePerPixelPerDimension.push_back(sizePerPixel / output->GetSpacing()[i]); diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelObject.h b/Modules/Filtering/LabelMap/include/itkShapeLabelObject.h index 9056da2f9f7..7b0c5716ba7 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeLabelObject.h +++ b/Modules/Filtering/LabelMap/include/itkShapeLabelObject.h @@ -733,14 +733,14 @@ class ITK_TEMPLATE_EXPORT ShapeLabelObject : public LabelObject::PrintType>(m_NumberOfPixels) + os << indent << "NumberOfPixels: " << static_cast::PrintType>(m_NumberOfPixels) << std::endl; os << indent << "PhysicalSize: " << m_PhysicalSize << std::endl; os << indent << "Centroid: " << static_cast::PrintType>(m_Centroid) << std::endl; - os << indent << "NumberOfPixelsOnBorder: " - << static_cast::PrintType>(m_NumberOfPixelsOnBorder) << std::endl; + os << indent + << "NumberOfPixelsOnBorder: " << static_cast::PrintType>(m_NumberOfPixelsOnBorder) + << std::endl; os << indent << "PerimeterOnBorder: " << m_PerimeterOnBorder << std::endl; os << indent << "FeretDiameter: " << m_FeretDiameter << std::endl; os << indent << "PrincipalMoments: " << m_PrincipalMoments << std::endl; diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsLabelObject.h b/Modules/Filtering/LabelMap/include/itkStatisticsLabelObject.h index fe9f22ea3bd..db80e9d01c8 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsLabelObject.h +++ b/Modules/Filtering/LabelMap/include/itkStatisticsLabelObject.h @@ -592,7 +592,7 @@ class ITK_TEMPLATE_EXPORT StatisticsLabelObject : public ShapeLabelObject(std::stoi(argv[3])); ITK_TEST_SET_GET_BOOLEAN(imageToLabel, FullyConnected, fullyConnected); - const typename ImageToLabelType::InputPixelType inputForegroundValue = std::stoi(argv[4]); + const ImageToLabelType::InputPixelType inputForegroundValue = std::stoi(argv[4]); imageToLabel->SetInputForegroundValue(inputForegroundValue); ITK_TEST_SET_GET_VALUE(inputForegroundValue, imageToLabel->GetInputForegroundValue()); - const typename ImageToLabelType::OutputPixelType outputBackgroundValue = std::stoi(argv[5]); + const ImageToLabelType::OutputPixelType outputBackgroundValue = std::stoi(argv[5]); imageToLabel->SetOutputBackgroundValue(outputBackgroundValue); ITK_TEST_SET_GET_VALUE(outputBackgroundValue, imageToLabel->GetOutputBackgroundValue()); diff --git a/Modules/Filtering/LabelMap/test/itkLabelMapToAttributeImageFilterTest1.cxx b/Modules/Filtering/LabelMap/test/itkLabelMapToAttributeImageFilterTest1.cxx index 6bfabcd0e06..5405661af1d 100644 --- a/Modules/Filtering/LabelMap/test/itkLabelMapToAttributeImageFilterTest1.cxx +++ b/Modules/Filtering/LabelMap/test/itkLabelMapToAttributeImageFilterTest1.cxx @@ -66,7 +66,7 @@ itkLabelMapToAttributeImageFilterTest1(int argc, char * argv[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(l2i, LabelMapToAttributeImageFilter, ImageToImageFilter); - auto backgroundValue = itk::NumericTraits::NonpositiveMin(); + auto backgroundValue = itk::NumericTraits::NonpositiveMin(); l2i->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, l2i->GetBackgroundValue()); diff --git a/Modules/Filtering/LabelMap/test/itkUniqueLabelMapFiltersGTest.cxx b/Modules/Filtering/LabelMap/test/itkUniqueLabelMapFiltersGTest.cxx index d0b486f0b75..9b023a2d9bd 100644 --- a/Modules/Filtering/LabelMap/test/itkUniqueLabelMapFiltersGTest.cxx +++ b/Modules/Filtering/LabelMap/test/itkUniqueLabelMapFiltersGTest.cxx @@ -203,11 +203,11 @@ TEST_F(UniqueLabelMapFixture, EmptyImage) TEST_F(UniqueLabelMapFixture, OneLabel) { - const std::vector::IndexType> indices = { { 10, 10 } }; - auto image = FixtureUtilities<2>::CreateLabelImage(indices); + const std::vector::IndexType> indices = { { 10, 10 } }; + auto image = FixtureUtilities<2>::CreateLabelImage(indices); auto labelMap = FixtureUtilities<2>::LabelMapFromLabelImage(image.GetPointer(), 0); - auto filter = itk::LabelUniqueLabelMapFilter::New(); + auto filter = itk::LabelUniqueLabelMapFilter::New(); filter->SetInput(labelMap); filter->Update(); @@ -222,12 +222,12 @@ TEST_F(UniqueLabelMapFixture, OneLabel) TEST_F(UniqueLabelMapFixture, OnesLabel) { - const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, - { 0, 4 }, { 2, 4 }, { 0, 5 } }; - auto image = FixtureUtilities<2>::CreateLabelImage(indices); + const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, + { 0, 4 }, { 2, 4 }, { 0, 5 } }; + auto image = FixtureUtilities<2>::CreateLabelImage(indices); auto labelMap = FixtureUtilities<2>::LabelMapFromLabelImage(image.GetPointer(), 0); - auto filter = itk::LabelUniqueLabelMapFilter::New(); + auto filter = itk::LabelUniqueLabelMapFilter::New(); filter->SetInput(labelMap); filter->Update(); @@ -242,12 +242,12 @@ TEST_F(UniqueLabelMapFixture, OnesLabel) TEST_F(UniqueLabelMapFixture, Dilate1) { - const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, - { 0, 4 }, { 2, 4 }, { 0, 10 } }; - auto image = FixtureUtilities<2>::CreateLabelImage(indices); + const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, + { 0, 4 }, { 2, 4 }, { 0, 10 } }; + auto image = FixtureUtilities<2>::CreateLabelImage(indices); auto labelMap = FixtureUtilities<2>::LabelMapFromLabelImage(image.GetPointer(), 1); - auto filter = itk::LabelUniqueLabelMapFilter::New(); + auto filter = itk::LabelUniqueLabelMapFilter::New(); filter->SetInput(labelMap); filter->InPlaceOff(); filter->ReverseOrderingOff(); @@ -274,12 +274,12 @@ TEST_F(UniqueLabelMapFixture, Dilate1) TEST_F(UniqueLabelMapFixture, Dilate2) { - const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, - { 0, 4 }, { 2, 4 }, { 0, 5 } }; - auto image = FixtureUtilities<2>::CreateLabelImage(indices); + const std::vector::IndexType> indices = { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 3, 0 }, + { 0, 4 }, { 2, 4 }, { 0, 5 } }; + auto image = FixtureUtilities<2>::CreateLabelImage(indices); auto labelMap = FixtureUtilities<2>::LabelMapFromLabelImage(image.GetPointer(), 2); - auto filter = itk::LabelUniqueLabelMapFilter::New(); + auto filter = itk::LabelUniqueLabelMapFilter::New(); filter->SetInput(labelMap); filter->InPlaceOff(); filter->ReverseOrderingOff(); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.h b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.h index 31af92812c6..dc1948d027e 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.h +++ b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.h @@ -118,7 +118,7 @@ class ITK_TEMPLATE_EXPORT FlatStructuringElement : public Neighborhood; /** ImageType used in constructors */ - using ImageType = typename itk::Image; + using ImageType = itk::Image; /** Default destructor. */ ~FlatStructuringElement() override = default; diff --git a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx index 14b5c13052a..71f1eb00547 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx +++ b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx @@ -1262,8 +1262,7 @@ FlatStructuringElement::ComputeBufferFromLines() /** Check if size of input Image is odd in all dimensions, throwing exception if even */ template auto -FlatStructuringElement::CheckImageSize(const typename FlatStructuringElement::ImageType * image) - -> RadiusType +FlatStructuringElement::CheckImageSize(const ImageType * image) -> RadiusType { const RadiusType & size = image->GetLargestPossibleRegion().GetSize(); @@ -1280,7 +1279,7 @@ FlatStructuringElement::CheckImageSize(const typename FlatStructurin template FlatStructuringElement -FlatStructuringElement::FromImage(const typename FlatStructuringElement::ImageType * image) +FlatStructuringElement::FromImage(const ImageType * image) { Self res{}; RadiusType size = res.CheckImageSize(image); diff --git a/Modules/Filtering/MathematicalMorphology/include/itkMaskedRankImageFilter.hxx b/Modules/Filtering/MathematicalMorphology/include/itkMaskedRankImageFilter.hxx index 8ad3d8098aa..9c0fdaf5a5f 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkMaskedRankImageFilter.hxx +++ b/Modules/Filtering/MathematicalMorphology/include/itkMaskedRankImageFilter.hxx @@ -59,7 +59,7 @@ MaskedRankImageFilter::PrintSelf { Superclass::PrintSelf(os, indent); - os << indent << "Rank: " << static_cast::PrintType>(m_Rank) << std::endl; + os << indent << "Rank: " << static_cast::PrintType>(m_Rank) << std::endl; } } // end namespace itk #endif diff --git a/Modules/Filtering/MathematicalMorphology/include/itkRankImageFilter.hxx b/Modules/Filtering/MathematicalMorphology/include/itkRankImageFilter.hxx index 76d2d10fd95..65540f6eebe 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkRankImageFilter.hxx +++ b/Modules/Filtering/MathematicalMorphology/include/itkRankImageFilter.hxx @@ -58,7 +58,7 @@ RankImageFilter::PrintSelf(std::ostream & os { Superclass::PrintSelf(os, indent); - os << indent << "Rank: " << static_cast::PrintType>(m_Rank) << std::endl; + os << indent << "Rank: " << static_cast::PrintType>(m_Rank) << std::endl; } } // end namespace itk #endif diff --git a/Modules/Filtering/MathematicalMorphology/test/itkAnchorErodeDilateImageFilterTest.cxx b/Modules/Filtering/MathematicalMorphology/test/itkAnchorErodeDilateImageFilterTest.cxx index 067f74b9893..e50bd272b74 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkAnchorErodeDilateImageFilterTest.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkAnchorErodeDilateImageFilterTest.cxx @@ -30,7 +30,7 @@ itkAnchorErodeDilateImageFilterTest(int, char ** const) using ImageType = itk::Image; using KernelType = itk::FlatStructuringElement; - using FunctionType = std::less; + using FunctionType = std::less; using FilterType = itk::AnchorErodeDilateImageFilter; auto filter = FilterType::New(); @@ -38,7 +38,7 @@ itkAnchorErodeDilateImageFilterTest(int, char ** const) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, AnchorErodeDilateImageFilter, KernelImageFilter); - constexpr typename FilterType::InputImagePixelType boundary = 255; + constexpr FilterType::InputImagePixelType boundary = 255; filter->SetBoundary(boundary); ITK_TEST_SET_GET_VALUE(boundary, filter->GetBoundary()); diff --git a/Modules/Filtering/MathematicalMorphology/test/itkAnchorOpenCloseImageFilterTest.cxx b/Modules/Filtering/MathematicalMorphology/test/itkAnchorOpenCloseImageFilterTest.cxx index d3a0f25bde0..d601b503da9 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkAnchorOpenCloseImageFilterTest.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkAnchorOpenCloseImageFilterTest.cxx @@ -30,8 +30,8 @@ itkAnchorOpenCloseImageFilterTest(int, char ** const) using ImageType = itk::Image; using KernelType = itk::FlatStructuringElement; - using CompateType1 = std::less; - using CompateType2 = std::greater; + using CompateType1 = std::less; + using CompateType2 = std::greater; using FilterType = itk::AnchorOpenCloseImageFilter; auto filter = FilterType::New(); diff --git a/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx index 8b820e642a2..4d236c13b0c 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx @@ -33,9 +33,9 @@ template typename itk::Image::Pointer GetImage(const itk::FlatStructuringElement & flatElement) { - using ImageType = typename itk::Image; - using RadiusType = typename FlatStructuringElement<2U>::RadiusType; - using ConstIterator = typename FlatStructuringElement<2U>::ConstIterator; + using ImageType = itk::Image; + using RadiusType = FlatStructuringElement<2U>::RadiusType; + using ConstIterator = FlatStructuringElement<2U>::ConstIterator; using PixelType = unsigned char; auto image = ImageType::New(); diff --git a/Modules/Filtering/MathematicalMorphology/test/itkVanHerkGilWermanErodeDilateImageFilterTest.cxx b/Modules/Filtering/MathematicalMorphology/test/itkVanHerkGilWermanErodeDilateImageFilterTest.cxx index dea3067fa6d..2eec0b83cb4 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkVanHerkGilWermanErodeDilateImageFilterTest.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkVanHerkGilWermanErodeDilateImageFilterTest.cxx @@ -29,7 +29,7 @@ itkVanHerkGilWermanErodeDilateImageFilterTest(int, char ** const) using PixelType = float; using ImageType = itk::Image; using KernelType = itk::FlatStructuringElement; - using FunctionType = std::less; + using FunctionType = std::less; using FilterType = itk::VanHerkGilWermanErodeDilateImageFilter; auto filter = FilterType::New(); diff --git a/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h b/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h index 501508a8f11..b656172a709 100644 --- a/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h +++ b/Modules/Filtering/Path/include/itkContourExtractor2DImageFilter.h @@ -135,11 +135,11 @@ class ITK_TEMPLATE_EXPORT ContourExtractor2DImageFilter using InputOffsetType = typename InputImageType::OffsetType; using InputPixelType = typename InputImageType::PixelType; using InputRegionType = typename InputImageType::RegionType; - using OutputPathPointer = typename OutputPathType::Pointer; - using VertexListType = typename OutputPathType::VertexListType; - using VertexListConstPointer = typename VertexListType::ConstPointer; - using VertexType = typename OutputPathType::VertexType; - using VertexValueType = typename VertexType::ValueType; + using OutputPathPointer = OutputPathType::Pointer; + using VertexListType = OutputPathType::VertexListType; + using VertexListConstPointer = VertexListType::ConstPointer; + using VertexType = OutputPathType::VertexType; + using VertexValueType = VertexType::ValueType; /** Real type associated to the input pixel type. */ using InputRealType = typename NumericTraits::RealType; @@ -262,7 +262,7 @@ class ITK_TEMPLATE_EXPORT ContourExtractor2DImageFilter struct VertexHash { - using CoordinateType = typename VertexType::CoordinateType; + using CoordinateType = VertexType::CoordinateType; inline size_t operator()(const VertexType & v) const noexcept { diff --git a/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.h b/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.h index e611bd87992..39832e3a385 100644 --- a/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.h +++ b/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.h @@ -66,13 +66,13 @@ class ITK_TEMPLATE_EXPORT ExtractOrthogonalSwath2DImageFilter using ImageIndexType = typename ImageType::IndexType; using ImagePixelType = typename ImageType::PixelType; using PathType = ParametricPath<2>; - using PathConstPointer = typename PathType::ConstPointer; - using PathInputType = typename PathType::InputType; - using PathOutputType = typename PathType::OutputType; - using PathIndexType = typename PathType::IndexType; - using PathContinuousIndexType = typename PathType::ContinuousIndexType; - using PathOffsetType = typename PathType::OffsetType; - using PathVectorType = typename PathType::VectorType; + using PathConstPointer = PathType::ConstPointer; + using PathInputType = PathType::InputType; + using PathOutputType = PathType::OutputType; + using PathIndexType = PathType::IndexType; + using PathContinuousIndexType = PathType::ContinuousIndexType; + using PathOffsetType = PathType::OffsetType; + using PathVectorType = PathType::VectorType; using SizeType = typename ImageType::SizeType; /** ImageDimension constants */ diff --git a/Modules/Filtering/Path/include/itkHilbertPath.hxx b/Modules/Filtering/Path/include/itkHilbertPath.hxx index 612cf389d47..9014b423c3a 100644 --- a/Modules/Filtering/Path/include/itkHilbertPath.hxx +++ b/Modules/Filtering/Path/include/itkHilbertPath.hxx @@ -238,8 +238,7 @@ HilbertPath::PrintSelf(std::ostream & os, Indent indent Superclass::PrintSelf(os, indent); - os << "HilbertOrder: " << static_cast::PrintType>(m_HilbertOrder) - << std::endl; + os << "HilbertOrder: " << static_cast::PrintType>(m_HilbertOrder) << std::endl; os << "HilbertPath: " << m_HilbertPath << std::endl; } } // end namespace itk diff --git a/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.h b/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.h index ef1818b10d2..91edf0b2c0a 100644 --- a/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.h +++ b/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.h @@ -79,10 +79,10 @@ class ITK_TEMPLATE_EXPORT OrthogonalSwath2DPathFilter using ImageConstPointer = typename ImageType::ConstPointer; using OutputPathType = OrthogonallyCorrected2DParametricPath; - using OutputPathPointer = typename OutputPathType::Pointer; - using OutputPathInputType = typename OutputPathType::InputType; - using OrthogonalCorrectionTableType = typename OutputPathType::OrthogonalCorrectionTableType; - using OrthogonalCorrectionTablePointer = typename OutputPathType::OrthogonalCorrectionTablePointer; + using OutputPathPointer = OutputPathType::Pointer; + using OutputPathInputType = OutputPathType::InputType; + using OrthogonalCorrectionTableType = OutputPathType::OrthogonalCorrectionTableType; + using OrthogonalCorrectionTablePointer = OutputPathType::OrthogonalCorrectionTablePointer; using IndexType = typename InputPathType::IndexType; using OffsetType = typename InputPathType::OffsetType; diff --git a/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx b/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx index a156012c3cf..f5efd5c77b3 100644 --- a/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx +++ b/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx @@ -122,7 +122,7 @@ itkExtractOrthogonalSwath2DImageFilterTest(int argc, char * argv[]) extractOrthogonalSwath2DImageFilter, ExtractOrthogonalSwath2DImageFilter, ImageAndPathToImageFilter); - constexpr typename ImageType::PixelType defaultPixelValue{}; + constexpr ImageType::PixelType defaultPixelValue{}; extractOrthogonalSwath2DImageFilter->SetDefaultPixelValue(defaultPixelValue); extractOrthogonalSwath2DImageFilter->SetImageInput(inputImage); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx index 6548ae780b4..63e2a5f7faf 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx @@ -66,7 +66,7 @@ itkCleanQuadEdgeMeshFilterTest(int argc, char * argv[]) filter->SetInput(mesh); - constexpr typename CleanFilterType::InputCoordinateType absTol{}; + constexpr CleanFilterType::InputCoordinateType absTol{}; filter->SetAbsoluteTolerance(absTol); ITK_TEST_SET_GET_VALUE(absTol, filter->GetAbsoluteTolerance()); diff --git a/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.hxx b/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.hxx index debf9f2e9b3..5c60e156ab6 100644 --- a/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.hxx +++ b/Modules/Filtering/Smoothing/include/itkBoxSigmaImageFilter.hxx @@ -47,8 +47,8 @@ BoxSigmaImageFilter::DynamicThreadedGenerateData( { // Accumulate type is too small using AccValueType = typename itk::NumericTraits::RealType; - using AccPixType = typename itk::Vector; - using AccumImageType = typename itk::Image; + using AccPixType = itk::Vector; + using AccumImageType = itk::Image; typename TInputImage::SizeType internalRadius; for (unsigned int i = 0; i < TInputImage::ImageDimension; ++i) diff --git a/Modules/Filtering/Smoothing/test/itkFFTDiscreteGaussianImageFilterFactoryTest.cxx b/Modules/Filtering/Smoothing/test/itkFFTDiscreteGaussianImageFilterFactoryTest.cxx index 26f3504cbc8..b030fb272f6 100644 --- a/Modules/Filtering/Smoothing/test/itkFFTDiscreteGaussianImageFilterFactoryTest.cxx +++ b/Modules/Filtering/Smoothing/test/itkFFTDiscreteGaussianImageFilterFactoryTest.cxx @@ -31,7 +31,7 @@ itkFFTDiscreteGaussianImageFilterFactoryTest(int, char *[]) using PixelType = float; using ImageType = itk::Image; using BaseFilterType = itk::DiscreteGaussianImageFilter; - using OverrideFilterType = typename itk::FFTDiscreteGaussianImageFilter; + using OverrideFilterType = itk::FFTDiscreteGaussianImageFilter; BaseFilterType::Pointer baseFilter; diff --git a/Modules/Filtering/Thresholding/include/itkHistogramThresholdCalculator.h b/Modules/Filtering/Thresholding/include/itkHistogramThresholdCalculator.h index 9ce8db552a0..d04054a88a8 100644 --- a/Modules/Filtering/Thresholding/include/itkHistogramThresholdCalculator.h +++ b/Modules/Filtering/Thresholding/include/itkHistogramThresholdCalculator.h @@ -95,7 +95,7 @@ class HistogramThresholdCalculator : public ProcessObject } using Superclass::MakeOutput; - typename DataObject::Pointer + DataObject::Pointer MakeOutput(DataObjectPointerArraySizeType) override { return DecoratedOutputType::New().GetPointer(); diff --git a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.hxx index 73212e47005..e99c8c1da9d 100644 --- a/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkIntermodesThresholdCalculator.hxx @@ -148,7 +148,7 @@ IntermodesThresholdCalculator::PrintSelf(std::ostream & os, Superclass::PrintSelf(os, indent); os << indent << "MaximumSmoothingIterations: " - << static_cast::PrintType>(m_MaximumSmoothingIterations) << std::endl; + << static_cast::PrintType>(m_MaximumSmoothingIterations) << std::endl; os << indent << "UseInterMode: " << m_UseInterMode << std::endl; } diff --git a/Modules/Filtering/Thresholding/test/itkBinaryThresholdImageFilterTest.cxx b/Modules/Filtering/Thresholding/test/itkBinaryThresholdImageFilterTest.cxx index 43ff64e554d..99cf87b544e 100644 --- a/Modules/Filtering/Thresholding/test/itkBinaryThresholdImageFilterTest.cxx +++ b/Modules/Filtering/Thresholding/test/itkBinaryThresholdImageFilterTest.cxx @@ -130,10 +130,10 @@ itkBinaryThresholdImageFilterTest(int, char *[]) // Exercise the const variants const FilterType::ConstPointer constFilter = (const FilterType *)(filter.GetPointer()); - const typename FilterType::InputPixelObjectType * lowerThresholdInput = constFilter->GetLowerThresholdInput(); + const FilterType::InputPixelObjectType * lowerThresholdInput = constFilter->GetLowerThresholdInput(); ITK_TEST_SET_GET_VALUE(lowerThresholdInput->Get(), lowerThreshold2->Get()); - const typename FilterType::InputPixelObjectType * upperThresholdInput = constFilter->GetUpperThresholdInput(); + const FilterType::InputPixelObjectType * upperThresholdInput = constFilter->GetUpperThresholdInput(); ITK_TEST_SET_GET_VALUE(upperThresholdInput->Get(), upperThreshold2->Get()); diff --git a/Modules/IO/CSV/include/itkCSVArray2DDataObject.h b/Modules/IO/CSV/include/itkCSVArray2DDataObject.h index 76c6eab8ee7..81ae2cf3859 100644 --- a/Modules/IO/CSV/include/itkCSVArray2DDataObject.h +++ b/Modules/IO/CSV/include/itkCSVArray2DDataObject.h @@ -62,11 +62,11 @@ class ITK_TEMPLATE_EXPORT CSVArray2DDataObject : public DataObject itkOverrideGetNameOfClassMacro(CSVArray2DDataObject); /* Vector type alias. */ - using NumericVectorType = typename std::vector; - using StringVectorType = typename std::vector; + using NumericVectorType = std::vector; + using StringVectorType = std::vector; /** Typedef for the Array2D object. */ - using MatrixType = typename itk::Array2D; + using MatrixType = itk::Array2D; /** Set macros */ /** @ITKStartGrouping */ diff --git a/Modules/IO/CSV/include/itkCSVArray2DFileReader.h b/Modules/IO/CSV/include/itkCSVArray2DFileReader.h index 1102f0f5db2..7951e0c5f69 100644 --- a/Modules/IO/CSV/include/itkCSVArray2DFileReader.h +++ b/Modules/IO/CSV/include/itkCSVArray2DFileReader.h @@ -94,7 +94,7 @@ class ITK_TEMPLATE_EXPORT CSVArray2DFileReader : public CSVFileReaderBase itkOverrideGetNameOfClassMacro(CSVArray2DFileReader); /** DataFrame Object types */ - using Array2DDataObjectType = typename itk::CSVArray2DDataObject; + using Array2DDataObjectType = itk::CSVArray2DDataObject; using Array2DDataObjectPointer = typename Array2DDataObjectType::Pointer; /** The value type of the dataset. */ diff --git a/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx b/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx index 34178fd7b5b..83d50b03bf5 100644 --- a/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx +++ b/Modules/IO/HDF5/test/itkHDF5ImageIOStreamingReadWriteTest.cxx @@ -96,7 +96,7 @@ HDF5ReadWriteTest2(const char * fileName) // pipeline and the itk::StreamingImageFilter will maintain handles to open HDF5 files // until their destructors run. - using ImageType = typename itk::Image; + using ImageType = itk::Image; // Create a source object (in this case a constant image). typename ImageType::SizeType size; @@ -108,9 +108,9 @@ HDF5ReadWriteTest2(const char * fileName) imageSource->SetSize(size); // Write image with streaming. - using WriterType = typename itk::ImageFileWriter; + using WriterType = itk::ImageFileWriter; auto writer = WriterType::New(); - using MonitorFilterType = typename itk::PipelineMonitorImageFilter; + using MonitorFilterType = itk::PipelineMonitorImageFilter; auto writerMonitor = MonitorFilterType::New(); writerMonitor->SetInput(imageSource->GetOutput()); writer->SetFileName(fileName); @@ -153,13 +153,13 @@ HDF5ReadWriteTest2(const char * fileName) writer = typename WriterType::Pointer(); // Read image with streaming. - using ReaderType = typename itk::ImageFileReader; + using ReaderType = itk::ImageFileReader; auto reader = ReaderType::New(); reader->SetFileName(fileName); reader->SetUseStreaming(true); auto readerMonitor = MonitorFilterType::New(); readerMonitor->SetInput(reader->GetOutput()); - using StreamingFilter = typename itk::StreamingImageFilter; + using StreamingFilter = itk::StreamingImageFilter; auto streamer = StreamingFilter::New(); streamer->SetInput(readerMonitor->GetOutput()); streamer->SetNumberOfStreamDivisions(5); diff --git a/Modules/IO/HDF5/test/itkHDF5ImageIOTest.cxx b/Modules/IO/HDF5/test/itkHDF5ImageIOTest.cxx index bf85cae5a7f..db2a03d7ae9 100644 --- a/Modules/IO/HDF5/test/itkHDF5ImageIOTest.cxx +++ b/Modules/IO/HDF5/test/itkHDF5ImageIOTest.cxx @@ -30,7 +30,7 @@ HDF5ReadWriteTest(const char * fileName) { std::cout << fileName << std::endl; int success(EXIT_SUCCESS); - using ImageType = typename itk::Image; + using ImageType = itk::Image; typename ImageType::SpacingType spacing; typename ImageType::PointType origin; for (unsigned int i = 0; i < 3; ++i) diff --git a/Modules/IO/ImageBase/include/itkIOTestHelper.h b/Modules/IO/ImageBase/include/itkIOTestHelper.h index 70560d6dc1e..da07017da84 100644 --- a/Modules/IO/ImageBase/include/itkIOTestHelper.h +++ b/Modules/IO/ImageBase/include/itkIOTestHelper.h @@ -31,9 +31,7 @@ class IOTestHelper public: template static typename TImage::Pointer - ReadImage(const std::string & fileName, - const bool zeroOrigin = false, - typename ImageIOBase::Pointer imageio = nullptr) + ReadImage(const std::string & fileName, const bool zeroOrigin = false, ImageIOBase::Pointer imageio = nullptr) { using ReaderType = itk::ImageFileReader; diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx index 286390fbbba..6bff9dc8c64 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx @@ -305,7 +305,7 @@ MINCReadWriteTest(const char * fileName, const char * minc_storage_type, double { int success(EXIT_SUCCESS); - using ImageType = typename itk::Image; + using ImageType = itk::Image; typename ImageType::SizeType size; typename ImageType::IndexType index; @@ -567,7 +567,7 @@ MINCReadWriteTestVector(const char * fileName, { int success(EXIT_SUCCESS); - using ImageType = typename itk::VectorImage; + using ImageType = itk::VectorImage; using InternalPixelType = typename itk::VectorImage::PixelType; typename ImageType::SizeType size; diff --git a/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx b/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx index 2c0c8422947..66fea119396 100644 --- a/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx +++ b/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx @@ -528,7 +528,7 @@ BYUMeshIO::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); - os << indent << "FilePosition: " << static_cast::PrintType>(m_FilePosition) + os << indent << "FilePosition: " << static_cast::PrintType>(m_FilePosition) << std::endl; os << indent << "PartId: " << m_PartId << std::endl; os << indent << "First Cell Id: " << m_FirstCellId << std::endl; diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.h b/Modules/IO/MeshBase/include/itkMeshFileReader.h old mode 100755 new mode 100644 index 20b7e961170..d7038d47888 --- a/Modules/IO/MeshBase/include/itkMeshFileReader.h +++ b/Modules/IO/MeshBase/include/itkMeshFileReader.h @@ -109,7 +109,7 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource using OutputCellIdentifier = typename OutputMeshType::CellIdentifier; using OutputCellAutoPointer = typename OutputMeshType::CellAutoPointer; using OutputCellType = typename OutputMeshType::CellType; - using SizeValueType = typename MeshIOBase::SizeValueType; + using SizeValueType = MeshIOBase::SizeValueType; using OutputVertexCellType = VertexCell; using OutputLineCellType = LineCell; diff --git a/Modules/IO/MeshBase/include/itkMeshFileWriter.h b/Modules/IO/MeshBase/include/itkMeshFileWriter.h index 283dfe3e88a..e3b2c77f9d8 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileWriter.h +++ b/Modules/IO/MeshBase/include/itkMeshFileWriter.h @@ -72,7 +72,7 @@ class ITK_TEMPLATE_EXPORT MeshFileWriter : public ProcessObject using InputMeshRegionType = typename InputMeshType::RegionType; using InputMeshPixelType = typename InputMeshType::PixelType; using InputMeshCellType = typename InputMeshType::CellType; - using SizeValueType = typename MeshIOBase::SizeValueType; + using SizeValueType = MeshIOBase::SizeValueType; /** Set/Get the mesh input of this writer. */ using Superclass::SetInput; diff --git a/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx b/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx index 8d27e7b1f25..b75e9aa8256 100644 --- a/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx +++ b/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx @@ -116,8 +116,8 @@ TEST(VTKPolyDataMeshIO, LosslessWriteAndReadOfPoints) // Generate various input points that have finite coordinate values. const auto inputPoints = [] { - using PointType = typename MeshType::PointType; - using CoordinateType = typename MeshType::CoordinateType; + using PointType = MeshType::PointType; + using CoordinateType = MeshType::CoordinateType; using NumericLimits = std::numeric_limits; std::vector points; @@ -160,8 +160,8 @@ TEST(VTKPolyDataMeshIO, SupportWriteAndReadOfNaNCoordValues) for (const bool writeAsBinary : { false, true }) { using MeshType = itk::Mesh; - using PointType = typename MeshType::PointType; - using CoordinateType = typename MeshType::CoordinateType; + using PointType = MeshType::PointType; + using CoordinateType = MeshType::CoordinateType; Expect_lossless_writing_and_reading_of_points( "VTKPolyDataMeshIOGTest_SupportWriteAndReadOfNaNCoordValues.vtk", diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.cxx index d8467cbcef7..60286005c3d 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.cxx @@ -395,7 +395,7 @@ itkNiftiImageIOTest(int argc, char * argv[]) // The way the test is structured, we cannot know the expected file // type, so just print it - const typename itk::NiftiImageIOEnums::NiftiFileEnum fileType = imageIO->DetermineFileType(fileName.c_str()); + const itk::NiftiImageIOEnums::NiftiFileEnum fileType = imageIO->DetermineFileType(fileName.c_str()); std::cout << "File type: " << fileType << std::endl; try diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h index 4b9ecce9f58..d66dd3ccd14 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h @@ -252,10 +252,10 @@ TestImageOfSymMats(const std::string & fname) constexpr int dimsize{ 2 }; /** Deformation field pixel type. */ - // using PixelType = typename itk::DiffusionTenor3D; + // using PixelType = itk::DiffusionTenor3D; /** Deformation field type. */ - using DtiImageType = typename itk::Image; + using DtiImageType = itk::Image; // original test case was destined for failure. NIfTI always writes out 3D // orientation. The only sensible matrices you could pass in would be of the form @@ -467,7 +467,7 @@ RGBTest(int argc, char * argv[]) return EXIT_FAILURE; } - using RGBImageType = typename itk::Image; + using RGBImageType = itk::Image; constexpr typename RGBImageType::SizeType size{ 5, 5, 5 }; constexpr typename RGBImageType::IndexType index{}; typename RGBImageType::RegionType imageRegion{ index, size }; diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx index 11bf7f86439..66eb980bfae 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx @@ -46,10 +46,10 @@ TestImageOfVectors(const std::string & fname, const std::string & intentCode = " { constexpr int dimsize{ 2 }; /** Deformation field pixel type. */ - using FieldPixelType = typename itk::Vector; + using FieldPixelType = itk::Vector; /** Deformation field type. */ - using VectorImageType = typename itk::Image; + using VectorImageType = itk::Image; // // swizzle up a random vector image. diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx index 5a22d1b2ae4..9fb7d5af616 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx @@ -97,8 +97,8 @@ SlopeInterceptTest() // // read the image back in - using ImageType = typename itk::Image; - typename ImageType::Pointer image; + using ImageType = itk::Image; + ImageType::Pointer image; try { image = itk::IOTestHelper::ReadImage(std::string(filename)); @@ -108,7 +108,7 @@ SlopeInterceptTest() itk::IOTestHelper::Remove(filename); return EXIT_FAILURE; } - using IteratorType = typename itk::ImageRegionIterator; + using IteratorType = itk::ImageRegionIterator; IteratorType it(image, image->GetLargestPossibleRegion()); it.GoToBegin(); double maxerror = 0.0; @@ -178,7 +178,7 @@ SlopeInterceptWriteTest() // // read the image back in using ImageType = itk::Image; - typename ImageType::Pointer image; + ImageType::Pointer image; try { image = itk::IOTestHelper::ReadImage(std::string(filename)); diff --git a/Modules/IO/NIFTI/test/itkNiftiReadAnalyzeTest.cxx b/Modules/IO/NIFTI/test/itkNiftiReadAnalyzeTest.cxx index 6dcc42c93fd..0aadf432830 100644 --- a/Modules/IO/NIFTI/test/itkNiftiReadAnalyzeTest.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiReadAnalyzeTest.cxx @@ -146,8 +146,8 @@ ReadImage(const std::string & fileName, { using ReaderType = itk::ImageFileReader; - auto reader = ReaderType::New(); - const typename itk::NiftiImageIO::Pointer imageIO = itk::NiftiImageIO::New(); + auto reader = ReaderType::New(); + const itk::NiftiImageIO::Pointer imageIO = itk::NiftiImageIO::New(); { imageIO->SetLegacyAnalyze75Mode(analyze_mode); reader->SetImageIO(imageIO); diff --git a/Modules/IO/NRRD/src/itkNrrdImageIO.cxx b/Modules/IO/NRRD/src/itkNrrdImageIO.cxx index c630507a020..c41156fe515 100644 --- a/Modules/IO/NRRD/src/itkNrrdImageIO.cxx +++ b/Modules/IO/NRRD/src/itkNrrdImageIO.cxx @@ -1320,7 +1320,7 @@ NrrdImageIO::Write(const void * buffer) } else { - const typename Superclass::IOFileEnum fileType = this->GetFileType(); + const Superclass::IOFileEnum fileType = this->GetFileType(); switch (fileType) { default: @@ -1335,7 +1335,7 @@ NrrdImageIO::Write(const void * buffer) } // set desired endianness of output - const typename Superclass::IOByteOrderEnum byteOrder = this->GetByteOrder(); + const Superclass::IOByteOrderEnum byteOrder = this->GetByteOrder(); switch (byteOrder) { default: diff --git a/Modules/IO/NRRD/test/itkNrrd5dVectorImageReadWriteTest.cxx b/Modules/IO/NRRD/test/itkNrrd5dVectorImageReadWriteTest.cxx index 88317cfe7ba..d6ee230f8ca 100644 --- a/Modules/IO/NRRD/test/itkNrrd5dVectorImageReadWriteTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrd5dVectorImageReadWriteTest.cxx @@ -381,7 +381,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, 1, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } @@ -398,7 +398,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, 1, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } @@ -526,7 +526,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, SpaceDimension, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } @@ -543,7 +543,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, SpaceDimension, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } @@ -561,7 +561,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, expectedComponents, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } @@ -579,7 +579,7 @@ itkNrrd5dVectorImageReadWriteTest(int argc, char * argv[]) WriteImageSequenceFile(filename, imageListToWrite); CheckImageSequenceFileHeader( filename, SpaceDimension, SpaceDimension + 1, expectedPixelType, expectedComponents, useNonListExtensionAsPixel); - std::vector::Pointer> imageListRead; + std::vector::Pointer> imageListRead; ReadImageSequenceFile(filename, imageListRead); } diff --git a/Modules/IO/RAW/include/itkRawImageIO.hxx b/Modules/IO/RAW/include/itkRawImageIO.hxx index 1336d05225e..f27c23d53e2 100644 --- a/Modules/IO/RAW/include/itkRawImageIO.hxx +++ b/Modules/IO/RAW/include/itkRawImageIO.hxx @@ -100,9 +100,8 @@ RawImageIO::GetHeaderSize() // Get the size of the header from the size of the image file.seekg(0, std::ios::end); - m_HeaderSize = - static_cast(static_cast(file.tellg()) - - static_cast(this->m_Strides[m_FileDimensionality + 1])); + m_HeaderSize = static_cast(static_cast(file.tellg()) - + static_cast(this->m_Strides[m_FileDimensionality + 1])); } return m_HeaderSize; diff --git a/Modules/IO/RAW/test/itkRawImageIOTest5.cxx b/Modules/IO/RAW/test/itkRawImageIOTest5.cxx index b0d11cc8981..fd868ff050c 100644 --- a/Modules/IO/RAW/test/itkRawImageIOTest5.cxx +++ b/Modules/IO/RAW/test/itkRawImageIOTest5.cxx @@ -40,8 +40,8 @@ class RawImageReaderAndWriter { m_Image = ImageType::New(); - constexpr typename ImageType::SizeType size{ 16, 16 }; - typename ImageType::RegionType region = { size }; + constexpr ImageType::SizeType size{ 16, 16 }; + ImageType::RegionType region = { size }; m_Image->SetRegions(region); m_Image->Allocate(); @@ -149,7 +149,7 @@ class RawImageReaderAndWriter private: std::string m_FileName; - typename ImageType::Pointer m_Image; + ImageType::Pointer m_Image; bool m_Error; }; diff --git a/Modules/IO/TIFF/test/itkImageSeriesReaderReverse.cxx b/Modules/IO/TIFF/test/itkImageSeriesReaderReverse.cxx index a87feb3f7e6..bde658e0629 100644 --- a/Modules/IO/TIFF/test/itkImageSeriesReaderReverse.cxx +++ b/Modules/IO/TIFF/test/itkImageSeriesReaderReverse.cxx @@ -104,9 +104,9 @@ TEST_F(ITKIOTIFF, ReverseOrder_with_ImageIO) } { // Create an ImageSeriesWriter to write the series of images - auto writer = itk::ImageSeriesWriter< - ImageType, - typename ImageType::RebindImageType>::New(); + auto writer = + itk::ImageSeriesWriter>::New(); writer->SetFileNames(filePaths); writer->SetInput(img); writer->Update(); diff --git a/Modules/IO/TransformBase/src/itkTransformFileReader.cxx b/Modules/IO/TransformBase/src/itkTransformFileReader.cxx index a3e4a7bf058..8274b27de91 100644 --- a/Modules/IO/TransformBase/src/itkTransformFileReader.cxx +++ b/Modules/IO/TransformBase/src/itkTransformFileReader.cxx @@ -44,7 +44,7 @@ struct KernelTransformHelper { if (transform->GetInputSpaceDimension() == Dimension) { - using KernelTransformType = typename itk::KernelTransform; + using KernelTransformType = itk::KernelTransform; auto * kernelTransform = static_cast(transform.GetPointer()); kernelTransform->ComputeWMatrix(); return 0; diff --git a/Modules/IO/TransformHDF5/test/itkIOTransformHDF5Test.cxx b/Modules/IO/TransformHDF5/test/itkIOTransformHDF5Test.cxx index 241c818acbd..b912325cb44 100644 --- a/Modules/IO/TransformHDF5/test/itkIOTransformHDF5Test.cxx +++ b/Modules/IO/TransformHDF5/test/itkIOTransformHDF5Test.cxx @@ -403,7 +403,7 @@ itkIOTransformHDF5Test(int argc, char * argv[]) else if (itksys::SystemTools::FileExists(testType)) // Assume the final parameter is a filename to be read { // This test only verifies that the test can read the transform. - using TFM_READER_TYPE = typename itk::TransformFileReaderTemplate; + using TFM_READER_TYPE = itk::TransformFileReaderTemplate; auto reader = TFM_READER_TYPE::New(); reader->SetFileName(testType); reader->Update(); diff --git a/Modules/IO/XML/include/itkDOMReader.h b/Modules/IO/XML/include/itkDOMReader.h index 060e0679e0e..66bba80cc5c 100644 --- a/Modules/IO/XML/include/itkDOMReader.h +++ b/Modules/IO/XML/include/itkDOMReader.h @@ -75,10 +75,10 @@ class ITK_TEMPLATE_EXPORT DOMReader : public Object using OutputType = TOutput; using DOMNodeType = DOMNode; - using DOMNodePointer = typename DOMNodeType::Pointer; + using DOMNodePointer = DOMNodeType::Pointer; using LoggerType = Logger; - using LoggerPointer = typename LoggerType::Pointer; + using LoggerPointer = LoggerType::Pointer; /** Set the input XML filename. */ itkSetStringMacro(FileName); @@ -147,7 +147,7 @@ class ITK_TEMPLATE_EXPORT DOMReader : public Object OutputType * m_Output{}; /** Variable to hold the output object if it is a smart object. */ - typename LightObject::Pointer m_OutputHolder{}; + LightObject::Pointer m_OutputHolder{}; /** Variable to hold the intermediate DOM object. */ DOMNodePointer m_IntermediateDOM{}; diff --git a/Modules/IO/XML/include/itkDOMWriter.h b/Modules/IO/XML/include/itkDOMWriter.h index ed54b3ff24a..2e80b173830 100644 --- a/Modules/IO/XML/include/itkDOMWriter.h +++ b/Modules/IO/XML/include/itkDOMWriter.h @@ -77,10 +77,10 @@ class ITK_TEMPLATE_EXPORT DOMWriter : public Object using InputType = TInput; using DOMNodeType = DOMNode; - using DOMNodePointer = typename DOMNodeType::Pointer; + using DOMNodePointer = DOMNodeType::Pointer; using LoggerType = Logger; - using LoggerPointer = typename LoggerType::Pointer; + using LoggerPointer = LoggerType::Pointer; /** Set the output XML filename. */ itkSetStringMacro(FileName); @@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT DOMWriter : public Object const InputType * m_Input{}; /** Variable to hold the input object if it is a smart object. */ - typename LightObject::ConstPointer m_InputHolder{}; + LightObject::ConstPointer m_InputHolder{}; /** Variable to hold the intermediate DOM object. */ DOMNodePointer m_IntermediateDOM{}; diff --git a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h index fc89e9a398e..18c1bb41254 100644 --- a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h +++ b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.h @@ -123,7 +123,7 @@ class ITK_TEMPLATE_EXPORT using RealType = typename NumericTraits::RealType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Type of DataObjects used for scalar outputs */ using RealObjectType = SimpleDataObjectDecorator; diff --git a/Modules/Nonunit/Review/include/itkScalarRegionBasedLevelSetFunction.h b/Modules/Nonunit/Review/include/itkScalarRegionBasedLevelSetFunction.h index 2f7c1fd8931..dbffe7269be 100644 --- a/Modules/Nonunit/Review/include/itkScalarRegionBasedLevelSetFunction.h +++ b/Modules/Nonunit/Review/include/itkScalarRegionBasedLevelSetFunction.h @@ -97,8 +97,8 @@ class ITK_TEMPLATE_EXPORT ScalarRegionBasedLevelSetFunction using ConstFeatureIteratorType = ImageRegionConstIterator; using ListPixelType = std::list; - using ListPixelConstIterator = typename ListPixelType::const_iterator; - using ListPixelIterator = typename ListPixelType::iterator; + using ListPixelConstIterator = ListPixelType::const_iterator; + using ListPixelIterator = ListPixelType::iterator; using ListImageType = Image; /** Performs the narrow-band update of the Heaviside function for each diff --git a/Modules/Numerics/FEM/include/itkFEMRobustSolver.h b/Modules/Numerics/FEM/include/itkFEMRobustSolver.h index 88d3a0b7c5e..44600031968 100644 --- a/Modules/Numerics/FEM/include/itkFEMRobustSolver.h +++ b/Modules/Numerics/FEM/include/itkFEMRobustSolver.h @@ -100,7 +100,7 @@ class ITK_TEMPLATE_EXPORT RobustSolver : public Solver using typename Superclass::FEMObjectType; /** Some convenient types */ - using MatrixType = typename Element::MatrixType; + using MatrixType = Element::MatrixType; using LoadContainerType = typename FEMObjectType::LoadContainerType; using NodeContainerType = typename FEMObjectType::NodeContainerType; using LoadContainerIterator = typename FEMObjectType::LoadContainerIterator; diff --git a/Modules/Numerics/FEM/include/itkFEMSolver.h b/Modules/Numerics/FEM/include/itkFEMSolver.h index 57eb4a562e3..4df7d360884 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolver.h +++ b/Modules/Numerics/FEM/include/itkFEMSolver.h @@ -88,10 +88,10 @@ class ITK_TEMPLATE_EXPORT Solver : public ProcessObject static constexpr unsigned int MaxDimensions = 3; /** Smart Pointer type to a DataObject. */ - using FEMObjectType = typename itk::fem::FEMObject; + using FEMObjectType = itk::fem::FEMObject; using FEMObjectPointer = typename FEMObjectType::Pointer; using FEMObjectConstPointer = typename FEMObjectType::ConstPointer; - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Some convenient type alias. */ using Float = Element::Float; @@ -104,7 +104,7 @@ class ITK_TEMPLATE_EXPORT Solver : public ProcessObject /** * Type used to store interpolation grid */ - using InterpolationGridType = typename itk::Image; + using InterpolationGridType = itk::Image; using InterpolationGridPointerType = typename InterpolationGridType::Pointer; using InterpolationGridSizeType = typename InterpolationGridType::SizeType; using InterpolationGridRegionType = typename InterpolationGridType::RegionType; diff --git a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h index 93471fd8b59..e67d2215844 100644 --- a/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h +++ b/Modules/Numerics/FEM/include/itkImageToRectilinearFEMObjectFilter.h @@ -67,10 +67,10 @@ class ITK_TEMPLATE_EXPORT ImageToRectilinearFEMObjectFilter : public ProcessObje using ImageIndexType = typename InputImageType::IndexType; /** Typedefs for Output FEMObject */ - using FEMObjectType = typename itk::fem::FEMObject; + using FEMObjectType = itk::fem::FEMObject; using FEMObjectPointer = typename FEMObjectType::Pointer; using FEMObjectConstPointer = typename FEMObjectType::ConstPointer; - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Some convenient type alias. */ using MaterialType = itk::fem::MaterialLinearElasticity; diff --git a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx index df973f43f0e..92179a77cbe 100644 --- a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx @@ -195,24 +195,19 @@ ExhaustiveOptimizer::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); - os << indent << "CurrentValue: " << static_cast::PrintType>(m_CurrentValue) - << std::endl; - os << indent << "NumberOfSteps: " << static_cast::PrintType>(m_NumberOfSteps) - << std::endl; - os << indent - << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) + os << indent << "CurrentValue: " << static_cast::PrintType>(m_CurrentValue) << std::endl; + os << indent << "NumberOfSteps: " << static_cast::PrintType>(m_NumberOfSteps) << std::endl; + os << indent << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) << std::endl; itkPrintSelfBooleanMacro(Stop); os << indent << "CurrentParameter: " << m_CurrentParameter << std::endl; os << indent << "StepLength: " << m_StepLength << std::endl; os << indent << "CurrentIndex: " << m_CurrentIndex << std::endl; os << indent << "MaximumNumberOfIterations: " - << static_cast::PrintType>(m_MaximumNumberOfIterations) << std::endl; - os << indent - << "MaximumMetricValue: " << static_cast::PrintType>(m_MaximumMetricValue) + << static_cast::PrintType>(m_MaximumNumberOfIterations) << std::endl; + os << indent << "MaximumMetricValue: " << static_cast::PrintType>(m_MaximumMetricValue) << std::endl; - os << indent - << "MinimumMetricValue: " << static_cast::PrintType>(m_MinimumMetricValue) + os << indent << "MinimumMetricValue: " << static_cast::PrintType>(m_MinimumMetricValue) << std::endl; os << indent << "MinimumMetricValuePosition: " << m_MinimumMetricValuePosition << std::endl; os << indent << "MaximumMetricValuePosition: " << m_MaximumMetricValuePosition << std::endl; diff --git a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx index 7d2f25415ec..6d2cbf3addc 100644 --- a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx @@ -43,29 +43,28 @@ SPSAOptimizer::PrintSelf(std::ostream & os, Indent indent) const { Superclass::PrintSelf(os, indent); - os << indent << "Gradient: " << static_cast::PrintType>(m_Gradient) - << std::endl; + os << indent << "Gradient: " << static_cast::PrintType>(m_Gradient) << std::endl; os << indent << "LearningRate: " << m_LearningRate << std::endl; - os << indent << "Delta: " << static_cast::PrintType>(m_Delta) << std::endl; + os << indent << "Delta: " << static_cast::PrintType>(m_Delta) << std::endl; itkPrintSelfBooleanMacro(Stop); os << indent << "StopCondition: " << m_StopCondition << std::endl; os << indent << "StateOfConvergence: " << m_StateOfConvergence << std::endl; - os << indent - << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) + os << indent << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) << std::endl; itkPrintSelfObjectMacro(Generator); os << indent << "MinimumNumberOfIterations: " - << static_cast::PrintType>(m_MinimumNumberOfIterations) << std::endl; + << static_cast::PrintType>(m_MinimumNumberOfIterations) << std::endl; os << indent << "MaximumNumberOfIterations: " - << static_cast::PrintType>(m_MaximumNumberOfIterations) << std::endl; + << static_cast::PrintType>(m_MaximumNumberOfIterations) << std::endl; os << indent << "StateOfConvergenceDecayRate: " << m_StateOfConvergenceDecayRate << std::endl; os << indent << "Tolerance: " << m_Tolerance << std::endl; itkPrintSelfBooleanMacro(Maximize); os << indent << "GradientMagnitude: " << m_GradientMagnitude << std::endl; - os << indent << "NumberOfPerturbations: " - << static_cast::PrintType>(m_NumberOfPerturbations) << std::endl; + os << indent + << "NumberOfPerturbations: " << static_cast::PrintType>(m_NumberOfPerturbations) + << std::endl; os << indent << "Sa: " << m_Sa << std::endl; os << indent << "Sc: " << m_Sc << std::endl; diff --git a/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx index 0d9da62c770..38be862e5de 100644 --- a/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx @@ -274,7 +274,7 @@ AmoebaTest1() ITK_TEST_EXPECT_TRUE(itkOptimizer->CanUseScales()); // set optimizer parameters - constexpr typename OptimizerType::NumberOfIterationsType numberOfIterations = 10; + constexpr OptimizerType::NumberOfIterationsType numberOfIterations = 10; itkOptimizer->SetMaximumNumberOfIterations(numberOfIterations); ITK_TEST_SET_GET_VALUE(numberOfIterations, itkOptimizer->GetMaximumNumberOfIterations()); diff --git a/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx index ac8b1130079..a5e75a465e4 100644 --- a/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx @@ -31,29 +31,29 @@ static OptimizerType::RandomVariateGeneratorType::IntegerType seedOffset = 0; * domain of either parabolas (runs the optimizer once with initial guess in * each of the domains). */ -int IBPSOTest1(typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType); +int IBPSOTest1(OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType); /** * Test using a 2D quadratic function (single minimum), check that converges * correctly. */ -int IBPSOTest2(typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType); +int IBPSOTest2(OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType); /** * Test using the 2D Rosenbrock function. */ -int IBPSOTest3(typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType, - typename OptimizerType::CoefficientType); +int IBPSOTest3(OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType, + OptimizerType::CoefficientType); bool initalizationBasedTestVerboseFlag = false; @@ -84,10 +84,10 @@ itkInitializationBiasedParticleSwarmOptimizerTest(int argc, char * argv[]) std::cout << "Initialization Biased Particle Swarm Optimizer Test \n \n"; - auto inertiaCoefficient = static_cast(std::stod(argv[1])); - auto personalCoefficient = static_cast(std::stod(argv[2])); - auto globalCoefficient = static_cast(std::stod(argv[3])); - auto initializationCoefficient = static_cast(std::stod(argv[4])); + auto inertiaCoefficient = static_cast(std::stod(argv[1])); + auto personalCoefficient = static_cast(std::stod(argv[2])); + auto globalCoefficient = static_cast(std::stod(argv[3])); + auto initializationCoefficient = static_cast(std::stod(argv[4])); unsigned int success1{ 0 }; unsigned int success2{ 0 }; @@ -127,10 +127,10 @@ itkInitializationBiasedParticleSwarmOptimizerTest(int argc, char * argv[]) int -IBPSOTest1(typename OptimizerType::CoefficientType inertiaCoefficient, - typename OptimizerType::CoefficientType personalCoefficient, - typename OptimizerType::CoefficientType globalCoefficient, - typename OptimizerType::CoefficientType initializationCoefficient) +IBPSOTest1(OptimizerType::CoefficientType inertiaCoefficient, + OptimizerType::CoefficientType personalCoefficient, + OptimizerType::CoefficientType globalCoefficient, + OptimizerType::CoefficientType initializationCoefficient) { std::cout << "Particle Swarm Optimizer Test 1 [f(x) = if(x<0) x^2+4x; else 2x^2-8x]\n"; std::cout << "-------------------------------\n"; @@ -251,10 +251,10 @@ IBPSOTest1(typename OptimizerType::CoefficientType inertiaCoefficient, int -IBPSOTest2(typename OptimizerType::CoefficientType inertiaCoefficient, - typename OptimizerType::CoefficientType personalCoefficient, - typename OptimizerType::CoefficientType globalCoefficient, - typename OptimizerType::CoefficientType initializationCoefficient) +IBPSOTest2(OptimizerType::CoefficientType inertiaCoefficient, + OptimizerType::CoefficientType personalCoefficient, + OptimizerType::CoefficientType globalCoefficient, + OptimizerType::CoefficientType initializationCoefficient) { std::cout << "Particle Swarm Optimizer Test 2 [f(x) = 1/2 x^T A x - b^T x]\n"; std::cout << "----------------------------------\n"; @@ -350,10 +350,10 @@ IBPSOTest2(typename OptimizerType::CoefficientType inertiaCoefficient, } int -IBPSOTest3(typename OptimizerType::CoefficientType inertiaCoefficient, - typename OptimizerType::CoefficientType personalCoefficient, - typename OptimizerType::CoefficientType globalCoefficient, - typename OptimizerType::CoefficientType initializationCoefficient) +IBPSOTest3(OptimizerType::CoefficientType inertiaCoefficient, + OptimizerType::CoefficientType personalCoefficient, + OptimizerType::CoefficientType globalCoefficient, + OptimizerType::CoefficientType initializationCoefficient) { std::cout << "Particle Swarm Optimizer Test 3 [f(x,y) = (1-x)^2 + 100(y-x^2)^2]\n"; std::cout << "----------------------------------\n"; diff --git a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx index 0bdfdbb302c..909f41bd745 100644 --- a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx @@ -226,8 +226,7 @@ ExhaustiveOptimizerv4::PrintSelf(std::ostream & o os << indent << "InitialPosition: " << m_InitialPosition << std::endl; os << indent << "CurrentValue: " << static_cast::PrintType>(m_CurrentValue) << std::endl; - os << indent << "NumberOfSteps: " << static_cast::PrintType>(m_NumberOfSteps) - << std::endl; + os << indent << "NumberOfSteps: " << static_cast::PrintType>(m_NumberOfSteps) << std::endl; itkPrintSelfBooleanMacro(Stop); os << indent << "StepLength: " << m_StepLength << std::endl; os << indent << "CurrentIndex: " << m_CurrentIndex << std::endl; diff --git a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx index f8558bff6fa..f76cc654c9b 100644 --- a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx @@ -59,8 +59,9 @@ GradientDescentOptimizerBasev4Template::PrintSelf << static_cast::PrintType>(m_MaximumStepSizeInPhysicalUnits) << std::endl; itkPrintSelfBooleanMacro(UseConvergenceMonitoring); - os << indent << "ConvergenceWindowSize: " - << static_cast::PrintType>(m_ConvergenceWindowSize) << std::endl; + os << indent + << "ConvergenceWindowSize: " << static_cast::PrintType>(m_ConvergenceWindowSize) + << std::endl; itkPrintSelfObjectMacro(ConvergenceMonitoring); itkPrintSelfObjectMacro(ModifyGradientByScalesThreader); diff --git a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetric.hxx b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetric.hxx index a7895daba01..5081868d43e 100644 --- a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetric.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetric.hxx @@ -541,8 +541,7 @@ ObjectToObjectMetric::PrintType>(m_NumberOfValidPoints) + os << indent << "NumberOfValidPoints: " << static_cast::PrintType>(m_NumberOfValidPoints) << std::endl; } diff --git a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetricBase.h b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetricBase.h index 46fd9216c58..1458f372654 100644 --- a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetricBase.h +++ b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectMetricBase.h @@ -118,7 +118,7 @@ class ITK_TEMPLATE_EXPORT ObjectToObjectMetricBaseTemplate /** Type of object. */ using ObjectType = Object; - using ObjectConstPointer = typename ObjectType::ConstPointer; + using ObjectConstPointer = ObjectType::ConstPointer; /** Get/Set the Fixed Object. */ /** @ITKStartGrouping */ diff --git a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx index 3acb628a61f..53e28b6e33e 100644 --- a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesEstimator.hxx @@ -622,12 +622,12 @@ RegistrationParameterScalesEstimator::PrintSelf(std::ostream & os, Inde itkPrintSelfObjectMacro(Metric); os << indent << "SamplePoints: " << m_SamplePoints << std::endl; - os << indent << "SamplingTime: " << static_cast::PrintType>(m_SamplingTime) + os << indent << "SamplingTime: " << static_cast::PrintType>(m_SamplingTime) << std::endl; + os << indent + << "NumberOfRandomSamples: " << static_cast::PrintType>(m_NumberOfRandomSamples) << std::endl; - os << indent << "NumberOfRandomSamples: " - << static_cast::PrintType>(m_NumberOfRandomSamples) << std::endl; os << indent - << "CentralRegionRadius: " << static_cast::PrintType>(m_CentralRegionRadius) + << "CentralRegionRadius: " << static_cast::PrintType>(m_CentralRegionRadius) << std::endl; itkPrintSelfObjectMacro(VirtualDomainPointSet); diff --git a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx index 605b0d9847a..8c85fe0c500 100644 --- a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx @@ -114,7 +114,7 @@ itkAutoScaledGradientDescentRegistrationOnVectorTestTemplated(int iterationCommand->SetOptimizer(optimizer); // Optimizer parameter scales estimator - typename itk::OptimizerParameterScalesEstimator::Pointer scalesEstimator; + itk::OptimizerParameterScalesEstimator::Pointer scalesEstimator; using ShiftScalesEstimatorType = itk::RegistrationParameterScalesFromPhysicalShift; using JacobianScalesEstimatorType = itk::RegistrationParameterScalesFromJacobian; diff --git a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx index 662e70cb5d4..28e255248a6 100644 --- a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx @@ -115,7 +115,7 @@ itkAutoScaledGradientDescentRegistrationTestTemplated(int number iterationCommand->SetOptimizer(optimizer); // Optimizer parameter scales estimator - typename itk::OptimizerParameterScalesEstimator::Pointer scalesEstimator; + itk::OptimizerParameterScalesEstimator::Pointer scalesEstimator; using PhysicalShiftScalesEstimatorType = itk::RegistrationParameterScalesFromPhysicalShift; using IndexShiftScalesEstimatorType = itk::RegistrationParameterScalesFromIndexShift; diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx index 23fb6b2c39c..8a6431b9727 100644 --- a/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx @@ -252,15 +252,15 @@ itkGradientDescentLineSearchOptimizerv4Test(int, char *[]) ScalesType scales(metric->GetNumberOfLocalParameters(), 0.5); itkOptimizer->SetScales(scales); - constexpr typename OptimizerType::InternalComputationValueType epsilon = 1.e-4; + constexpr OptimizerType::InternalComputationValueType epsilon = 1.e-4; itkOptimizer->SetEpsilon(epsilon); ITK_TEST_SET_GET_VALUE(epsilon, itkOptimizer->GetEpsilon()); - constexpr typename OptimizerType::InternalComputationValueType lowerLimit = -10; + constexpr OptimizerType::InternalComputationValueType lowerLimit = -10; itkOptimizer->SetLowerLimit(lowerLimit); ITK_TEST_SET_GET_VALUE(lowerLimit, itkOptimizer->GetLowerLimit()); - constexpr typename OptimizerType::InternalComputationValueType upperLimit = 10; + constexpr OptimizerType::InternalComputationValueType upperLimit = 10; itkOptimizer->SetUpperLimit(upperLimit); ITK_TEST_SET_GET_VALUE(upperLimit, itkOptimizer->GetUpperLimit()); diff --git a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h index 7a323a6458a..7ecac77ca17 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.h @@ -104,7 +104,7 @@ class ITK_TEMPLATE_EXPORT DistanceToCentroidMembershipFunction : public Membersh PrintSelf(std::ostream & os, Indent indent) const override; /** Return a copy of the current membership function */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; private: diff --git a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx index d9f636bf0b4..7a4edc02765 100644 --- a/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkDistanceToCentroidMembershipFunction.hxx @@ -64,7 +64,7 @@ DistanceToCentroidMembershipFunction::Evaluate(const MeasurementVectorT } template -typename LightObject::Pointer +LightObject::Pointer DistanceToCentroidMembershipFunction::InternalClone() const { LightObject::Pointer loPtr = Superclass::InternalClone(); diff --git a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h index 9ce2b8f3e4c..35cf82e85c3 100644 --- a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h +++ b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.h @@ -144,7 +144,7 @@ class ITK_TEMPLATE_EXPORT ExpectationMaximizationMixtureModelEstimator : public /** type alias for decorated array of proportion */ using MembershipFunctionsWeightsArrayObjectType = SimpleDataObjectDecorator; - using MembershipFunctionsWeightsArrayPointer = typename MembershipFunctionsWeightsArrayObjectType::Pointer; + using MembershipFunctionsWeightsArrayPointer = MembershipFunctionsWeightsArrayObjectType::Pointer; /** Get method for data decorated Membership functions weights array */ const MembershipFunctionsWeightsArrayObjectType * diff --git a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h index 6b06fa5a2c1..325c27274ec 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.h @@ -115,7 +115,7 @@ class ITK_TEMPLATE_EXPORT GaussianMembershipFunction : public MembershipFunction /** Method to clone a membership function, i.e. create a new instance of * the same type of membership function and configure its ivars to * match. */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; protected: diff --git a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx index 84039712603..fd094133b76 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianMembershipFunction.hxx @@ -166,7 +166,7 @@ GaussianMembershipFunction::Evaluate(const MeasurementVector } template -typename LightObject::Pointer +LightObject::Pointer GaussianMembershipFunction::InternalClone() const { LightObject::Pointer loPtr = Superclass::InternalClone(); diff --git a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h index e83764b9424..dd8a045cc9e 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.h @@ -100,7 +100,7 @@ class ITK_TEMPLATE_EXPORT GaussianRandomSpatialNeighborSubsampler * This does a complete copy of the subsampler state * to the new subsampler */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; GaussianRandomSpatialNeighborSubsampler() = default; diff --git a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx index c902bcfcb8f..987d519963b 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianRandomSpatialNeighborSubsampler.hxx @@ -22,10 +22,10 @@ namespace itk::Statistics { template -typename LightObject::Pointer +LightObject::Pointer GaussianRandomSpatialNeighborSubsampler::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Numerics/Statistics/include/itkHistogram.h b/Modules/Numerics/Statistics/include/itkHistogram.h index 8d625da1e68..fbbbaae8780 100644 --- a/Modules/Numerics/Statistics/include/itkHistogram.h +++ b/Modules/Numerics/Statistics/include/itkHistogram.h @@ -114,11 +114,11 @@ class ITK_TEMPLATE_EXPORT Histogram : public Sample> /** Index type alias support An index is used to access pixel values. */ using IndexType = Array; - using IndexValueType = typename IndexType::ValueType; + using IndexValueType = IndexType::ValueType; /** size array type */ using SizeType = Array; - using SizeValueType = typename SizeType::ValueType; + using SizeValueType = SizeType::ValueType; /** bin min max value storage types */ using BinMinVectorType = std::vector; diff --git a/Modules/Numerics/Statistics/include/itkHistogram.hxx b/Modules/Numerics/Statistics/include/itkHistogram.hxx index 75eb40d4bf2..f0a468e41c9 100644 --- a/Modules/Numerics/Statistics/include/itkHistogram.hxx +++ b/Modules/Numerics/Statistics/include/itkHistogram.hxx @@ -659,7 +659,7 @@ Histogram::PrintSelf(std::ostream & os, Inden Superclass::PrintSelf(os, indent); - os << indent << "Size: " << static_cast::PrintType>(m_Size) << std::endl; + os << indent << "Size: " << static_cast::PrintType>(m_Size) << std::endl; os << indent << "OffsetTable: " << std::endl; for (const auto & elem : m_OffsetTable) { @@ -691,7 +691,7 @@ Histogram::PrintSelf(std::ostream & os, Inden } os << indent << "TempMeasurementVector: " << m_TempMeasurementVector << std::endl; - os << indent << "TempIndex: " << static_cast::PrintType>(m_TempIndex) << std::endl; + os << indent << "TempIndex: " << static_cast::PrintType>(m_TempIndex) << std::endl; itkPrintSelfBooleanMacro(ClipBinsAtEnds); } diff --git a/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h b/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h index a2292651a15..0fe7327beed 100644 --- a/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h +++ b/Modules/Numerics/Statistics/include/itkImageClassifierFilter.h @@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT ImageClassifierFilter : public ImageToImageFilter; using MembershipFunctionsWeightsArrayObjectType = SimpleDataObjectDecorator; - using MembershipFunctionsWeightsArrayPointer = typename MembershipFunctionsWeightsArrayObjectType::Pointer; + using MembershipFunctionsWeightsArrayPointer = MembershipFunctionsWeightsArrayObjectType::Pointer; /** type alias for class label type */ using ClassLabelType = IdentifierType; diff --git a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h index 10b810112e3..70d90525cf7 100644 --- a/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h +++ b/Modules/Numerics/Statistics/include/itkKdTreeBasedKmeansEstimator.h @@ -324,7 +324,7 @@ class ITK_TEMPLATE_EXPORT KdTreeBasedKmeansEstimator : public Object typename TKdTree::Pointer m_KdTree{}; /** pointer to the euclidean distance function */ - typename EuclideanDistanceMetric::Pointer m_DistanceMetric{}; + EuclideanDistanceMetric::Pointer m_DistanceMetric{}; /** k-means */ ParametersType m_Parameters{}; diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h index 2a5281e3bb3..2e41189f84b 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT MahalanobisDistanceMembershipFunction : public Members /** Method to clone a membership function, i.e. create a new instance of * the same type of membership function and configure its ivars to * match. */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; protected: diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx index 68536c75f0d..5df0726d321 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMembershipFunction.hxx @@ -169,7 +169,7 @@ MahalanobisDistanceMembershipFunction::PrintSelf(std::ostream & os, Ind } template -typename LightObject::Pointer +LightObject::Pointer MahalanobisDistanceMembershipFunction::InternalClone() const { LightObject::Pointer loPtr = Superclass::InternalClone(); diff --git a/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h b/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h index e8c6c95c954..a1d115e4998 100644 --- a/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkRegionConstrainedSubsampler.h @@ -117,7 +117,7 @@ class ITK_TEMPLATE_EXPORT RegionConstrainedSubsampler : public SubsamplerBase::RegionConstrainedSubsampler() } template -typename LightObject::Pointer +LightObject::Pointer RegionConstrainedSubsampler::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Numerics/Statistics/include/itkSample.h b/Modules/Numerics/Statistics/include/itkSample.h index 135c776d975..01cc2ba3e52 100644 --- a/Modules/Numerics/Statistics/include/itkSample.h +++ b/Modules/Numerics/Statistics/include/itkSample.h @@ -86,7 +86,7 @@ class Sample : public DataObject /** InstanceIdentifier type alias. This identifier is a unique * sequential id for each measurement vector in a Sample subclass. */ - using InstanceIdentifier = typename MeasurementVectorTraits::InstanceIdentifier; + using InstanceIdentifier = MeasurementVectorTraits::InstanceIdentifier; /** Type of the length of each measurement vector */ using MeasurementVectorSizeType = unsigned int; diff --git a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h index 88166aedc9e..a7ab510218b 100644 --- a/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h +++ b/Modules/Numerics/Statistics/include/itkSampleClassifierFilter.h @@ -78,7 +78,7 @@ class ITK_TEMPLATE_EXPORT SampleClassifierFilter : public ProcessObject using MembershipFunctionsWeightsArrayType = Array; using MembershipFunctionsWeightsArrayObjectType = SimpleDataObjectDecorator; - using MembershipFunctionsWeightsArrayPointer = typename MembershipFunctionsWeightsArrayObjectType::Pointer; + using MembershipFunctionsWeightsArrayPointer = MembershipFunctionsWeightsArrayObjectType::Pointer; using ClassLabelType = IdentifierType; using ClassLabelVectorType = std::vector; diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h index 67c969495a6..231afe298d6 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.h @@ -60,8 +60,8 @@ class ITK_TEMPLATE_EXPORT ScalarImageToHistogramGenerator : public Object using GeneratorPointer = typename GeneratorType::Pointer; - using HistogramPointer = typename HistogramType::Pointer; - using HistogramConstPointer = typename HistogramType::ConstPointer; + using HistogramPointer = HistogramType::Pointer; + using HistogramConstPointer = HistogramType::ConstPointer; public: /** Triggers the Computation of the histogram */ diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx index 2a457c057c6..e6b65a2673a 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToHistogramGenerator.hxx @@ -53,7 +53,7 @@ template void ScalarImageToHistogramGenerator::SetNumberOfBins(unsigned int numberOfBins) { - typename HistogramType::SizeType size; + HistogramType::SizeType size; size.SetSize(1); size.Fill(numberOfBins); m_HistogramGenerator->SetHistogramSize(size); diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h index d381a33bdae..d14ae521940 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.h @@ -116,10 +116,10 @@ class ITK_TEMPLATE_EXPORT ScalarImageToRunLengthFeaturesFilter : public ProcessO // using RunLengthFeatureName = itk::Statistics::RunLengthFeatureEnum; using RunLengthFeatureName = uint8_t; using FeatureNameVector = VectorContainer; - using FeatureNameVectorPointer = typename FeatureNameVector::Pointer; - using FeatureNameVectorConstPointer = typename FeatureNameVector::ConstPointer; + using FeatureNameVectorPointer = FeatureNameVector::Pointer; + using FeatureNameVectorConstPointer = FeatureNameVector::ConstPointer; using FeatureValueVector = VectorContainer; - using FeatureValueVectorPointer = typename FeatureValueVector::Pointer; + using FeatureValueVectorPointer = FeatureValueVector::Pointer; /** Smart Pointer type to a DataObject. */ using DataObjectPointer = DataObject::Pointer; diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx index 21a5348efb2..046315a07bb 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToRunLengthFeaturesFilter.hxx @@ -131,7 +131,7 @@ ScalarImageToRunLengthFeaturesFilter::Full runLengthMatrixCalculator->SetInput(this->m_RunLengthMatrixGenerator->GetOutput()); runLengthMatrixCalculator->Update(); - typename FeatureNameVector::ConstIterator fnameIt; + FeatureNameVector::ConstIterator fnameIt; { size_t featureNum = 0; for (fnameIt = this->m_RequestedFeatures->Begin(); fnameIt != this->m_RequestedFeatures->End(); @@ -221,7 +221,7 @@ ScalarImageToRunLengthFeaturesFilter::Fast using InternalRunLengthFeatureName = itk::Statistics::RunLengthFeatureEnum; this->m_FeatureMeans->clear(); this->m_FeatureStandardDeviations->clear(); - for (typename FeatureNameVector::ConstIterator fnameIt = this->m_RequestedFeatures->Begin(); + for (FeatureNameVector::ConstIterator fnameIt = this->m_RequestedFeatures->Begin(); fnameIt != this->m_RequestedFeatures->End(); ++fnameIt) { diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h index 5497bd981d8..52283371ff3 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h +++ b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.h @@ -133,10 +133,10 @@ class ITK_TEMPLATE_EXPORT ScalarImageToTextureFeaturesFilter : public ProcessObj using TextureFeatureName = uint8_t; using FeatureNameVector = VectorContainer; - using FeatureNameVectorPointer = typename FeatureNameVector::Pointer; - using FeatureNameVectorConstPointer = typename FeatureNameVector::ConstPointer; + using FeatureNameVectorPointer = FeatureNameVector::Pointer; + using FeatureNameVectorConstPointer = FeatureNameVector::ConstPointer; using FeatureValueVector = VectorContainer; - using FeatureValueVectorPointer = typename FeatureValueVector::Pointer; + using FeatureValueVectorPointer = FeatureValueVector::Pointer; /** Smart Pointer type to a DataObject. */ using DataObjectPointer = DataObject::Pointer; diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx index b815835a23b..8129bd6b600 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToTextureFeaturesFilter.hxx @@ -128,8 +128,7 @@ ScalarImageToTextureFeaturesFilterBegin(); - fnameIt != m_RequestedFeatures->End(); + for (FeatureNameVector::ConstIterator fnameIt = m_RequestedFeatures->Begin(); fnameIt != m_RequestedFeatures->End(); ++fnameIt, featureNum++) { features[offsetNum][featureNum] = @@ -213,7 +212,7 @@ ScalarImageToTextureFeaturesFilterclear(); m_FeatureStandardDeviations->clear(); - typename FeatureNameVector::ConstIterator fnameIt; + FeatureNameVector::ConstIterator fnameIt; for (fnameIt = m_RequestedFeatures->Begin(); fnameIt != m_RequestedFeatures->End(); ++fnameIt) { m_FeatureMeans->push_back( diff --git a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h index a5e1f20654a..9d425892dd2 100644 --- a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.h @@ -113,7 +113,7 @@ class ITK_TEMPLATE_EXPORT SpatialNeighborSubsampler : public RegionConstrainedSu * This does a complete copy of the subsampler state * to the new subsampler */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; SpatialNeighborSubsampler(); diff --git a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx index bc205412367..2dcb156d8fc 100644 --- a/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkSpatialNeighborSubsampler.hxx @@ -30,10 +30,10 @@ SpatialNeighborSubsampler::SpatialNeighborSubsampler() } template -typename LightObject::Pointer +LightObject::Pointer SpatialNeighborSubsampler::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h index d1c1e569c83..ab503d5ae80 100644 --- a/Modules/Numerics/Statistics/include/itkSubsamplerBase.h +++ b/Modules/Numerics/Statistics/include/itkSubsamplerBase.h @@ -123,7 +123,7 @@ class ITK_TEMPLATE_EXPORT SubsamplerBase : public Object * This does a complete copy of the subsampler state * to the new subsampler */ - typename LightObject::Pointer + LightObject::Pointer InternalClone() const override; SubsamplerBase(); diff --git a/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx b/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx index 7f3b03d2ea9..a74c862a74c 100644 --- a/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx +++ b/Modules/Numerics/Statistics/include/itkSubsamplerBase.hxx @@ -29,10 +29,10 @@ SubsamplerBase::SubsamplerBase() {} template -typename LightObject::Pointer +LightObject::Pointer SubsamplerBase::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h index 3d417db3428..13cf22a946d 100644 --- a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h +++ b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.h @@ -140,7 +140,7 @@ class ITK_TEMPLATE_EXPORT UniformRandomSpatialNeighborSubsampler : public Spatia * This does a complete copy of the subsampler state * to the new subsampler */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; UniformRandomSpatialNeighborSubsampler(); diff --git a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx index 7a1851f2939..bd7d71fde0e 100644 --- a/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx +++ b/Modules/Numerics/Statistics/include/itkUniformRandomSpatialNeighborSubsampler.hxx @@ -31,10 +31,10 @@ UniformRandomSpatialNeighborSubsampler::UniformRandomSpatialNe } template -typename LightObject::Pointer +LightObject::Pointer UniformRandomSpatialNeighborSubsampler::InternalClone() const { - typename LightObject::Pointer loPtr = Superclass::InternalClone(); + LightObject::Pointer loPtr = Superclass::InternalClone(); const typename Self::Pointer rval = dynamic_cast(loPtr.GetPointer()); if (rval.IsNull()) diff --git a/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx b/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx index 6e7c83d47e3..9732ca2c5ca 100644 --- a/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx +++ b/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx @@ -83,7 +83,7 @@ itkUniformRandomSpatialNeighborSubsamplerTest(int argc, char * argv[]) query = std::pow(regionSizeVal, Dimension); samplerOrig->Search(query, subsample); - typename SamplerType::SubsampleType::TotalAbsoluteFrequencyType expectedTotalFrequency = 0; + SamplerType::SubsampleType::TotalAbsoluteFrequencyType expectedTotalFrequency = 0; ITK_TEST_EXPECT_EQUAL(expectedTotalFrequency, subsample->GetTotalFrequency()); size_t expectedIdHolderSize = 0; ITK_TEST_EXPECT_EQUAL(expectedIdHolderSize, subsample->GetIdHolder().size()); diff --git a/Modules/Registration/Common/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx b/Modules/Registration/Common/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx index 0f7a6f82528..9ecbc2cd081 100644 --- a/Modules/Registration/Common/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx +++ b/Modules/Registration/Common/include/itkBSplineSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx @@ -127,11 +127,10 @@ BSplineSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor: os << indent << "NumberOfControlPointsForTheUpdateField: " << m_NumberOfControlPointsForTheUpdateField << std::endl; os << indent << "NumberOfControlPointsForTheTotalField: " << m_NumberOfControlPointsForTheTotalField << std::endl; os << indent << "NumberOfControlPointsForTheUpdateFieldSetTime: " - << static_cast::PrintType>( - m_NumberOfControlPointsForTheUpdateFieldSetTime) + << static_cast::PrintType>(m_NumberOfControlPointsForTheUpdateFieldSetTime) << std::endl; os << indent << "NumberOfControlPointsForTheTotalFieldSetTime: " - << static_cast::PrintType>(m_NumberOfControlPointsForTheTotalFieldSetTime) + << static_cast::PrintType>(m_NumberOfControlPointsForTheTotalFieldSetTime) << std::endl; } diff --git a/Modules/Registration/Common/include/itkBlockMatchingImageFilter.hxx b/Modules/Registration/Common/include/itkBlockMatchingImageFilter.hxx index da9fcd7a0b1..b41062d9224 100644 --- a/Modules/Registration/Common/include/itkBlockMatchingImageFilter.hxx +++ b/Modules/Registration/Common/include/itkBlockMatchingImageFilter.hxx @@ -64,8 +64,7 @@ BlockMatchingImageFilter::PrintType>(m_SearchRadius) << std::endl; - os << indent << "PointsCount: " << static_cast::PrintType>(m_PointsCount) - << std::endl; + os << indent << "PointsCount: " << static_cast::PrintType>(m_PointsCount) << std::endl; os << indent << "DisplacementsVectorsArray: "; if (m_DisplacementsVectorsArray != nullptr) diff --git a/Modules/Registration/Common/include/itkGaussianExponentialDiffeomorphicTransformParametersAdaptor.hxx b/Modules/Registration/Common/include/itkGaussianExponentialDiffeomorphicTransformParametersAdaptor.hxx index 4464702ec90..916a0b9327c 100644 --- a/Modules/Registration/Common/include/itkGaussianExponentialDiffeomorphicTransformParametersAdaptor.hxx +++ b/Modules/Registration/Common/include/itkGaussianExponentialDiffeomorphicTransformParametersAdaptor.hxx @@ -91,12 +91,11 @@ GaussianExponentialDiffeomorphicTransformParametersAdaptor::PrintSel << static_cast::PrintType>(m_GaussianSmoothingVarianceForTheUpdateField) << std::endl; os << indent << "GaussianSmoothingVarianceForTheConstantVelocityFieldSetTime: " - << static_cast::PrintType>( + << static_cast::PrintType>( m_GaussianSmoothingVarianceForTheConstantVelocityFieldSetTime) << std::endl; os << indent << "GaussianSmoothingVarianceForTheUpdateFieldSetTime: " - << static_cast::PrintType>( - m_GaussianSmoothingVarianceForTheUpdateFieldSetTime) + << static_cast::PrintType>(m_GaussianSmoothingVarianceForTheUpdateFieldSetTime) << std::endl; } diff --git a/Modules/Registration/Common/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx b/Modules/Registration/Common/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx index 1bcc251159a..e95b7dbf629 100644 --- a/Modules/Registration/Common/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx +++ b/Modules/Registration/Common/include/itkGaussianSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor.hxx @@ -89,12 +89,10 @@ GaussianSmoothingOnUpdateDisplacementFieldTransformParametersAdaptor << std::endl; os << indent << "GaussianSmoothingVarianceForTheUpdateFieldSetTime: " - << static_cast::PrintType>( - m_GaussianSmoothingVarianceForTheUpdateFieldSetTime) + << static_cast::PrintType>(m_GaussianSmoothingVarianceForTheUpdateFieldSetTime) << std::endl; os << indent << "GaussianSmoothingVarianceForTheTotalFieldSetTime: " - << static_cast::PrintType>( - m_GaussianSmoothingVarianceForTheTotalFieldSetTime) + << static_cast::PrintType>(m_GaussianSmoothingVarianceForTheTotalFieldSetTime) << std::endl; } diff --git a/Modules/Registration/Common/include/itkHistogramImageToImageMetric.h b/Modules/Registration/Common/include/itkHistogramImageToImageMetric.h index d4426cf3427..c78f3dfea2f 100644 --- a/Modules/Registration/Common/include/itkHistogramImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkHistogramImageToImageMetric.h @@ -73,9 +73,9 @@ class ITK_TEMPLATE_EXPORT HistogramImageToImageMetric : public ImageToImageMetri error with such declaration. */ using HistogramType = Statistics::Histogram; - using MeasurementVectorType = typename HistogramType::MeasurementVectorType; - using HistogramSizeType = typename HistogramType::SizeType; - using HistogramPointer = typename HistogramType::Pointer; + using MeasurementVectorType = HistogramType::MeasurementVectorType; + using HistogramSizeType = HistogramType::SizeType; + using HistogramPointer = HistogramType::Pointer; /** Initializes the metric. */ void diff --git a/Modules/Registration/Common/include/itkHistogramImageToImageMetric.hxx b/Modules/Registration/Common/include/itkHistogramImageToImageMetric.hxx index 59b761378c8..00296a30618 100644 --- a/Modules/Registration/Common/include/itkHistogramImageToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkHistogramImageToImageMetric.hxx @@ -250,7 +250,7 @@ HistogramImageToImageMetric::ComputeHistogram(const T typename FixedImageType::IndexType index; typename FixedImageType::RegionType fixedRegion; - typename HistogramType::IndexType hIndex; + HistogramType::IndexType hIndex; fixedRegion = this->GetFixedImageRegion(); FixedIteratorType ti(fixedImage, fixedRegion); @@ -290,7 +290,7 @@ HistogramImageToImageMetric::ComputeHistogram(const T const RealType fixedValue = ti.Get(); this->m_NumberOfPixelsCounted++; - typename HistogramType::MeasurementVectorType sample; + HistogramType::MeasurementVectorType sample; sample.SetSize(2); sample[0] = fixedValue; sample[1] = movingValue; @@ -316,13 +316,13 @@ HistogramImageToImageMetric::CopyHistogram(HistogramT HistogramType & source) const { // Initialize the target. - typename HistogramType::MeasurementVectorType min; - typename HistogramType::MeasurementVectorType max; + HistogramType::MeasurementVectorType min; + HistogramType::MeasurementVectorType max; min.SetSize(2); max.SetSize(2); - typename HistogramType::SizeType size = source.GetSize(); + HistogramType::SizeType size = source.GetSize(); for (unsigned int i = 0; i < min.Size(); ++i) { @@ -337,9 +337,9 @@ HistogramImageToImageMetric::CopyHistogram(HistogramT target.Initialize(size, min, max); // Copy the values. - typename HistogramType::Iterator sourceIt = source.Begin(); + HistogramType::Iterator sourceIt = source.Begin(); const typename HistogramType::Iterator sourceEnd = source.End(); - typename HistogramType::Iterator targetIt = target.Begin(); + HistogramType::Iterator targetIt = target.Begin(); const typename HistogramType::Iterator targetEnd = target.End(); while (sourceIt != sourceEnd && targetIt != targetEnd) diff --git a/Modules/Registration/Common/include/itkImageRegistrationMethod.h b/Modules/Registration/Common/include/itkImageRegistrationMethod.h index 565952510f9..c7e4dd7c30b 100644 --- a/Modules/Registration/Common/include/itkImageRegistrationMethod.h +++ b/Modules/Registration/Common/include/itkImageRegistrationMethod.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT ImageRegistrationMethod : public ProcessObject using ParametersType = typename MetricType::TransformParametersType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Set/Get the Fixed image. */ /** @ITKStartGrouping */ diff --git a/Modules/Registration/Common/include/itkImageToImageMetric.h b/Modules/Registration/Common/include/itkImageToImageMetric.h index e7cb4205395..7536b3be3f6 100644 --- a/Modules/Registration/Common/include/itkImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkImageToImageMetric.h @@ -63,7 +63,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetric : public SingleValuedCostFunction using ConstPointer = SmartPointer; /** Type used for representing point components */ - using CoordinateRepresentationType = typename Superclass::ParametersValueType; + using CoordinateRepresentationType = Superclass::ParametersValueType; /** \see LightObject::GetNameOfClass() */ itkOverrideGetNameOfClassMacro(ImageToImageMetric); diff --git a/Modules/Registration/Common/include/itkImageToImageMetric.hxx b/Modules/Registration/Common/include/itkImageToImageMetric.hxx index 84546dec784..ed2e177ba6f 100644 --- a/Modules/Registration/Common/include/itkImageToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkImageToImageMetric.hxx @@ -1219,13 +1219,13 @@ ImageToImageMetric::PrintSelf(std::ostream & os, Inde << static_cast::PrintType>(m_FixedImageSamplesIntensityThreshold) << std::endl; os << indent << "FixedImageSamples: " << m_FixedImageSamples << std::endl; - os << indent - << "NumberOfParameters: " << static_cast::PrintType>(m_NumberOfParameters) + os << indent << "NumberOfParameters: " << static_cast::PrintType>(m_NumberOfParameters) << std::endl; os << indent << "NumberOfFixedImageSamples: " - << static_cast::PrintType>(m_NumberOfFixedImageSamples) << std::endl; - os << indent << "NumberOfPixelsCounted: " - << static_cast::PrintType>(m_NumberOfPixelsCounted) << std::endl; + << static_cast::PrintType>(m_NumberOfFixedImageSamples) << std::endl; + os << indent + << "NumberOfPixelsCounted: " << static_cast::PrintType>(m_NumberOfPixelsCounted) + << std::endl; itkPrintSelfObjectMacro(MovingImage); itkPrintSelfObjectMacro(FixedImage); @@ -1249,8 +1249,7 @@ ImageToImageMetric::PrintSelf(std::ostream & os, Inde itkPrintSelfObjectMacro(MovingImageMask); itkPrintSelfObjectMacro(FixedImageMask); - os << indent - << "NumberOfWorkUnits: " << static_cast::PrintType>(m_NumberOfWorkUnits) + os << indent << "NumberOfWorkUnits: " << static_cast::PrintType>(m_NumberOfWorkUnits) << std::endl; itkPrintSelfBooleanMacro(UseAllPixels); itkPrintSelfBooleanMacro(UseSequentialSampling); @@ -1261,8 +1260,7 @@ ImageToImageMetric::PrintSelf(std::ostream & os, Inde itkPrintSelfBooleanMacro(TransformIsBSpline); #endif - os << indent - << "NumBSplineWeights: " << static_cast::PrintType>(m_NumBSplineWeights) + os << indent << "NumBSplineWeights: " << static_cast::PrintType>(m_NumBSplineWeights) << std::endl; itkPrintSelfObjectMacro(BSplineTransform); diff --git a/Modules/Registration/Common/include/itkImageToSpatialObjectMetric.hxx b/Modules/Registration/Common/include/itkImageToSpatialObjectMetric.hxx index d0960a5cacf..21af4ab86a4 100644 --- a/Modules/Registration/Common/include/itkImageToSpatialObjectMetric.hxx +++ b/Modules/Registration/Common/include/itkImageToSpatialObjectMetric.hxx @@ -82,8 +82,7 @@ ImageToSpatialObjectMetric::PrintSelf(std::os Superclass::PrintSelf(os, indent); - os << indent << "MatchMeasure: " << static_cast::PrintType>(m_MatchMeasure) - << std::endl; + os << indent << "MatchMeasure: " << static_cast::PrintType>(m_MatchMeasure) << std::endl; os << indent << "MatchMeasureDerivatives: " << m_MatchMeasureDerivatives << std::endl; itkPrintSelfObjectMacro(Transform); diff --git a/Modules/Registration/Common/include/itkImageToSpatialObjectRegistrationMethod.h b/Modules/Registration/Common/include/itkImageToSpatialObjectRegistrationMethod.h index 8cd4e198855..890b77fccc0 100644 --- a/Modules/Registration/Common/include/itkImageToSpatialObjectRegistrationMethod.h +++ b/Modules/Registration/Common/include/itkImageToSpatialObjectRegistrationMethod.h @@ -132,7 +132,7 @@ class ITK_TEMPLATE_EXPORT ImageToSpatialObjectRegistrationMethod : public Proces using ParametersType = typename MetricType::TransformParametersType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Set/Get the Fixed image. */ /** @ITKStartGrouping */ diff --git a/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.hxx b/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.hxx index e94f9921c9f..d2bb967d05f 100644 --- a/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkKappaStatisticImageToImageMetric.hxx @@ -185,10 +185,10 @@ KappaStatisticImageToImageMetric::GetDerivative(const using ArrayType = Array; ArrayType sum1(ParametersDimension); - sum1.Fill(typename ArrayType::ValueType{}); + sum1.Fill(ArrayType::ValueType{}); ArrayType sum2(ParametersDimension); - sum2.Fill(typename ArrayType::ValueType{}); + sum2.Fill(ArrayType::ValueType{}); int fixedArea = 0; int movingArea = 0; diff --git a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h index fc6813e62d2..221c3998eec 100644 --- a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.h @@ -340,8 +340,8 @@ class ITK_TEMPLATE_EXPORT MattesMutualInformationImageToImageMetric DerivativeType MetricDerivative; /** The joint PDF and PDF derivatives. */ - typename JointPDFType::Pointer JointPDF; - typename JointPDFDerivativesType::Pointer JointPDFDerivatives; + JointPDFType::Pointer JointPDF; + JointPDFDerivativesType::Pointer JointPDFDerivatives; typename TransformType::JacobianType Jacobian; diff --git a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.hxx b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.hxx index 7d0bda3acab..ff42a8cc66d 100644 --- a/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkMattesMutualInformationImageToImageMetric.hxx @@ -235,10 +235,10 @@ MattesMutualInformationImageToImageMetric::Initialize // By setting these values, the joint histogram physical locations will // correspond to intensity values. - typename JointPDFType::PointType origin; + JointPDFType::PointType origin; origin[0] = this->m_FixedImageTrueMin; origin[1] = this->m_MovingImageTrueMin; - typename JointPDFType::SpacingType spacing; + JointPDFType::SpacingType spacing; spacing[0] = this->m_FixedImageBinSize; spacing[1] = this->m_MovingImageBinSize; /** diff --git a/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx b/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx index 17fff8c080d..45d6fc155b5 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx +++ b/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx @@ -281,10 +281,9 @@ MultiResolutionImageRegistrationMethod::PrintSelf(std os << indent << "FixedImageRegion: " << m_FixedImageRegion << std::endl; os << indent << "FixedImageRegionPyramid: " << m_FixedImageRegionPyramid << std::endl; - os << indent << "NumberOfLevels: " << static_cast::PrintType>(m_NumberOfLevels) - << std::endl; - os << indent << "CurrentLevel: " << static_cast::PrintType>(m_CurrentLevel) + os << indent << "NumberOfLevels: " << static_cast::PrintType>(m_NumberOfLevels) << std::endl; + os << indent << "CurrentLevel: " << static_cast::PrintType>(m_CurrentLevel) << std::endl; itkPrintSelfBooleanMacro(Stop); diff --git a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx index 793f4fab912..4b92d416bfe 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx +++ b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx @@ -293,7 +293,7 @@ MultiResolutionPyramidImageFilter::PrintSelf(std::ost os << indent << "MaximumError: " << m_MaximumError << std::endl; os << indent << "NumberOfLevels: " << m_NumberOfLevels << std::endl; - os << indent << "Schedule: " << static_cast::PrintType>(m_Schedule) << std::endl; + os << indent << "Schedule: " << static_cast::PrintType>(m_Schedule) << std::endl; itkPrintSelfBooleanMacro(UseShrinkImageFilter); } diff --git a/Modules/Registration/Common/include/itkMutualInformationImageToImageMetric.h b/Modules/Registration/Common/include/itkMutualInformationImageToImageMetric.h index bd13166d9b2..25ac8e4ada3 100644 --- a/Modules/Registration/Common/include/itkMutualInformationImageToImageMetric.h +++ b/Modules/Registration/Common/include/itkMutualInformationImageToImageMetric.h @@ -224,7 +224,7 @@ class ITK_TEMPLATE_EXPORT MutualInformationImageToImageMetric : public ImageToIm double m_FixedImageStandardDeviation{}; double m_MinProbability{}; - typename KernelFunctionType::Pointer m_KernelFunction{}; + KernelFunctionType::Pointer m_KernelFunction{}; /** Uniformly select samples from the fixed image buffer. * diff --git a/Modules/Registration/Common/include/itkPointSetToImageMetric.hxx b/Modules/Registration/Common/include/itkPointSetToImageMetric.hxx index fc8c52bceb7..dd1839e8b40 100644 --- a/Modules/Registration/Common/include/itkPointSetToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkPointSetToImageMetric.hxx @@ -108,8 +108,9 @@ PointSetToImageMetric::PrintSelf(std::ostream & os { Superclass::PrintSelf(os, indent); - os << indent << "NumberOfPixelsCounted: " - << static_cast::PrintType>(m_NumberOfPixelsCounted) << std::endl; + os << indent + << "NumberOfPixelsCounted: " << static_cast::PrintType>(m_NumberOfPixelsCounted) + << std::endl; itkPrintSelfObjectMacro(FixedPointSet); itkPrintSelfObjectMacro(MovingImage); diff --git a/Modules/Registration/Common/include/itkPointSetToImageRegistrationMethod.h b/Modules/Registration/Common/include/itkPointSetToImageRegistrationMethod.h index 29b73578f32..b6e546b23e7 100644 --- a/Modules/Registration/Common/include/itkPointSetToImageRegistrationMethod.h +++ b/Modules/Registration/Common/include/itkPointSetToImageRegistrationMethod.h @@ -115,7 +115,7 @@ class ITK_TEMPLATE_EXPORT PointSetToImageRegistrationMethod : public ProcessObje using ParametersType = typename MetricType::TransformParametersType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Set/Get the Fixed image. */ /** @ITKStartGrouping */ diff --git a/Modules/Registration/Common/include/itkPointSetToPointSetRegistrationMethod.h b/Modules/Registration/Common/include/itkPointSetToPointSetRegistrationMethod.h index c15ad5cb7b0..acc99e46820 100644 --- a/Modules/Registration/Common/include/itkPointSetToPointSetRegistrationMethod.h +++ b/Modules/Registration/Common/include/itkPointSetToPointSetRegistrationMethod.h @@ -110,7 +110,7 @@ class ITK_TEMPLATE_EXPORT PointSetToPointSetRegistrationMethod : public ProcessO using ParametersType = typename MetricType::TransformParametersType; /** Smart Pointer type to a DataObject. */ - using DataObjectPointer = typename DataObject::Pointer; + using DataObjectPointer = DataObject::Pointer; /** Set/Get the Fixed PointSet. */ /** @ITKStartGrouping */ diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx index e1d3b706aae..5641abc3de2 100644 --- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx @@ -97,7 +97,7 @@ GPUDemonsRegistrationFunction::Pr { Superclass::PrintSelf(os, indent); - os << indent << "ZeroUpdateReturn: " << static_cast::PrintType>(m_ZeroUpdateReturn) + os << indent << "ZeroUpdateReturn: " << static_cast::PrintType>(m_ZeroUpdateReturn) << std::endl; os << indent << "Normalizer: " << m_Normalizer << std::endl; @@ -108,15 +108,16 @@ GPUDemonsRegistrationFunction::Pr itkPrintSelfObjectMacro(MovingImageInterpolator); - os << indent << "TimeStep: " << static_cast::PrintType>(m_TimeStep) << std::endl; + os << indent << "TimeStep: " << static_cast::PrintType>(m_TimeStep) << std::endl; os << indent << "DenominatorThreshold: " << m_DenominatorThreshold << std::endl; os << indent << "IntensityDifferenceThreshold: " << m_IntensityDifferenceThreshold << std::endl; os << indent << "Metric: " << m_Metric << std::endl; os << indent << "SumOfSquaredDifference: " << m_SumOfSquaredDifference << std::endl; - os << indent << "NumberOfPixelsProcessed: " - << static_cast::PrintType>(m_NumberOfPixelsProcessed) << std::endl; + os << indent + << "NumberOfPixelsProcessed: " << static_cast::PrintType>(m_NumberOfPixelsProcessed) + << std::endl; os << indent << "RMSChange: " << m_RMSChange << std::endl; os << indent << "SumOfSquaredChange: " << m_SumOfSquaredChange << std::endl; diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.hxx b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.hxx index 3da9ac087ad..3561cd95ba6 100644 --- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.hxx +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.hxx @@ -311,9 +311,9 @@ GPUPDEDeformableRegistrationFilter void GPUPDEDeformableRegistrationFilter:: - GPUSmoothVectorField(DisplacementFieldPointer field, - typename GPUDataManager::Pointer GPUSmoothingKernels[], - int GPUSmoothingKernelSizes[]) + GPUSmoothVectorField(DisplacementFieldPointer field, + GPUDataManager::Pointer GPUSmoothingKernels[], + int GPUSmoothingKernelSizes[]) { using GPUBufferImage = typename itk::GPUTraits::Type; using GPUOutputImage = typename itk::GPUTraits::Type; diff --git a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.h b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.h index d2b6268309e..dd01d2eb68f 100644 --- a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.h @@ -109,7 +109,7 @@ class ITK_TEMPLATE_EXPORT ExpectationBasedPointSetToPointSetMetricv4 /** Clone method will clone the existing instance of this type, * including its internal member variables. */ - [[nodiscard]] typename LightObject::Pointer + [[nodiscard]] LightObject::Pointer InternalClone() const override; protected: diff --git a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx index cc54eeba936..788ea910c84 100644 --- a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx @@ -123,7 +123,7 @@ ExpectationBasedPointSetToPointSetMetricv4 -typename LightObject::Pointer +LightObject::Pointer ExpectationBasedPointSetToPointSetMetricv4:: InternalClone() const { diff --git a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.h b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.h index 4d63d969ed2..0e1731a3557 100644 --- a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.h +++ b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.h @@ -210,7 +210,7 @@ class ITK_TEMPLATE_EXPORT JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4 /** Clone method will clone the existing instance of this type, * including its internal member variables. */ - typename LightObject::Pointer + LightObject::Pointer InternalClone() const override; protected: diff --git a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx index ff10a850803..471d3b73204 100644 --- a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx @@ -175,7 +175,7 @@ JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4 -typename LightObject::Pointer +LightObject::Pointer JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4::InternalClone() const { auto rval = Self::New(); diff --git a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.h b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.h index 732256460f4..3bb56a42c68 100644 --- a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.h +++ b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.h @@ -87,8 +87,8 @@ class ITK_TEMPLATE_EXPORT JointHistogramMutualInformationComputeJointPDFThreader // TODO: This needs updating struct JointHistogramMIPerThreadStruct { - typename JointHistogramType::Pointer JointHistogram; - SizeValueType JointHistogramCount; + JointHistogramType::Pointer JointHistogram; + SizeValueType JointHistogramCount; }; itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, JointHistogramMIPerThreadStruct, PaddedJointHistogramMIPerThreadStruct); itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT, diff --git a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.hxx b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.hxx index 12d16b00732..c4126544cdb 100644 --- a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.hxx +++ b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationComputeJointPDFThreaderBase.hxx @@ -84,7 +84,7 @@ JointHistogramMutualInformationComputeJointPDFThreaderBasem_JointHistogramMIPerThreadVariables[threadId].JointHistogram->GetBufferedRegion().IsInside( jointPDFIndex)) { - typename JointHistogramType::PixelType jointHistogramPixel = + JointHistogramType::PixelType jointHistogramPixel = this->m_JointHistogramMIPerThreadVariables[threadId].JointHistogram->GetPixel(jointPDFIndex); ++jointHistogramPixel; this->m_JointHistogramMIPerThreadVariables[threadId].JointHistogram->SetPixel(jointPDFIndex, @@ -111,7 +111,7 @@ JointHistogramMutualInformationComputeJointPDFThreaderBaseGetNumberOfWorkUnitsUsed(); - using JointHistogramPixelType = typename JointHistogramType::PixelType; + using JointHistogramPixelType = JointHistogramType::PixelType; this->m_Associate->m_JointHistogramTotalCount = SizeValueType{}; for (ThreadIdType i = 0; i < numberOfWorkUnitsUsed; ++i) { diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx index 441036ba632..78dcca499e4 100644 --- a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx @@ -659,9 +659,9 @@ PointSetToPointSetMetricWithIndexv4::PrintType>(m_MovingTransformedPointSetTime) << std::endl; + << static_cast::PrintType>(m_MovingTransformedPointSetTime) << std::endl; os << indent << "FixedTransformedPointSetTime: " - << static_cast::PrintType>(m_FixedTransformedPointSetTime) << std::endl; + << static_cast::PrintType>(m_FixedTransformedPointSetTime) << std::endl; } } // end namespace itk diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx index 581330a53e1..2205813527f 100644 --- a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx @@ -669,7 +669,7 @@ itkImageToImageMetricv4Test(int, char ** const) << std::endl; std::cout << "MetricCategory: " << metric->GetMetricCategory() << std::endl; - typename ImageToImageMetricv4TestMetricType::DerivativeType derivative{}; + ImageToImageMetricv4TestMetricType::DerivativeType derivative{}; metric->GetDerivative(derivative); std::cout << "Derivative: " << derivative << std::endl; diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx index f87ed9df311..b38e9b4e197 100644 --- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx @@ -81,8 +81,9 @@ FastSymmetricForcesDemonsRegistrationFunction::PrintType>(m_NumberOfPixelsProcessed) << std::endl; + os << indent + << "NumberOfPixelsProcessed: " << static_cast::PrintType>(m_NumberOfPixelsProcessed) + << std::endl; os << indent << "RMSChange: " << m_RMSChange << std::endl; os << indent << "SumOfSquaredChange: " << m_SumOfSquaredChange << std::endl; } diff --git a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.hxx index 1a7d8af5684..8571b33aa68 100644 --- a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.hxx @@ -84,8 +84,9 @@ LevelSetMotionRegistrationFunction::PrintType>(m_NumberOfPixelsProcessed) << std::endl; + os << indent + << "NumberOfPixelsProcessed: " << static_cast::PrintType>(m_NumberOfPixelsProcessed) + << std::endl; os << indent << "RMSChange: " << m_RMSChange << std::endl; os << indent << "SumOfSquaredChange: " << m_SumOfSquaredChange << std::endl; diff --git a/Modules/Registration/PDEDeformable/include/itkMultiResolutionPDEDeformableRegistration.hxx b/Modules/Registration/PDEDeformable/include/itkMultiResolutionPDEDeformableRegistration.hxx index 3f99b5d4f89..103b3e68fd8 100644 --- a/Modules/Registration/PDEDeformable/include/itkMultiResolutionPDEDeformableRegistration.hxx +++ b/Modules/Registration/PDEDeformable/include/itkMultiResolutionPDEDeformableRegistration.hxx @@ -170,7 +170,7 @@ MultiResolutionPDEDeformableRegistration::GetNumberOfValidRequiredInputs() const { - typename std::vector>::size_type num = 0; + std::vector>::size_type num = 0; if (this->GetFixedImage()) { @@ -576,7 +576,7 @@ MultiResolutionPDEDeformableRegistration::GenerateOutputInformation() { - typename DataObject::Pointer output; + DataObject::Pointer output; if (this->GetInput(0)) { diff --git a/Modules/Registration/PDEDeformable/include/itkPDEDeformableRegistrationFilter.hxx b/Modules/Registration/PDEDeformable/include/itkPDEDeformableRegistrationFilter.hxx index 51a9fc236df..2b780ff5bfc 100644 --- a/Modules/Registration/PDEDeformable/include/itkPDEDeformableRegistrationFilter.hxx +++ b/Modules/Registration/PDEDeformable/include/itkPDEDeformableRegistrationFilter.hxx @@ -65,7 +65,7 @@ template >::size_type PDEDeformableRegistrationFilter::GetNumberOfValidRequiredInputs() const { - typename std::vector>::size_type num = 0; + std::vector>::size_type num = 0; if (this->GetFixedImage()) { @@ -184,7 +184,7 @@ template ::GenerateOutputInformation() { - typename DataObject::Pointer output; + DataObject::Pointer output; if (this->GetInput(0)) { diff --git a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.hxx index 21a683bd6cd..1f75acd0632 100644 --- a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.hxx @@ -70,8 +70,9 @@ SymmetricForcesDemonsRegistrationFunction::PrintType>(m_NumberOfPixelsProcessed) << std::endl; + os << indent + << "NumberOfPixelsProcessed: " << static_cast::PrintType>(m_NumberOfPixelsProcessed) + << std::endl; os << indent << "RMSChange: " << m_RMSChange << std::endl; os << indent << "SumOfSquaredChange: " << m_SumOfSquaredChange << std::endl; } diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx index d77a97de3ad..158d9e5d366 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx @@ -1117,12 +1117,10 @@ ImageRegistrationMethodv4::PrintType>(m_CurrentLevel) + os << indent << "CurrentLevel: " << static_cast::PrintType>(m_CurrentLevel) << std::endl; + os << indent << "NumberOfLevels: " << static_cast::PrintType>(m_NumberOfLevels) << std::endl; - os << indent << "NumberOfLevels: " << static_cast::PrintType>(m_NumberOfLevels) - << std::endl; - os << indent - << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) + os << indent << "CurrentIteration: " << static_cast::PrintType>(m_CurrentIteration) << std::endl; os << indent << "CurrentMetricValue: " << static_cast::PrintType>(m_CurrentMetricValue) @@ -1141,10 +1139,12 @@ ImageRegistrationMethodv4::PrintType>(m_NumberOfFixedObjects) << std::endl; - os << indent << "NumberOfMovingObjects: " - << static_cast::PrintType>(m_NumberOfMovingObjects) << std::endl; + os << indent + << "NumberOfFixedObjects: " << static_cast::PrintType>(m_NumberOfFixedObjects) + << std::endl; + os << indent + << "NumberOfMovingObjects: " << static_cast::PrintType>(m_NumberOfMovingObjects) + << std::endl; itkPrintSelfObjectMacro(Optimizer); @@ -1157,8 +1157,7 @@ ImageRegistrationMethodv4::PrintType>(m_NumberOfMetrics) + os << indent << "NumberOfMetrics: " << static_cast::PrintType>(m_NumberOfMetrics) << std::endl; os << indent << "FirstImageMetricIndex: " << m_FirstImageMetricIndex << std::endl; os << indent << "ShrinkFactorsPerLevel: " << m_ShrinkFactorsPerLevel << std::endl; diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx index ba3cd65c0ef..c59e565da26 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx @@ -871,8 +871,9 @@ TimeVaryingBSplineVelocityFieldImageRegistrationMethod::PrintType>(m_NumberOfTimePointSamples) << std::endl; + os << indent + << "NumberOfTimePointSamples: " << static_cast::PrintType>(m_NumberOfTimePointSamples) + << std::endl; os << indent << "BoundaryWeight: " << m_BoundaryWeight << std::endl; } diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx index 1b83ece20fb..483d1225b6c 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx @@ -342,8 +342,8 @@ BayesianClassifierImageFilter::PrintSelf(std::ostr os << indent << "OutputDistortion: " << m_OutputDistortion << std::endl; os << indent << "OutputNumberOfEmptyCells: " << m_OutputNumberOfEmptyCells << std::endl; - os << indent - << "VectorDimension: " << static_cast::PrintType>(m_VectorDimension) + os << indent << "VectorDimension: " << static_cast::PrintType>(m_VectorDimension) + << std::endl; + os << indent << "NumberOfCodewords: " << static_cast::PrintType>(m_NumberOfCodewords) << std::endl; os << indent - << "NumberOfCodewords: " << static_cast::PrintType>(m_NumberOfCodewords) + << "CurrentNumberOfCodewords: " << static_cast::PrintType>(m_CurrentNumberOfCodewords) << std::endl; - os << indent << "CurrentNumberOfCodewords: " - << static_cast::PrintType>(m_CurrentNumberOfCodewords) << std::endl; os << indent << "CodewordHistogram: " << m_CodewordHistogram << std::endl; os << indent << "CodewordDistortion: " << m_CodewordDistortion << std::endl; diff --git a/Modules/Segmentation/Classifiers/test/itkScalarImageKmeansImageFilterTest.cxx b/Modules/Segmentation/Classifiers/test/itkScalarImageKmeansImageFilterTest.cxx index d0c0402a7f3..0b526d35e98 100644 --- a/Modules/Segmentation/Classifiers/test/itkScalarImageKmeansImageFilterTest.cxx +++ b/Modules/Segmentation/Classifiers/test/itkScalarImageKmeansImageFilterTest.cxx @@ -62,7 +62,7 @@ itkScalarImageKmeansImageFilterTest(int argc, char * argv[]) constexpr typename KMeansFilterType::ImageRegionType::IndexType index = { { 50, 50 } }; constexpr typename KMeansFilterType::ImageRegionType::SizeType size = { { 80, 100 } }; - typename KMeansFilterType::ImageRegionType region = { index, size }; + KMeansFilterType::ImageRegionType region = { index, size }; kmeansFilter->SetImageRegion(region); ITK_TEST_SET_GET_VALUE(region, kmeansFilter->GetImageRegion()); diff --git a/Modules/Segmentation/ConnectedComponents/include/itkThresholdMaximumConnectedComponentsImageFilter.hxx b/Modules/Segmentation/ConnectedComponents/include/itkThresholdMaximumConnectedComponentsImageFilter.hxx index 51233f0511c..f7a031f2142 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkThresholdMaximumConnectedComponentsImageFilter.hxx +++ b/Modules/Segmentation/ConnectedComponents/include/itkThresholdMaximumConnectedComponentsImageFilter.hxx @@ -191,8 +191,7 @@ ThresholdMaximumConnectedComponentsImageFilter::Print << std::endl; os << indent << "Threshold Value: " << static_cast::PrintType>(m_ThresholdValue) << std::endl; - os << indent - << "NumberOfObjects: " << static_cast::PrintType>(m_NumberOfObjects) + os << indent << "NumberOfObjects: " << static_cast::PrintType>(m_NumberOfObjects) << std::endl; } } // end namespace itk diff --git a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterGTest.cxx b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterGTest.cxx index 412bca51375..533a6bdf253 100644 --- a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterGTest.cxx +++ b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterGTest.cxx @@ -28,7 +28,7 @@ using itk::print_helper::operator<<; namespace { -typename itk::Image::Pointer +itk::Image::Pointer CreateTestImageA() { std::bitset<8> bits(105); // 3D Checkerboard: 01101001 diff --git a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx index 9a9210cbbb0..4b4c4a2796d 100644 --- a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx +++ b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx @@ -89,7 +89,7 @@ itkConnectedComponentImageFilterTest(int argc, char * argv[]) } ITK_TEST_SET_GET_BOOLEAN(filter, FullyConnected, fullyConnected); - constexpr typename FilterType::OutputPixelType backgroundValue{}; + constexpr FilterType::OutputPixelType backgroundValue{}; filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); diff --git a/Modules/Segmentation/ConnectedComponents/test/itkRelabelComponentImageFilterGTest.cxx b/Modules/Segmentation/ConnectedComponents/test/itkRelabelComponentImageFilterGTest.cxx index 5f813490fb7..bde89157f14 100644 --- a/Modules/Segmentation/ConnectedComponents/test/itkRelabelComponentImageFilterGTest.cxx +++ b/Modules/Segmentation/ConnectedComponents/test/itkRelabelComponentImageFilterGTest.cxx @@ -31,7 +31,7 @@ namespace { -typename itk::Image::Pointer +itk::Image::Pointer CreateTestImageA() { @@ -136,8 +136,8 @@ TEST(RelabelComponentImageFilter, BigZero) using PixelType = unsigned short; using ImageType = itk::Image; - auto image = ImageType::New(); - typename ImageType::RegionType region; + auto image = ImageType::New(); + ImageType::RegionType region; region.SetSize({ { 512, 512, 512 } }); image->SetRegions(region); image->AllocateInitialized(); diff --git a/Modules/Segmentation/ConnectedComponents/test/itkScalarConnectedComponentImageFilterTest.cxx b/Modules/Segmentation/ConnectedComponents/test/itkScalarConnectedComponentImageFilterTest.cxx index 50c8ae11f03..faa55155c4f 100644 --- a/Modules/Segmentation/ConnectedComponents/test/itkScalarConnectedComponentImageFilterTest.cxx +++ b/Modules/Segmentation/ConnectedComponents/test/itkScalarConnectedComponentImageFilterTest.cxx @@ -108,7 +108,7 @@ itkScalarConnectedComponentImageFilterTest(int argc, char * argv[]) filter->SetInput(reader->GetOutput()); filter->SetMaskImage(mask); - auto distanceThreshold = static_cast(std::stod(argv[3])); + auto distanceThreshold = static_cast(std::stod(argv[3])); filter->SetDistanceThreshold(distanceThreshold); ITK_TEST_SET_GET_VALUE(distanceThreshold, filter->GetDistanceThreshold()); diff --git a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.h b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.h index 0929aba49ee..e0cfcaf0b7f 100644 --- a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.h +++ b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.h @@ -104,9 +104,9 @@ class ITK_TEMPLATE_EXPORT DeformableSimplexMesh3DFilter : public MeshToMeshFilte using InputPointsContainerConstIterator = typename InputMeshType::PointsContainer::ConstIterator; /** Other definitions. */ - using PointType = typename SimplexMeshGeometry::PointType; - using VectorType = typename PointType::VectorType; - using CovariantVectorType = CovariantVector; + using PointType = SimplexMeshGeometry::PointType; + using VectorType = PointType::VectorType; + using CovariantVectorType = CovariantVector; using PixelType = typename InputMeshType::PixelType; /** Image and Image iterator definition. */ @@ -134,8 +134,8 @@ class ITK_TEMPLATE_EXPORT DeformableSimplexMesh3DFilter : public MeshToMeshFilte using NeighborSetType = std::set; using IndexSetType = std::set; using VertexNeighborListType = itk::MapContainer; - using NeighborSetIterator = typename NeighborSetType::iterator; - using IndexSetIterator = typename IndexSetType::iterator; + using NeighborSetIterator = NeighborSetType::iterator; + using IndexSetIterator = IndexSetType::iterator; using GeometryMapType = typename InputMeshType::GeometryMapType; using GeometryMapPointer = typename GeometryMapType::Pointer; diff --git a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DGradientConstraintForceFilter.h b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DGradientConstraintForceFilter.h index 9724cf94943..1a8fbfa64ab 100644 --- a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DGradientConstraintForceFilter.h +++ b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DGradientConstraintForceFilter.h @@ -186,9 +186,9 @@ class ITK_TEMPLATE_EXPORT DeformableSimplexMesh3DGradientConstraintForceFilter using GradientIntensityImagePointer = typename GradientIntensityImageType::Pointer; using OriginalImageType = Image; - using OriginalImageIndexType = typename OriginalImageType::IndexType; - using ImageIndexValueType = typename OriginalImageIndexType::IndexValueType; - using OriginalImagePointer = typename OriginalImageType::ConstPointer; + using OriginalImageIndexType = OriginalImageType::IndexType; + using ImageIndexValueType = OriginalImageIndexType::IndexValueType; + using OriginalImagePointer = OriginalImageType::ConstPointer; /** control the range of search for Bresenham at normal line */ /** @ITKStartGrouping */ diff --git a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h index 064fd187677..369c865ba4b 100644 --- a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h +++ b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.h @@ -230,7 +230,7 @@ class ITK_TEMPLATE_EXPORT KLMRegionGrowImageFilter : public RegionGrowImageFilte using OutputImageIterator = ImageRegionIterator; /** type definition for the region label type. */ - using RegionLabelType = typename KLMSegmentationRegion::RegionLabelType; + using RegionLabelType = KLMSegmentationRegion::RegionLabelType; /** The dimension of the labelled image. */ static constexpr RegionLabelType LabelImageDimension = InputImageDimension; @@ -359,8 +359,8 @@ class ITK_TEMPLATE_EXPORT KLMRegionGrowImageFilter : public RegionGrowImageFilte private: using InputImageSizeType = typename TInputImage::SizeType; - using KLMSegmentationRegionPtr = typename KLMSegmentationRegion::Pointer; - using KLMSegmentationBorderPtr = typename KLMSegmentationBorder::Pointer; + using KLMSegmentationRegionPtr = KLMSegmentationRegion::Pointer; + using KLMSegmentationBorderPtr = KLMSegmentationBorder::Pointer; double m_MaximumLambda{ 1000 }; unsigned int m_NumberOfRegions{ 0 }; diff --git a/Modules/Segmentation/LabelVoting/test/itkMultiLabelSTAPLEImageFilterTest.cxx b/Modules/Segmentation/LabelVoting/test/itkMultiLabelSTAPLEImageFilterTest.cxx index 4ddd369445b..40de1ef7baf 100644 --- a/Modules/Segmentation/LabelVoting/test/itkMultiLabelSTAPLEImageFilterTest.cxx +++ b/Modules/Segmentation/LabelVoting/test/itkMultiLabelSTAPLEImageFilterTest.cxx @@ -136,7 +136,7 @@ itkMultiLabelSTAPLEImageFilterTest(int, char *[]) ITK_TEST_EXPECT_TRUE(!filter->GetHasPriorProbabilities()); constexpr typename FilterType::PriorProbabilitiesType::ValueType priorProbabilitiesVal(0.0); - typename FilterType::PriorProbabilitiesType priorProbabilities(1, priorProbabilitiesVal); + FilterType::PriorProbabilitiesType priorProbabilities(1, priorProbabilitiesVal); filter->SetPriorProbabilities(priorProbabilities); ITK_TEST_SET_GET_VALUE(priorProbabilities, filter->GetPriorProbabilities()); diff --git a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx index be113dacc2a..46762395d8f 100644 --- a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx @@ -100,8 +100,8 @@ typename ParallelSparseFieldLevelSetImageFilter::Valu template typename ParallelSparseFieldLevelSetImageFilter::StatusType - ParallelSparseFieldLevelSetImageFilter::m_StatusNull = NumericTraits< - typename ParallelSparseFieldLevelSetImageFilter::StatusType>::NonpositiveMin(); + ParallelSparseFieldLevelSetImageFilter::m_StatusNull = + NumericTraits::StatusType>::NonpositiveMin(); template typename ParallelSparseFieldLevelSetImageFilter::StatusType @@ -2426,7 +2426,7 @@ ParallelSparseFieldLevelSetImageFilter::PrintSelf(std os << indent << "Layers: " << m_Layers << std::endl; - os << indent << "NumberOfLayers: " << static_cast::PrintType>(m_NumberOfLayers) + os << indent << "NumberOfLayers: " << static_cast::PrintType>(m_NumberOfLayers) << std::endl; itkPrintSelfObjectMacro(StatusImage); @@ -2445,7 +2445,7 @@ ParallelSparseFieldLevelSetImageFilter::PrintSelf(std os << indent << "TimeStep: " << static_cast::PrintType>(m_TimeStep) << std::endl; - os << indent << "NumOfWorkUnits: " << static_cast::PrintType>(m_NumOfWorkUnits) + os << indent << "NumOfWorkUnits: " << static_cast::PrintType>(m_NumOfWorkUnits) << std::endl; os << indent << "SplitAxis: " << m_SplitAxis << std::endl; diff --git a/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunction.h b/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunction.h index cfe899f3cbf..4458a5ebbb9 100644 --- a/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunction.h +++ b/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunction.h @@ -157,7 +157,7 @@ class ITK_TEMPLATE_EXPORT ShapePriorMAPCostFunction : public ShapePriorMAPCostFu ArrayType m_ShapeParameterStandardDeviations{}; WeightsType m_Weights{}; - typename GaussianKernelFunction::Pointer m_GaussianFunction{}; + GaussianKernelFunction::Pointer m_GaussianFunction{}; }; } // end namespace itk diff --git a/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetImageFilter.h b/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetImageFilter.h index 073a3bd3dc5..e90ad67f53e 100644 --- a/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetImageFilter.h +++ b/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetImageFilter.h @@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT ShapePriorSegmentationLevelSetImageFilter /** The type of optimizer used to compute the MAP estimate of the shape and pose parameters. */ using OptimizerType = SingleValuedNonLinearOptimizer; - using OptimizerPointer = typename OptimizerType::Pointer; + using OptimizerPointer = OptimizerType::Pointer; /** Set/Get the shape signed distance function. */ /** @ITKStartGrouping */ diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx index 5d316d803c4..281ac9a3579 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx @@ -96,7 +96,7 @@ typename SparseFieldLevelSetImageFilter::ValueType template typename SparseFieldLevelSetImageFilter::StatusType SparseFieldLevelSetImageFilter::m_StatusNull = - NumericTraits::StatusType>::NonpositiveMin(); + NumericTraits::StatusType>::NonpositiveMin(); template typename SparseFieldLevelSetImageFilter::StatusType diff --git a/Modules/Segmentation/LevelSets/test/itkCollidingFrontsImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkCollidingFrontsImageFilterTest.cxx index e5913477d17..e8a189f7d07 100644 --- a/Modules/Segmentation/LevelSets/test/itkCollidingFrontsImageFilterTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkCollidingFrontsImageFilterTest.cxx @@ -67,7 +67,7 @@ itkCollidingFrontsImageFilterTest(int argc, char * argv[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(collidingFronts, CollidingFrontsImageFilter, ImageToImageFilter); using NodeContainer = CollidingFrontsFilterType::NodeContainer; - using NodeType = typename CollidingFrontsFilterType::NodeType; + using NodeType = CollidingFrontsFilterType::NodeType; // select seeds 20 pixels apart diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetDomainPartitionBase.h b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetDomainPartitionBase.h index 481317b6fad..11fdc78c8e4 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetDomainPartitionBase.h +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetDomainPartitionBase.h @@ -63,8 +63,8 @@ class ITK_TEMPLATE_EXPORT LevelSetDomainPartitionBase : public Object AllocateListDomain() = 0; using IdentifierListType = std::list; - using IdentifierListIterator = typename IdentifierListType::iterator; - using IdentifierListConstIterator = typename IdentifierListType::const_iterator; + using IdentifierListIterator = IdentifierListType::iterator; + using IdentifierListConstIterator = IdentifierListType::const_iterator; IdentifierType m_NumberOfLevelSetFunctions{}; }; diff --git a/Modules/Segmentation/LevelSetsv4/test/itkSingleLevelSetDenseAdvectionImage2DTest.cxx b/Modules/Segmentation/LevelSetsv4/test/itkSingleLevelSetDenseAdvectionImage2DTest.cxx index 51a4171bc0a..bb344291b28 100644 --- a/Modules/Segmentation/LevelSetsv4/test/itkSingleLevelSetDenseAdvectionImage2DTest.cxx +++ b/Modules/Segmentation/LevelSetsv4/test/itkSingleLevelSetDenseAdvectionImage2DTest.cxx @@ -153,7 +153,7 @@ itkSingleLevelSetDenseAdvectionImage2DTest(int argc, char * argv[]) advectionTerm->SetInput(input); advectionTerm->SetCoefficient(1.0); - auto derivativeSigma = static_cast(std::stod(argv[6])); + auto derivativeSigma = static_cast(std::stod(argv[6])); advectionTerm->SetDerivativeSigma(derivativeSigma); ITK_TEST_SET_GET_VALUE(derivativeSigma, advectionTerm->GetDerivativeSigma()); diff --git a/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h b/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h index 2afbd9d5556..b7da78c114d 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h +++ b/Modules/Segmentation/RegionGrowing/include/itkConnectedThresholdImageFilter.h @@ -88,7 +88,7 @@ class ITK_TEMPLATE_EXPORT ConnectedThresholdImageFilter : public ImageToImageFil using InputImageRegionType = typename InputImageType::RegionType; using InputImagePixelType = typename InputImageType::PixelType; using IndexType = typename InputImageType::IndexType; - using SeedContainerType = typename std::vector; + using SeedContainerType = std::vector; using SizeType = typename InputImageType::SizeType; using OutputImageType = TOutputImage; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h index 7269af3aef8..21b52cf32ab 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h @@ -122,7 +122,7 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2D using EdgeAutoPointer = typename Edge::SelfAutoPointer; using PointList = std::list; using INTvector = std::vector; - using NeighborIdIterator = typename INTvector::iterator; + using NeighborIdIterator = INTvector::iterator; using VertexIterator = PointsContainerIterator; /** Get the number of Voronoi seeds. */ itkGetConstMacro(NumberOfSeeds, unsigned int); diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.h b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.h index fc01316d360..37b0ccb5d3f 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.h @@ -87,16 +87,16 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationImageFilterBase : public ImageToIma using VoronoiDiagram = VoronoiDiagram2D; using VoronoiDiagramGenerator = VoronoiDiagram2DGenerator; - using PointType = typename VoronoiDiagram::PointType; - using CellType = typename VoronoiDiagram::CellType; - using CellAutoPointer = typename VoronoiDiagram::CellAutoPointer; - using VoronoiPointer = typename VoronoiDiagram::Pointer; - using PointIdIterator = typename CellType::PointIdIterator; - using SeedsType = typename VoronoiDiagram::SeedsType; - using SeedsIterator = typename VoronoiDiagram::SeedsIterator; - using NeighborIdIterator = typename VoronoiDiagram::NeighborIdIterator; - using EdgeIterator = typename VoronoiDiagram::VoronoiEdgeIterator; - using EdgeInfo = typename VoronoiDiagram::VoronoiEdge; + using PointType = VoronoiDiagram::PointType; + using CellType = VoronoiDiagram::CellType; + using CellAutoPointer = VoronoiDiagram::CellAutoPointer; + using VoronoiPointer = VoronoiDiagram::Pointer; + using PointIdIterator = CellType::PointIdIterator; + using SeedsType = VoronoiDiagram::SeedsType; + using SeedsIterator = VoronoiDiagram::SeedsIterator; + using NeighborIdIterator = VoronoiDiagram::NeighborIdIterator; + using EdgeIterator = VoronoiDiagram::VoronoiEdgeIterator; + using EdgeInfo = VoronoiDiagram::VoronoiEdge; using PointTypeVector = std::vector; using PointTypeDeque = std::deque; using BinaryObjectImage = TBinaryPriorImage; @@ -105,7 +105,7 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationImageFilterBase : public ImageToIma /** To output the drawing of Voronoi Diagram (VD) . */ using VDImage = Image; - using VDImagePointer = typename VDImage::Pointer; + using VDImagePointer = VDImage::Pointer; /** Set/Get the initial number of seeds for VD. */ /** @ITKStartGrouping */ @@ -266,9 +266,9 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationImageFilterBase : public ImageToIma // output the object. bool m_InteractiveSegmentation{ false }; - typename VoronoiDiagram::Pointer m_WorkingVD{}; + VoronoiDiagram::Pointer m_WorkingVD{}; - typename VoronoiDiagramGenerator::Pointer m_VDGenerator{}; + VoronoiDiagramGenerator::Pointer m_VDGenerator{}; std::vector m_SeedsToAdded{}; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.hxx b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.hxx index c5c453bbaf2..b12d5b5362b 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.hxx +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilterBase.hxx @@ -46,8 +46,7 @@ VoronoiSegmentationImageFilterBase os << indent << "Size: " << static_cast::PrintType>(m_Size) << std::endl; os << indent << "NumberOfSeeds: " << m_NumberOfSeeds << std::endl; - os << indent << "MinRegion: " << static_cast::PrintType>(m_MinRegion) - << std::endl; + os << indent << "MinRegion: " << static_cast::PrintType>(m_MinRegion) << std::endl; os << indent << "Steps: " << m_Steps << std::endl; os << indent << "LastStepSeeds: " << m_LastStepSeeds << std::endl; os << indent << "NumberOfSeedsToAdded: " << m_NumberOfSeedsToAdded << std::endl; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h index ea8555f5e35..0b7aa11c166 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.h @@ -213,16 +213,16 @@ class ITK_TEMPLATE_EXPORT VoronoiSegmentationRGBImageFilter PrintSelf(std::ostream & os, Indent indent) const override; private: - double m_Mean[6]{}; - double m_STD[6]{}; - double m_MeanTolerance[6]{}; - double m_STDTolerance[6]{}; - double m_MeanPercentError[6]{}; - double m_STDPercentError[6]{}; - double m_MaxValueOfRGB{}; - unsigned int m_TestMean[3]{}; - unsigned int m_TestSTD[3]{}; - typename RGBHCVImage::Pointer m_WorkingImage{}; + double m_Mean[6]{}; + double m_STD[6]{}; + double m_MeanTolerance[6]{}; + double m_STDTolerance[6]{}; + double m_MeanPercentError[6]{}; + double m_STDPercentError[6]{}; + double m_MaxValueOfRGB{}; + unsigned int m_TestMean[3]{}; + unsigned int m_TestSTD[3]{}; + RGBHCVImage::Pointer m_WorkingImage{}; bool TestHomogeneity(IndexList & Plist) override; diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx index 912b2084bff..b7f02506b10 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedEquivalenceRelabeler.hxx @@ -28,7 +28,7 @@ EquivalenceRelabeler::GenerateData() const typename ImageType::ConstPointer input = this->GetInputImage(); const typename ImageType::Pointer output = this->GetOutputImage(); - const typename EquivalencyTableType::Pointer eqT = this->GetEquivalencyTable(); + const EquivalencyTableType::Pointer eqT = this->GetEquivalencyTable(); output->SetBufferedRegion(output->GetRequestedRegion()); output->Allocate(); diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h index 8e10d0199d5..92ae43bbcfb 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.h @@ -99,7 +99,7 @@ class ITK_TEMPLATE_EXPORT SegmentTreeGenerator : public ProcessObject /** Typedefs to avoid internal compiler error bug on Microsoft VC++ */ using SegmentTableTypePointer = typename SegmentTableType::Pointer; - using OneWayEquivalencyTableTypePointer = typename OneWayEquivalencyTableType::Pointer; + using OneWayEquivalencyTableTypePointer = OneWayEquivalencyTableType::Pointer; using SegmentTreeTypePointer = typename SegmentTreeType::Pointer; /** Get/Set the input table of segments to process */ diff --git a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx index 790f755ce13..8bdb1e03689 100644 --- a/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx +++ b/Modules/Segmentation/Watersheds/include/itkWatershedSegmentTreeGenerator.hxx @@ -115,8 +115,8 @@ void SegmentTreeGenerator::MergeEquivalencies() { const typename SegmentTableType::Pointer segTable = this->GetInputSegmentTable(); - auto threshold = static_cast(m_FloodLevel * segTable->GetMaximumDepth()); - const typename EquivalencyTableType::Pointer eqTable = this->GetInputEquivalencyTable(); + auto threshold = static_cast(m_FloodLevel * segTable->GetMaximumDepth()); + const EquivalencyTableType::Pointer eqTable = this->GetInputEquivalencyTable(); eqTable->Flatten(); IdentifierType counter = 0; diff --git a/Modules/Video/Core/include/itkImageToVideoFilter.hxx b/Modules/Video/Core/include/itkImageToVideoFilter.hxx index cebf2e10bd5..0ed84a3fd9c 100644 --- a/Modules/Video/Core/include/itkImageToVideoFilter.hxx +++ b/Modules/Video/Core/include/itkImageToVideoFilter.hxx @@ -273,7 +273,7 @@ ImageToVideoFilter::GenerateData() inputSliceRegion.SetSize(m_FrameAxis, 0); inputSliceRegion.SetIndex(m_FrameAxis, idx); - using ExtractFilterType = typename itk::ExtractImageFilter; + using ExtractFilterType = itk::ExtractImageFilter; auto extractFilter = ExtractFilterType::New(); extractFilter->SetDirectionCollapseToSubmatrix(); diff --git a/Modules/Video/Core/include/itkRingBuffer.hxx b/Modules/Video/Core/include/itkRingBuffer.hxx index b12673f9b4d..ef173cda964 100644 --- a/Modules/Video/Core/include/itkRingBuffer.hxx +++ b/Modules/Video/Core/include/itkRingBuffer.hxx @@ -106,7 +106,7 @@ template auto RingBuffer::GetNumberOfBuffers() -> SizeValueType { - return static_cast::SizeValueType>(this->m_PointerVector.size()); + return static_cast::SizeValueType>(this->m_PointerVector.size()); } template diff --git a/Modules/Video/Core/include/itkVideoStream.h b/Modules/Video/Core/include/itkVideoStream.h index 5fb57c58866..20dd105ff40 100644 --- a/Modules/Video/Core/include/itkVideoStream.h +++ b/Modules/Video/Core/include/itkVideoStream.h @@ -54,7 +54,7 @@ class ITK_TEMPLATE_EXPORT VideoStream : public TemporalDataObject using FrameType = TFrameType; using FramePointer = typename FrameType::Pointer; using FrameConstPointer = typename FrameType::ConstPointer; - using typename Superclass::BufferType; + using Superclass::BufferType; using SpatialRegionType = typename FrameType::RegionType; using IndexType = typename FrameType::IndexType; @@ -66,11 +66,11 @@ class ITK_TEMPLATE_EXPORT VideoStream : public TemporalDataObject using NumberOfComponentsPerPixelType = unsigned int; /** Types used to store map between frame numbers and frame meta data */ - using SpatialRegionMapType = typename std::map; - using PointMapType = typename std::map; - using DirectionMapType = typename std::map; - using SpacingMapType = typename std::map; - using NumberOfComponentsPerPixelMapType = typename std::map; + using SpatialRegionMapType = std::map; + using PointMapType = std::map; + using DirectionMapType = std::map; + using SpacingMapType = std::map; + using NumberOfComponentsPerPixelMapType = std::map; /** Access the spatial dimensionality of the frames */ static constexpr unsigned int FrameDimension = FrameType::ImageDimension; diff --git a/Modules/Video/Core/include/itkVideoStream.hxx b/Modules/Video/Core/include/itkVideoStream.hxx index 3c814d5a143..84e89bb8473 100644 --- a/Modules/Video/Core/include/itkVideoStream.hxx +++ b/Modules/Video/Core/include/itkVideoStream.hxx @@ -227,7 +227,7 @@ VideoStream::GetFrameNumberOfComponentsPerPixel(SizeValueType frameN template void -VideoStream::SetFrameBuffer(typename VideoStream::BufferType * buffer) +VideoStream::SetFrameBuffer(VideoStream::BufferType * buffer) { // We reinterpret the buffer to match TemporalDataObject's buffer type. We // assume that any tampering with the internal buffer will use our BufferType @@ -299,10 +299,9 @@ VideoStream::InitializeEmptyFrames() { if (!m_DataObjectBuffer->BufferIsFull(i)) { - const FramePointer newFrame = FrameType::New(); - FrameType * newFrameRawPointer = newFrame.GetPointer(); - const typename BufferType::ElementPointer element = - dynamic_cast(newFrameRawPointer); + const FramePointer newFrame = FrameType::New(); + FrameType * newFrameRawPointer = newFrame.GetPointer(); + const BufferType::ElementPointer element = dynamic_cast(newFrameRawPointer); m_DataObjectBuffer->SetBufferContents(i, element); } @@ -343,8 +342,8 @@ template void VideoStream::SetFrame(SizeValueType frameNumber, FramePointer frame) { - auto * dataObjectRawPointer = dynamic_cast(frame.GetPointer()); - const typename BufferType::ElementPointer dataObject = dataObjectRawPointer; + auto * dataObjectRawPointer = dynamic_cast(frame.GetPointer()); + const BufferType::ElementPointer dataObject = dataObjectRawPointer; m_DataObjectBuffer->SetBufferContents(frameNumber, dataObject); // Cache the meta data @@ -363,8 +362,8 @@ VideoStream::GetFrame(SizeValueType frameNumber) -> FrameType * { // Fetch the frame - const typename BufferType::ElementPointer element = m_DataObjectBuffer->GetBufferContents(frameNumber); - const FramePointer frame = dynamic_cast(element.GetPointer()); + const BufferType::ElementPointer element = m_DataObjectBuffer->GetBufferContents(frameNumber); + const FramePointer frame = dynamic_cast(element.GetPointer()); return frame; } @@ -373,8 +372,8 @@ template auto VideoStream::GetFrame(SizeValueType frameNumber) const -> const FrameType * { - const typename BufferType::ElementPointer element = m_DataObjectBuffer->GetBufferContents(frameNumber); - const FrameConstPointer frame = dynamic_cast(element.GetPointer()); + const BufferType::ElementPointer element = m_DataObjectBuffer->GetBufferContents(frameNumber); + const FrameConstPointer frame = dynamic_cast(element.GetPointer()); return frame; } diff --git a/Modules/Video/Core/test/itkImageToVideoFilterTest.cxx b/Modules/Video/Core/test/itkImageToVideoFilterTest.cxx index 04d9d63a7d3..32850e0eb9b 100644 --- a/Modules/Video/Core/test/itkImageToVideoFilterTest.cxx +++ b/Modules/Video/Core/test/itkImageToVideoFilterTest.cxx @@ -47,8 +47,8 @@ itkImageToVideoFilterTest(int argc, char * argv[]) using ImageType = itk::Image; // Get 3D image to represent a temporal dataset of 2D frames - const auto inputImage = itk::ReadImage(argv[1]); - typename ImageType::DirectionType inputDirection; + const auto inputImage = itk::ReadImage(argv[1]); + ImageType::DirectionType inputDirection; /* Set input image direction matrix to * 1 0 0 * 0 0 1 @@ -99,7 +99,7 @@ itkImageToVideoFilterTest(int argc, char * argv[]) } // Verify spatial direction in output frames match input direction - typename VideoFilterType::OutputFrameType::DirectionType outputDirection; + VideoFilterType::OutputFrameType::DirectionType outputDirection; outputDirection(0, 1) = 1; outputDirection(1, 0) = -1; for (auto frameIdx = videoOutput->GetLargestPossibleTemporalRegion().GetFrameStart(); @@ -110,7 +110,7 @@ itkImageToVideoFilterTest(int argc, char * argv[]) } // Iterate over 3D input + video output to verify pixel data matches across each slice/frame - using ImageIteratorType = typename itk::ImageSliceConstIteratorWithIndex; + using ImageIteratorType = itk::ImageSliceConstIteratorWithIndex; ImageIteratorType it(inputImage, inputImage->GetLargestPossibleRegion()); it.SetFirstDirection(1); // fastest moving remaining spatial axis it.SetSecondDirection(2); // second-fastest moving remaining spatial axis diff --git a/Modules/Video/Core/test/itkVectorImageToVideoTest.cxx b/Modules/Video/Core/test/itkVectorImageToVideoTest.cxx index 16975c6a233..a11047024c1 100644 --- a/Modules/Video/Core/test/itkVectorImageToVideoTest.cxx +++ b/Modules/Video/Core/test/itkVectorImageToVideoTest.cxx @@ -87,7 +87,7 @@ itkVectorImageToVideoTest(int argc, char * argv[]) } // Verify spatial direction in output frames match input direction - typename VideoFilterType::OutputFrameType::DirectionType outputDirection; + VideoFilterType::OutputFrameType::DirectionType outputDirection; outputDirection.SetIdentity(); for (auto frameIdx = videoOutput->GetLargestPossibleTemporalRegion().GetFrameStart(); frameIdx < videoOutput->GetLargestPossibleTemporalRegion().GetFrameDuration(); @@ -101,7 +101,7 @@ itkVectorImageToVideoTest(int argc, char * argv[]) inputImage->GetNumberOfComponentsPerPixel()); // Iterate over 3D input + video output to verify pixel data matches across each slice/frame - using ImageIteratorType = typename itk::ImageLinearConstIteratorWithIndex; + using ImageIteratorType = itk::ImageLinearConstIteratorWithIndex; ImageIteratorType it(inputImage, inputImage->GetLargestPossibleRegion()); it.SetDirection(1); // Slice direction it.GoToBegin(); diff --git a/Modules/Video/IO/include/itkVideoFileReader.h b/Modules/Video/IO/include/itkVideoFileReader.h index 876aa48a647..784eaa84579 100644 --- a/Modules/Video/IO/include/itkVideoFileReader.h +++ b/Modules/Video/IO/include/itkVideoFileReader.h @@ -60,9 +60,9 @@ class ITK_TEMPLATE_EXPORT VideoFileReader : public VideoSource; using IOBaseType = VideoIOBase; - using IOBasePointer = typename VideoIOBase::Pointer; - using SizeValueType = typename IOBaseType::SizeValueType; - using TemporalRatioType = typename IOBaseType::TemporalRatioType; + using IOBasePointer = VideoIOBase::Pointer; + using SizeValueType = IOBaseType::SizeValueType; + using TemporalRatioType = IOBaseType::TemporalRatioType; using VideoStreamType = TInputVideoStream; using VideoStreamPointer = typename VideoStreamType::Pointer; diff --git a/Modules/Video/IO/include/itkVideoFileWriter.hxx b/Modules/Video/IO/include/itkVideoFileWriter.hxx index f13b35d0387..5342cc23dbd 100644 --- a/Modules/Video/IO/include/itkVideoFileWriter.hxx +++ b/Modules/Video/IO/include/itkVideoFileWriter.hxx @@ -305,13 +305,11 @@ VideoFileWriter::PrintSelf(std::ostream & os, Indent indent) os << indent << "OutputTemporalRegion: " << m_OutputTemporalRegion << std::endl; - os << indent - << "FramesPerSecond: " << static_cast::PrintType>(m_FramesPerSecond) + os << indent << "FramesPerSecond: " << static_cast::PrintType>(m_FramesPerSecond) << std::endl; os << indent << "FourCC: " << m_FourCC << std::endl; os << indent << "Dimensions: " << m_Dimensions << std::endl; - os << indent - << "NumberOfComponents: " << static_cast::PrintType>(m_NumberOfComponents) + os << indent << "NumberOfComponents: " << static_cast::PrintType>(m_NumberOfComponents) << std::endl; os << indent << "ComponentType: " << m_ComponentType << std::endl; }