diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 08eaee4fe..63cc4de43 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -142,11 +142,11 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConjugateGradientOperator : public C /** Set the backprojection filter*/ void - SetBackProjectionFilter(const BackProjectionFilterPointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); /** Set the forward projection filter*/ void - SetForwardProjectionFilter(const ForwardProjectionFilterPointer _arg); + SetForwardProjectionFilter(ForwardProjectionFilterType * _arg); /** Pass the geometry to all filters needing it */ itkSetObjectMacro(Geometry, ThreeDCircularProjectionGeometry); diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.hxx b/include/rtkADMMTotalVariationConjugateGradientOperator.hxx index a0e46b89d..56ceb2d48 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.hxx +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.hxx @@ -66,7 +66,7 @@ ADMMTotalVariationConjugateGradientOperator void ADMMTotalVariationConjugateGradientOperator::SetBackProjectionFilter( - const typename BackProjectionFilterType::Pointer _arg) + BackProjectionFilterType * _arg) { if (m_BackProjectionFilter != _arg) this->Modified(); @@ -76,7 +76,7 @@ ADMMTotalVariationConjugateGradientOperator: template void ADMMTotalVariationConjugateGradientOperator::SetForwardProjectionFilter( - const typename ForwardProjectionFilterType::Pointer _arg) + ForwardProjectionFilterType * _arg) { if (m_ForwardProjectionFilter != _arg) this->Modified(); diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index 76dd4d67a..b15282499 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -128,15 +128,15 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConjugateGradientOperator : public Conjuga /** Set the backprojection filter*/ void - SetBackProjectionFilter(const BackProjectionFilterPointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); /** Set the forward projection filter*/ void - SetForwardProjectionFilter(const ForwardProjectionFilterPointer _arg); + SetForwardProjectionFilter(ForwardProjectionFilterType * _arg); /** Set the geometry of both m_BackProjectionFilter and m_ForwardProjectionFilter */ void - SetGeometry(const ThreeDCircularProjectionGeometry::Pointer _arg); + SetGeometry(ThreeDCircularProjectionGeometry * _arg); /** Set the regularization parameter */ itkSetMacro(Beta, float); diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.hxx b/include/rtkADMMWaveletsConjugateGradientOperator.hxx index 330df48cb..e3a54d988 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.hxx +++ b/include/rtkADMMWaveletsConjugateGradientOperator.hxx @@ -53,8 +53,7 @@ ADMMWaveletsConjugateGradientOperator::ADMMWaveletsConjugateGradie template void -ADMMWaveletsConjugateGradientOperator::SetBackProjectionFilter( - const typename BackProjectionFilterType::Pointer _arg) +ADMMWaveletsConjugateGradientOperator::SetBackProjectionFilter(BackProjectionFilterType * _arg) { if (m_BackProjectionFilter != _arg) this->Modified(); @@ -63,8 +62,7 @@ ADMMWaveletsConjugateGradientOperator::SetBackProjectionFilter( template void -ADMMWaveletsConjugateGradientOperator::SetForwardProjectionFilter( - const typename ForwardProjectionFilterType::Pointer _arg) +ADMMWaveletsConjugateGradientOperator::SetForwardProjectionFilter(ForwardProjectionFilterType * _arg) { if (m_ForwardProjectionFilter != _arg) this->Modified(); @@ -74,9 +72,9 @@ ADMMWaveletsConjugateGradientOperator::SetForwardProjectionFilter( template void -ADMMWaveletsConjugateGradientOperator::SetGeometry(const ThreeDCircularProjectionGeometry::Pointer _arg) +ADMMWaveletsConjugateGradientOperator::SetGeometry(ThreeDCircularProjectionGeometry * _arg) { - m_BackProjectionFilter->SetGeometry(_arg.GetPointer()); + m_BackProjectionFilter->SetGeometry(_arg); m_ForwardProjectionFilter->SetGeometry(_arg); m_DisplacedDetectorFilter->SetGeometry(_arg); } diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h index 78a0e87c1..bb66510a9 100644 --- a/include/rtkConjugateGradientImageFilter.h +++ b/include/rtkConjugateGradientImageFilter.h @@ -54,7 +54,6 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter using Superclass = itk::InPlaceImageFilter; using Pointer = itk::SmartPointer; using ConjugateGradientOperatorType = ConjugateGradientOperator; - using ConjugateGradientOperatorPointerType = typename ConjugateGradientOperatorType::Pointer; using OutputImagePointer = typename OutputImageType::Pointer; /** Method for creation through the object factory. */ @@ -72,7 +71,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter itkSetMacro(NumberOfIterations, int); void - SetA(ConjugateGradientOperatorPointerType _arg); + SetA(ConjugateGradientOperatorType * _arg); /** The input image to be updated.*/ void @@ -101,7 +100,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter void GenerateOutputInformation() override; - ConjugateGradientOperatorPointerType m_A; + ConjugateGradientOperatorType * m_A; int m_NumberOfIterations; }; diff --git a/include/rtkConjugateGradientImageFilter.hxx b/include/rtkConjugateGradientImageFilter.hxx index 1e35ed7ff..683138572 100644 --- a/include/rtkConjugateGradientImageFilter.hxx +++ b/include/rtkConjugateGradientImageFilter.hxx @@ -67,7 +67,7 @@ ConjugateGradientImageFilter::GetB() template void -ConjugateGradientImageFilter::SetA(ConjugateGradientOperatorPointerType _arg) +ConjugateGradientImageFilter::SetA(ConjugateGradientOperatorType * _arg) { this->m_A = _arg; this->Modified(); diff --git a/include/rtkFDKConeBeamReconstructionFilter.h b/include/rtkFDKConeBeamReconstructionFilter.h index 70d59a79d..bab209659 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.h +++ b/include/rtkFDKConeBeamReconstructionFilter.h @@ -120,7 +120,7 @@ class ITK_TEMPLATE_EXPORT FDKConeBeamReconstructionFilter : public itk::InPlaceI * created before calling this set function. */ itkGetMacro(BackProjectionFilter, BackProjectionFilterPointer); virtual void - SetBackProjectionFilter(const BackProjectionFilterPointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); protected: FDKConeBeamReconstructionFilter(); diff --git a/include/rtkFDKConeBeamReconstructionFilter.hxx b/include/rtkFDKConeBeamReconstructionFilter.hxx index ddfc331d0..3261bd75f 100644 --- a/include/rtkFDKConeBeamReconstructionFilter.hxx +++ b/include/rtkFDKConeBeamReconstructionFilter.hxx @@ -159,7 +159,7 @@ FDKConeBeamReconstructionFilter::Gener template void FDKConeBeamReconstructionFilter::SetBackProjectionFilter( - const BackProjectionFilterPointer _arg) + BackProjectionFilterType * _arg) { itkDebugMacro("setting BackProjectionFilter to " << _arg); if (this->m_BackProjectionFilter != _arg) diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.h b/include/rtkFourDReconstructionConjugateGradientOperator.h index 442bdc61b..8d7e04b53 100644 --- a/include/rtkFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkFourDReconstructionConjugateGradientOperator.h @@ -200,11 +200,11 @@ class ITK_TEMPLATE_EXPORT FourDReconstructionConjugateGradientOperator /** Pass the backprojection filter to ProjectionStackToFourD*/ void - SetBackProjectionFilter(const typename BackProjectionFilterType::Pointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); /** Pass the forward projection filter to FourDToProjectionStack */ void - SetForwardProjectionFilter(const typename ForwardProjectionFilterType::Pointer _arg); + SetForwardProjectionFilter(ForwardProjectionFilterType * _arg); /** Pass the geometry to all filters needing it */ itkSetConstObjectMacro(Geometry, ThreeDCircularProjectionGeometry); diff --git a/include/rtkFourDReconstructionConjugateGradientOperator.hxx b/include/rtkFourDReconstructionConjugateGradientOperator.hxx index ab05d25c2..c3393b33e 100644 --- a/include/rtkFourDReconstructionConjugateGradientOperator.hxx +++ b/include/rtkFourDReconstructionConjugateGradientOperator.hxx @@ -77,7 +77,7 @@ FourDReconstructionConjugateGradientOperator void FourDReconstructionConjugateGradientOperator::SetBackProjectionFilter( - const typename BackProjectionFilterType::Pointer _arg) + BackProjectionFilterType * _arg) { m_BackProjectionFilter = _arg; this->Modified(); @@ -86,7 +86,7 @@ FourDReconstructionConjugateGradientOperator void FourDReconstructionConjugateGradientOperator::SetForwardProjectionFilter( - const typename ForwardProjectionFilterType::Pointer _arg) + ForwardProjectionFilterType * _arg) { m_ForwardProjectionFilter = _arg; this->Modified(); diff --git a/include/rtkFourDToProjectionStackImageFilter.h b/include/rtkFourDToProjectionStackImageFilter.h index 084addac6..247024e0b 100644 --- a/include/rtkFourDToProjectionStackImageFilter.h +++ b/include/rtkFourDToProjectionStackImageFilter.h @@ -141,11 +141,10 @@ class ITK_TEMPLATE_EXPORT FourDToProjectionStackImageFilter /** Set the ForwardProjection filter */ void - SetForwardProjectionFilter(const typename ForwardProjectionFilterType::Pointer _arg); + SetForwardProjectionFilter(ForwardProjectionFilterType * _arg); /** Pass the geometry to SingleProjectionToFourDFilter */ - virtual void - SetGeometry(GeometryType::Pointer _arg); + itkSetObjectMacro(Geometry, GeometryType); /** Pass the interpolation weights to SingleProjectionToFourDFilter */ void diff --git a/include/rtkFourDToProjectionStackImageFilter.hxx b/include/rtkFourDToProjectionStackImageFilter.hxx index 84b71d33c..00ae3ab67 100644 --- a/include/rtkFourDToProjectionStackImageFilter.hxx +++ b/include/rtkFourDToProjectionStackImageFilter.hxx @@ -74,7 +74,7 @@ FourDToProjectionStackImageFilter::GetInp template void FourDToProjectionStackImageFilter::SetForwardProjectionFilter( - const typename ForwardProjectionFilterType::Pointer _arg) + ForwardProjectionFilterType * _arg) { m_ForwardProjectionFilter = _arg; } @@ -86,13 +86,6 @@ FourDToProjectionStackImageFilter::SetWei m_Weights = _arg; } -template -void -FourDToProjectionStackImageFilter::SetGeometry(GeometryType::Pointer _arg) -{ - m_Geometry = _arg; -} - template void FourDToProjectionStackImageFilter::SetSignal(const std::vector signal) diff --git a/include/rtkGgoFunctions.h b/include/rtkGgoFunctions.h index 156f8250f..02a3687b7 100644 --- a/include/rtkGgoFunctions.h +++ b/include/rtkGgoFunctions.h @@ -47,7 +47,7 @@ namespace rtk */ template void -SetConstantImageSourceFromGgo(typename TConstantImageSourceType::Pointer source, const TArgsInfo & args_info) +SetConstantImageSourceFromGgo(TConstantImageSourceType * source, const TArgsInfo & args_info) { using ImageType = typename TConstantImageSourceType::OutputImageType; @@ -175,7 +175,7 @@ GetProjectionsFileNamesFromGgo(const TArgsInfo & args_info) template void -SetProjectionsReaderFromGgo(typename TProjectionsReaderType::Pointer reader, const TArgsInfo & args_info) +SetProjectionsReaderFromGgo(TProjectionsReaderType * reader, const TArgsInfo & args_info) { const std::vector fileNames = GetProjectionsFileNamesFromGgo(args_info); diff --git a/include/rtkLookupTableImageFilter.h b/include/rtkLookupTableImageFilter.h index 41f329f1f..10f570755 100644 --- a/include/rtkLookupTableImageFilter.h +++ b/include/rtkLookupTableImageFilter.h @@ -65,7 +65,7 @@ class ITK_TEMPLATE_EXPORT LUT return m_LookupTablePointer; } void - SetLookupTable(LookupTablePointer lut) + SetLookupTable(LookupTableType * lut) { m_LookupTablePointer = lut; m_LookupTableDataPointer = lut->GetBufferPointer(); diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h index 78a2e59d0..0aeb5f704 100644 --- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h @@ -159,12 +159,12 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDReconstructionConjugateGradientO /** The forward and back projection filters cannot be set by the user */ void - SetForwardProjectionFilter(const typename Superclass::ForwardProjectionFilterType::Pointer itkNotUsed(_arg)) + SetForwardProjectionFilter(typename Superclass::ForwardProjectionFilterType * itkNotUsed(_arg)) { itkExceptionMacro(<< "ForwardProjection cannot be changed"); } void - SetBackProjectionFilter(const typename Superclass::BackProjectionFilterType::Pointer itkNotUsed(_arg)) + SetBackProjectionFilter(typename Superclass::BackProjectionFilterType * itkNotUsed(_arg)) { itkExceptionMacro(<< "BackProjection cannot be changed"); } diff --git a/include/rtkPolynomialGainCorrectionImageFilter.h b/include/rtkPolynomialGainCorrectionImageFilter.h index 7b2510198..65d17da16 100644 --- a/include/rtkPolynomialGainCorrectionImageFilter.h +++ b/include/rtkPolynomialGainCorrectionImageFilter.h @@ -75,12 +75,12 @@ class ITK_TEMPLATE_EXPORT PolynomialGainCorrectionImageFilter /** Dark image, 2D same size of one input projection */ void - SetDarkImage(const InputImagePointer darkImage); + SetDarkImage(InputImageType * darkImage); /** Weights, matrix A from reference paper * 3D image: 2D x order. */ void - SetGainCoefficients(const OutputImagePointer gain); + SetGainCoefficients(OutputImageType * gain); /* if K==0, the filter is bypassed */ itkSetMacro(K, float); diff --git a/include/rtkPolynomialGainCorrectionImageFilter.hxx b/include/rtkPolynomialGainCorrectionImageFilter.hxx index 8d99a38e9..ae9b80f9c 100644 --- a/include/rtkPolynomialGainCorrectionImageFilter.hxx +++ b/include/rtkPolynomialGainCorrectionImageFilter.hxx @@ -32,14 +32,14 @@ PolynomialGainCorrectionImageFilter::PolynomialGainCo template void -PolynomialGainCorrectionImageFilter::SetDarkImage(const InputImagePointer darkImage) +PolynomialGainCorrectionImageFilter::SetDarkImage(InputImageType * darkImage) { m_DarkImage = darkImage; } template void -PolynomialGainCorrectionImageFilter::SetGainCoefficients(const OutputImagePointer gain) +PolynomialGainCorrectionImageFilter::SetGainCoefficients(OutputImageType * gain) { m_GainImage = gain; } diff --git a/include/rtkProjectionStackToFourDImageFilter.h b/include/rtkProjectionStackToFourDImageFilter.h index 5c1891446..c80028a70 100644 --- a/include/rtkProjectionStackToFourDImageFilter.h +++ b/include/rtkProjectionStackToFourDImageFilter.h @@ -167,7 +167,7 @@ class ITK_TEMPLATE_EXPORT ProjectionStackToFourDImageFilter /** Pass the backprojection filter to SingleProjectionToFourDFilter */ void - SetBackProjectionFilter(const typename BackProjectionFilterType::Pointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); /** Pass the geometry to SingleProjectionToFourDFilter */ itkSetConstObjectMacro(Geometry, GeometryType); diff --git a/include/rtkProjectionStackToFourDImageFilter.hxx b/include/rtkProjectionStackToFourDImageFilter.hxx index 81374765c..b99304836 100644 --- a/include/rtkProjectionStackToFourDImageFilter.hxx +++ b/include/rtkProjectionStackToFourDImageFilter.hxx @@ -73,7 +73,7 @@ ProjectionStackToFourDImageFilter void ProjectionStackToFourDImageFilter::SetBackProjectionFilter( - const typename BackProjectionFilterType::Pointer _arg) + BackProjectionFilterType * _arg) { m_BackProjectionFilter = _arg; this->Modified(); diff --git a/include/rtkReconstructionConjugateGradientOperator.h b/include/rtkReconstructionConjugateGradientOperator.h index 380da7484..f56c78eba 100644 --- a/include/rtkReconstructionConjugateGradientOperator.h +++ b/include/rtkReconstructionConjugateGradientOperator.h @@ -175,11 +175,11 @@ class ITK_TEMPLATE_EXPORT ReconstructionConjugateGradientOperator : public Conju /** Set the backprojection filter*/ void - SetBackProjectionFilter(const BackProjectionFilterPointer _arg); + SetBackProjectionFilter(BackProjectionFilterType * _arg); /** Set the forward projection filter*/ void - SetForwardProjectionFilter(const ForwardProjectionFilterPointer _arg); + SetForwardProjectionFilter(ForwardProjectionFilterType * _arg); /** Set the support mask, if any, for support constraint in reconstruction */ void diff --git a/include/rtkReconstructionConjugateGradientOperator.hxx b/include/rtkReconstructionConjugateGradientOperator.hxx index 43de5c245..4615e27fe 100644 --- a/include/rtkReconstructionConjugateGradientOperator.hxx +++ b/include/rtkReconstructionConjugateGradientOperator.hxx @@ -132,7 +132,7 @@ ReconstructionConjugateGradientOperator void ReconstructionConjugateGradientOperator::SetBackProjectionFilter( - const typename BackProjectionFilterType::Pointer _arg) + BackProjectionFilterType * _arg) { m_BackProjectionFilter = _arg; } @@ -140,7 +140,7 @@ ReconstructionConjugateGradientOperator void ReconstructionConjugateGradientOperator::SetForwardProjectionFilter( - const typename ForwardProjectionFilterType::Pointer _arg) + ForwardProjectionFilterType * _arg) { m_ForwardProjectionFilter = _arg; } diff --git a/include/rtkWarpFourDToProjectionStackImageFilter.h b/include/rtkWarpFourDToProjectionStackImageFilter.h index 07df1dd74..46004343c 100644 --- a/include/rtkWarpFourDToProjectionStackImageFilter.h +++ b/include/rtkWarpFourDToProjectionStackImageFilter.h @@ -144,7 +144,7 @@ class ITK_TEMPLATE_EXPORT WarpFourDToProjectionStackImageFilter /** The forward projection filter cannot be set by the user */ void - SetForwardProjectionFilter(const typename Superclass::ForwardProjectionFilterType::Pointer itkNotUsed(_arg)) + SetForwardProjectionFilter(typename Superclass::ForwardProjectionFilterType * itkNotUsed(_arg)) { itkExceptionMacro(<< "ForwardProjection cannot be changed"); } diff --git a/include/rtkWarpProjectionStackToFourDImageFilter.h b/include/rtkWarpProjectionStackToFourDImageFilter.h index 4e27ab971..f3ad586d9 100644 --- a/include/rtkWarpProjectionStackToFourDImageFilter.h +++ b/include/rtkWarpProjectionStackToFourDImageFilter.h @@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT WarpProjectionStackToFourDImageFilter /** The back projection filter cannot be set by the user */ void - SetBackProjectionFilter(const typename Superclass::BackProjectionFilterType::Pointer itkNotUsed(_arg)) + SetBackProjectionFilter(typename Superclass::BackProjectionFilterType * itkNotUsed(_arg)) { itkExceptionMacro(<< "BackProjection cannot be changed"); }