RTKConsortium · SimonRit · Dec 25, 2024 · Dec 22, 2024
diff --git 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
@@ -66,7 +66,7 @@ ADMMTotalVariationConjugateGradientOperator<TOutputImage,
 template <typename TOutputImage, typename TGradientOutputImage>
 void
 ADMMTotalVariationConjugateGradientOperator<TOutputImage, TGradientOutputImage>::SetBackProjectionFilter(
-  const typename BackProjectionFilterType::Pointer _arg)
+  BackProjectionFilterType * _arg)
 {
   if (m_BackProjectionFilter != _arg)
     this->Modified();
@@ -76,7 +76,7 @@ ADMMTotalVariationConjugateGradientOperator<TOutputImage, TGradientOutputImage>:
 template <typename TOutputImage, typename TGradientOutputImage>
 void
 ADMMTotalVariationConjugateGradientOperator<TOutputImage, TGradientOutputImage>::SetForwardProjectionFilter(
-  const typename ForwardProjectionFilterType::Pointer _arg)
+  ForwardProjectionFilterType * _arg)
 {
   if (m_ForwardProjectionFilter != _arg)
     this->Modified();

diff --git 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
@@ -53,8 +53,7 @@ ADMMWaveletsConjugateGradientOperator<TOutputImage>::ADMMWaveletsConjugateGradie
 
 template <typename TOutputImage>
 void
-ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetBackProjectionFilter(
-  const typename BackProjectionFilterType::Pointer _arg)
+ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetBackProjectionFilter(BackProjectionFilterType * _arg)
 {
   if (m_BackProjectionFilter != _arg)
     this->Modified();
@@ -63,8 +62,7 @@ ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetBackProjectionFilter(
 
 template <typename TOutputImage>
 void
-ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetForwardProjectionFilter(
-  const typename ForwardProjectionFilterType::Pointer _arg)
+ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetForwardProjectionFilter(ForwardProjectionFilterType * _arg)
 {
   if (m_ForwardProjectionFilter != _arg)
     this->Modified();
@@ -74,9 +72,9 @@ ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetForwardProjectionFilter(
 
 template <typename TOutputImage>
 void
-ADMMWaveletsConjugateGradientOperator<TOutputImage>::SetGeometry(const ThreeDCircularProjectionGeometry::Pointer _arg)
+ADMMWaveletsConjugateGradientOperator<TOutputImage>::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
@@ -54,7 +54,6 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter
   using Superclass = itk::InPlaceImageFilter<OutputImageType, OutputImageType>;
   using Pointer = itk::SmartPointer<Self>;
   using ConjugateGradientOperatorType = ConjugateGradientOperator<OutputImageType>;
-  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
@@ -67,7 +67,7 @@ ConjugateGradientImageFilter<OutputImageType>::GetB()
 
 template <typename OutputImageType>
 void
-ConjugateGradientImageFilter<OutputImageType>::SetA(ConjugateGradientOperatorPointerType _arg)
+ConjugateGradientImageFilter<OutputImageType>::SetA(ConjugateGradientOperatorType * _arg)
 {
   this->m_A = _arg;
   this->Modified();

diff --git 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
@@ -159,7 +159,7 @@ FDKConeBeamReconstructionFilter<TInputImage, TOutputImage, TFFTPrecision>::Gener
 template <class TInputImage, class TOutputImage, class TFFTPrecision>
 void
 FDKConeBeamReconstructionFilter<TInputImage, TOutputImage, TFFTPrecision>::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
@@ -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
@@ -77,7 +77,7 @@ FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackTy
 template <typename VolumeSeriesType, typename ProjectionStackType>
 void
 FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackType>::SetBackProjectionFilter(
-  const typename BackProjectionFilterType::Pointer _arg)
+  BackProjectionFilterType * _arg)
 {
   m_BackProjectionFilter = _arg;
   this->Modified();
@@ -86,7 +86,7 @@ FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackTy
 template <typename VolumeSeriesType, typename ProjectionStackType>
 void
 FourDReconstructionConjugateGradientOperator<VolumeSeriesType, ProjectionStackType>::SetForwardProjectionFilter(
-  const typename ForwardProjectionFilterType::Pointer _arg)
+  ForwardProjectionFilterType * _arg)
 {
   m_ForwardProjectionFilter = _arg;
   this->Modified();

diff --git 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
@@ -74,7 +74,7 @@ FourDToProjectionStackImageFilter<ProjectionStackType, VolumeSeriesType>::GetInp
 template <typename ProjectionStackType, typename VolumeSeriesType>
 void
 FourDToProjectionStackImageFilter<ProjectionStackType, VolumeSeriesType>::SetForwardProjectionFilter(
-  const typename ForwardProjectionFilterType::Pointer _arg)
+  ForwardProjectionFilterType * _arg)
 {
   m_ForwardProjectionFilter = _arg;
 }
@@ -86,13 +86,6 @@ FourDToProjectionStackImageFilter<ProjectionStackType, VolumeSeriesType>::SetWei
   m_Weights = _arg;
 }
 
-template <typename ProjectionStackType, typename VolumeSeriesType>
-void
-FourDToProjectionStackImageFilter<ProjectionStackType, VolumeSeriesType>::SetGeometry(GeometryType::Pointer _arg)
-{
-  m_Geometry = _arg;
-}
-
 template <typename VolumeSeriesType, typename ProjectionStackType>
 void
 FourDToProjectionStackImageFilter<VolumeSeriesType, ProjectionStackType>::SetSignal(const std::vector<double> signal)

diff --git a/include/rtkGgoFunctions.h b/include/rtkGgoFunctions.h
@@ -47,7 +47,7 @@ namespace rtk
  */
 template <class TConstantImageSourceType, class TArgsInfo>
 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 <class TProjectionsReaderType, class TArgsInfo>
 void
-SetProjectionsReaderFromGgo(typename TProjectionsReaderType::Pointer reader, const TArgsInfo & args_info)
+SetProjectionsReaderFromGgo(TProjectionsReaderType * reader, const TArgsInfo & args_info)
 {
   const std::vector<std::string> fileNames = GetProjectionsFileNamesFromGgo(args_info);
 

diff --git 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
@@ -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
@@ -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
@@ -32,14 +32,14 @@ PolynomialGainCorrectionImageFilter<TInputImage, TOutputImage>::PolynomialGainCo
 
 template <class TInputImage, class TOutputImage>
 void
-PolynomialGainCorrectionImageFilter<TInputImage, TOutputImage>::SetDarkImage(const InputImagePointer darkImage)
+PolynomialGainCorrectionImageFilter<TInputImage, TOutputImage>::SetDarkImage(InputImageType * darkImage)
 {
   m_DarkImage = darkImage;
 }
 
 template <class TInputImage, class TOutputImage>
 void
-PolynomialGainCorrectionImageFilter<TInputImage, TOutputImage>::SetGainCoefficients(const OutputImagePointer gain)
+PolynomialGainCorrectionImageFilter<TInputImage, TOutputImage>::SetGainCoefficients(OutputImageType * gain)
 {
   m_GainImage = gain;
 }

diff --git 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
@@ -73,7 +73,7 @@ ProjectionStackToFourDImageFilter<VolumeSeriesType, ProjectionStackType, TFFTPre
 template <typename VolumeSeriesType, typename ProjectionStackType, typename TFFTPrecision>
 void
 ProjectionStackToFourDImageFilter<VolumeSeriesType, ProjectionStackType, TFFTPrecision>::SetBackProjectionFilter(
-  const typename BackProjectionFilterType::Pointer _arg)
+  BackProjectionFilterType * _arg)
 {
   m_BackProjectionFilter = _arg;
   this->Modified();

diff --git 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
@@ -132,15 +132,15 @@ ReconstructionConjugateGradientOperator<TOutputImage, TSingleComponentImage, TWe
 template <typename TOutputImage, typename TSingleComponentImage, typename TWeightsImage>
 void
 ReconstructionConjugateGradientOperator<TOutputImage, TSingleComponentImage, TWeightsImage>::SetBackProjectionFilter(
-  const typename BackProjectionFilterType::Pointer _arg)
+  BackProjectionFilterType * _arg)
 {
   m_BackProjectionFilter = _arg;
 }
 
 template <typename TOutputImage, typename TSingleComponentImage, typename TWeightsImage>
 void
 ReconstructionConjugateGradientOperator<TOutputImage, TSingleComponentImage, TWeightsImage>::SetForwardProjectionFilter(
-  const typename ForwardProjectionFilterType::Pointer _arg)
+  ForwardProjectionFilterType * _arg)
 {
   m_ForwardProjectionFilter = _arg;
 }

diff --git 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
@@ -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");
   }