From 0a057d7f01307f5fd2b6ba553e8c85cbed752104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C5=BEenan=20Zuki=C4=87?= Date: Wed, 26 Apr 2023 16:05:02 -0400 Subject: [PATCH] STYLE: Use trailing return type instead of typename + dependent type --- .../itkMorphologicalContourInterpolator.hxx | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/include/itkMorphologicalContourInterpolator.hxx b/include/itkMorphologicalContourInterpolator.hxx index 82fa91c..15137fc 100644 --- a/include/itkMorphologicalContourInterpolator.hxx +++ b/include/itkMorphologicalContourInterpolator.hxx @@ -243,8 +243,8 @@ MorphologicalContourInterpolator< TImage >::Extrapolate( int axis, TImage* out, } // >::Extrapolate template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::BoolSliceType::Pointer -MorphologicalContourInterpolator< TImage >::Dilate1( typename BoolSliceType::Pointer& seed, typename BoolSliceType::Pointer& mask ) +auto +MorphologicalContourInterpolator< TImage >::Dilate1( typename BoolSliceType::Pointer& seed, typename BoolSliceType::Pointer& mask ) -> typename BoolSliceType::Pointer { // set up structuring element for dilation using CrossStructuringElementType = BinaryCrossStructuringElement< typename BoolSliceType::PixelType, BoolSliceType::ImageDimension >; @@ -326,8 +326,9 @@ MorphologicalContourInterpolator< TImage >::GenerateDilationSequence( typename B } template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::BoolSliceType::Pointer -MorphologicalContourInterpolator< TImage >::FindMedianImageDilations( typename BoolSliceType::Pointer& intersection, typename BoolSliceType::Pointer& iMask, typename BoolSliceType::Pointer& jMask ) +auto +MorphologicalContourInterpolator< TImage >::FindMedianImageDilations( typename BoolSliceType::Pointer& intersection, typename BoolSliceType::Pointer& iMask, typename BoolSliceType::Pointer& jMask ) -> + typename BoolSliceType::Pointer { std::vector< typename BoolSliceType::Pointer > iSeq = GenerateDilationSequence( intersection, iMask ); std::vector< typename BoolSliceType::Pointer > jSeq = GenerateDilationSequence( intersection, jMask ); @@ -373,8 +374,8 @@ MorphologicalContourInterpolator< TImage >::FindMedianImageDilations( typename B } // >::FindMedianImageDilations template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::FloatSliceType::Pointer -MorphologicalContourInterpolator< TImage >::MaurerDM( typename BoolSliceType::Pointer& mask ) +auto +MorphologicalContourInterpolator< TImage >::MaurerDM( typename BoolSliceType::Pointer& mask ) -> typename FloatSliceType::Pointer { using FilterType = itk::SignedMaurerDistanceMapImageFilter< BoolSliceType, FloatSliceType >; thread_local typename FilterType::Pointer filter = FilterType::New(); @@ -387,8 +388,9 @@ MorphologicalContourInterpolator< TImage >::MaurerDM( typename BoolSliceType::Po } template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::BoolSliceType::Pointer -MorphologicalContourInterpolator< TImage >::FindMedianImageDistances( typename BoolSliceType::Pointer& intersection, typename BoolSliceType::Pointer& iMask, typename BoolSliceType::Pointer& jMask ) +auto +MorphologicalContourInterpolator< TImage >::FindMedianImageDistances( typename BoolSliceType::Pointer& intersection, typename BoolSliceType::Pointer& iMask, typename BoolSliceType::Pointer& jMask ) -> + typename BoolSliceType::Pointer { // calculate distance field typename FloatSliceType::Pointer sdf = MaurerDM( intersection ); @@ -497,8 +499,8 @@ MorphologicalContourInterpolator< TImage >::FindMedianImageDistances( typename B } // >::FindMedianImageDistances template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::SliceType::RegionType -MorphologicalContourInterpolator< TImage >::BoundingBox( itk::SmartPointer< SliceType > image ) +auto +MorphologicalContourInterpolator< TImage >::BoundingBox( itk::SmartPointer< SliceType > image ) -> typename SliceType::RegionType { typename SliceType::RegionType newRegion = image->GetLargestPossibleRegion(); typename SliceType::IndexType minInd = newRegion.GetIndex() + newRegion.GetSize(); @@ -948,8 +950,9 @@ MorphologicalContourInterpolator< TImage >::Interpolate1toN( int axis, TImage* o } // >::Interpolate1toN template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::SliceType::Pointer -MorphologicalContourInterpolator< TImage >::TranslateImage( typename SliceType::Pointer& image, const typename SliceType::IndexType& translation, typename SliceType::RegionType newRegion ) +auto +MorphologicalContourInterpolator< TImage >::TranslateImage( typename SliceType::Pointer& image, const typename SliceType::IndexType& translation, typename SliceType::RegionType newRegion ) -> + typename SliceType::Pointer { typename SliceType::Pointer result = SliceType::New(); result->CopyInformation( image ); @@ -1046,8 +1049,8 @@ MorphologicalContourInterpolator< TImage >::CardinalSymmetricDifference( typenam } template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::SliceType::IndexType -MorphologicalContourInterpolator< TImage >::Centroid( typename SliceType::Pointer& conn, const PixelList& regionIds ) +auto +MorphologicalContourInterpolator< TImage >::Centroid( typename SliceType::Pointer& conn, const PixelList& regionIds ) -> typename SliceType::IndexType { ImageRegionConstIteratorWithIndex< SliceType > it( conn, conn->GetLargestPossibleRegion() ); IndexValueType ind[SliceType::ImageDimension] = { 0 }; // all components are initialized to zero @@ -1080,8 +1083,9 @@ MorphologicalContourInterpolator< TImage >::Centroid( typename SliceType::Pointe } // >::Centroid template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::SliceType::IndexType -MorphologicalContourInterpolator< TImage >::Align( typename SliceType::Pointer& iConn, typename TImage::PixelType iRegionId, typename SliceType::Pointer& jConn, const PixelList& jRegionIds ) +auto +MorphologicalContourInterpolator< TImage >::Align( typename SliceType::Pointer& iConn, typename TImage::PixelType iRegionId, typename SliceType::Pointer& jConn, const PixelList& jRegionIds ) -> + typename SliceType::IndexType { // calculate centroids PixelList iRegionIds; @@ -1164,8 +1168,9 @@ MorphologicalContourInterpolator< TImage >::Align( typename SliceType::Pointer& } // >::Align template< typename TImage > -typename MorphologicalContourInterpolator< TImage >::SliceType::Pointer -MorphologicalContourInterpolator< TImage >::RegionedConnectedComponents( const typename TImage::RegionType& region, typename TImage::PixelType label, IdentifierType& objectCount ) +auto +MorphologicalContourInterpolator< TImage >::RegionedConnectedComponents( const typename TImage::RegionType& region, typename TImage::PixelType label, IdentifierType& objectCount ) -> + typename SliceType::Pointer { m_RoI->SetExtractionRegion( region ); m_RoI->SetInput( this->GetInput() );