diff --git a/documentation/Doxygen/doxygen.config.in b/documentation/Doxygen/doxygen.config.in index c67b0921b..44ff57f31 100644 --- a/documentation/Doxygen/doxygen.config.in +++ b/documentation/Doxygen/doxygen.config.in @@ -2148,9 +2148,9 @@ PREDEFINED = "itkNotUsed(x)=" \ "itkSimpleNewMacro(type)= static Pointer New();" \ "itkCreateAnotherMacro(type)= virtual::itk::LightObject::Pointer CreateAnother() const;" \ "itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;" \ - "itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;" \ + "itkOverrideGetNameOfClassMacro(thisClass)= const char * GetNameOfClass() const override;" \ "itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};" \ - "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp( const char *file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } newexcp( const std::string & file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } itkTypeMacro( newexcp, , parentexcp); }; }" \ + "itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp( const char *file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } newexcp( const std::string & file, unsigned int lineNumber ) : parentexcp( file, lineNumber ) { this->SetDescription( whatmessage ); } itkOverrideGetNameOfClassMacro( newexcp ); }; }" \ "itkConceptMacro(thisName,thisConcept)= /* This class requires thisName in the form of thisConcept */" \ "std::numeric_limits= std::numeric_limits" \ "ITK_TYPENAME= typename" \ diff --git a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h index 9d9d9d2f3..de03f7650 100644 --- a/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h +++ b/include/rtkADMMTotalVariationConeBeamReconstructionFilter.h @@ -152,11 +152,7 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConeBeamReconstructionFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ADMMTotalVariationConeBeamReconstructionFilter); -#else - itkTypeMacro(ADMMTotalVariationConeBeamReconstructionFilter, IterativeConeBeamReconstructionFilter); -#endif using ForwardProjectionFilterType = rtk::ForwardProjectionImageFilter; using ForwardProjectionFilterPointer = typename ForwardProjectionFilterType::Pointer; diff --git a/include/rtkADMMTotalVariationConjugateGradientOperator.h b/include/rtkADMMTotalVariationConjugateGradientOperator.h index 63cc4de43..bd2315866 100644 --- a/include/rtkADMMTotalVariationConjugateGradientOperator.h +++ b/include/rtkADMMTotalVariationConjugateGradientOperator.h @@ -118,11 +118,7 @@ class ITK_TEMPLATE_EXPORT ADMMTotalVariationConjugateGradientOperator : public C itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ADMMTotalVariationConjugateGradientOperator); -#else - itkTypeMacro(ADMMTotalVariationConjugateGradientOperator, ConjugateGradientOperator); -#endif using BackProjectionFilterType = rtk::BackProjectionImageFilter; using BackProjectionFilterPointer = typename BackProjectionFilterType::Pointer; diff --git a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h index 2fcf86715..eee0fcca5 100644 --- a/include/rtkADMMWaveletsConeBeamReconstructionFilter.h +++ b/include/rtkADMMWaveletsConeBeamReconstructionFilter.h @@ -155,11 +155,7 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConeBeamReconstructionFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ADMMWaveletsConeBeamReconstructionFilter); -#else - itkTypeMacro(ADMMWaveletsConeBeamReconstructionFilter, itk::ImageToImageFilter); -#endif // /** The 3D image to be updated */ // void SetInputVolume(const TOutputImage* Volume); diff --git a/include/rtkADMMWaveletsConjugateGradientOperator.h b/include/rtkADMMWaveletsConjugateGradientOperator.h index b15282499..06a1c37af 100644 --- a/include/rtkADMMWaveletsConjugateGradientOperator.h +++ b/include/rtkADMMWaveletsConjugateGradientOperator.h @@ -109,11 +109,7 @@ class ITK_TEMPLATE_EXPORT ADMMWaveletsConjugateGradientOperator : public Conjuga itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ADMMWaveletsConjugateGradientOperator); -#else - itkTypeMacro(ADMMWaveletsConjugateGradientOperator, ConjugateGradientOperator); -#endif using BackProjectionFilterType = rtk::BackProjectionImageFilter; using BackProjectionFilterPointer = typename BackProjectionFilterType::Pointer; diff --git a/include/rtkAddMatrixAndDiagonalImageFilter.h b/include/rtkAddMatrixAndDiagonalImageFilter.h index 57105438a..f4c5d8c3b 100644 --- a/include/rtkAddMatrixAndDiagonalImageFilter.h +++ b/include/rtkAddMatrixAndDiagonalImageFilter.h @@ -55,11 +55,7 @@ class ITK_TEMPLATE_EXPORT AddMatrixAndDiagonalImageFilter : public itk::ImageToI itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(AddMatrixAndDiagonalImageFilter); -#else - itkTypeMacro(AddMatrixAndDiagonalImageFilter, itk::ImageToImageFilter); -#endif /** Convenient parameters extracted from template types */ static constexpr unsigned int nChannels = TDiagonal::PixelType::Dimension; diff --git a/include/rtkAdditiveGaussianNoiseImageFilter.h b/include/rtkAdditiveGaussianNoiseImageFilter.h index db72b7623..dde51c4a1 100644 --- a/include/rtkAdditiveGaussianNoiseImageFilter.h +++ b/include/rtkAdditiveGaussianNoiseImageFilter.h @@ -183,11 +183,7 @@ class ITK_TEMPLATE_EXPORT AdditiveGaussianNoiseImageFilter : public itk::ImageTo itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(AdditiveGaussianNoiseImageFilter); -#else - itkTypeMacro(AdditiveGaussianNoiseImageFilter, ImageToImageFilter); -#endif /** Superclass type alias. */ using OutputImageRegionType = typename Superclass::OutputImageRegionType; diff --git a/include/rtkAmsterdamShroudImageFilter.h b/include/rtkAmsterdamShroudImageFilter.h index f8a72d90d..0f7ca0da8 100644 --- a/include/rtkAmsterdamShroudImageFilter.h +++ b/include/rtkAmsterdamShroudImageFilter.h @@ -125,11 +125,7 @@ class ITK_TEMPLATE_EXPORT AmsterdamShroudImageFilter itkSetMacro(Corner2, PointType); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(AmsterdamShroudImageFilter); -#else - itkTypeMacro(AmsterdamShroudImageFilter, itk::ImageToImageFilter); -#endif protected: AmsterdamShroudImageFilter(); diff --git a/include/rtkAverageOutOfROIImageFilter.h b/include/rtkAverageOutOfROIImageFilter.h index 3639bd66d..20276914b 100644 --- a/include/rtkAverageOutOfROIImageFilter.h +++ b/include/rtkAverageOutOfROIImageFilter.h @@ -64,11 +64,7 @@ class ITK_TEMPLATE_EXPORT AverageOutOfROIImageFilter : public itk::InPlaceImageF itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(AverageOutOfROIImageFilter); -#else - itkTypeMacro(AverageOutOfROIImageFilter, itk::InPlaceImageFilter); -#endif /** The image containing the weights applied to the temporal components */ void diff --git a/include/rtkBackProjectionImageFilter.h b/include/rtkBackProjectionImageFilter.h index 8973678de..00b8e8b8f 100644 --- a/include/rtkBackProjectionImageFilter.h +++ b/include/rtkBackProjectionImageFilter.h @@ -71,11 +71,7 @@ class ITK_TEMPLATE_EXPORT BackProjectionImageFilter : public itk::InPlaceImageFi itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BackProjectionImageFilter); -#else - itkTypeMacro(BackProjectionImageFilter, itk::ImageToImageFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetConstObjectMacro(Geometry, GeometryType); diff --git a/include/rtkBackwardDifferenceDivergenceImageFilter.h b/include/rtkBackwardDifferenceDivergenceImageFilter.h index b3b90f99f..cdc743611 100644 --- a/include/rtkBackwardDifferenceDivergenceImageFilter.h +++ b/include/rtkBackwardDifferenceDivergenceImageFilter.h @@ -59,11 +59,7 @@ class ITK_TEMPLATE_EXPORT BackwardDifferenceDivergenceImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BackwardDifferenceDivergenceImageFilter); -#else - itkTypeMacro(BackwardDifferenceDivergenceImageFilter, ImageToImageFilter); -#endif /** Use the image spacing information in calculations. Use this option if you * want derivatives in physical space. Default is UseImageSpacingOn. */ diff --git a/include/rtkBioscanGeometryReader.h b/include/rtkBioscanGeometryReader.h index be78a0d65..a5152a75f 100644 --- a/include/rtkBioscanGeometryReader.h +++ b/include/rtkBioscanGeometryReader.h @@ -64,11 +64,7 @@ class RTK_EXPORT BioscanGeometryReader : public itk::LightProcessObject using GeometryPointer = GeometryType::Pointer; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BioscanGeometryReader); -#else - itkTypeMacro(BioscanGeometryReader, itk::LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h index ee3b89d3c..01cdeea05 100644 --- a/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h +++ b/include/rtkBlockDiagonalMatrixVectorMultiplyImageFilter.h @@ -51,11 +51,7 @@ class ITK_TEMPLATE_EXPORT BlockDiagonalMatrixVectorMultiplyImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BlockDiagonalMatrixVectorMultiplyImageFilter); -#else - itkTypeMacro(BlockDiagonalMatrixVectorMultiplyImageFilter, itk::ImageToImageFilter); -#endif /** Convenient parameters extracted from template types */ static constexpr unsigned int nChannels = TVectorImage::PixelType::Dimension; diff --git a/include/rtkBoellaardScatterCorrectionImageFilter.h b/include/rtkBoellaardScatterCorrectionImageFilter.h index 8b3ad5d6d..354094991 100644 --- a/include/rtkBoellaardScatterCorrectionImageFilter.h +++ b/include/rtkBoellaardScatterCorrectionImageFilter.h @@ -58,11 +58,7 @@ class ITK_TEMPLATE_EXPORT BoellaardScatterCorrectionImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BoellaardScatterCorrectionImageFilter); -#else - itkTypeMacro(BoellaardScatterCorrectionImageFilter, itk::ImageToImageFilter); -#endif /** Get / Set the air threshold on projection images. The threshold is used to ** evaluate which part of the x-rays have traversed the patient. */ diff --git a/include/rtkBoxShape.h b/include/rtkBoxShape.h index c64cd257f..9298fa38e 100644 --- a/include/rtkBoxShape.h +++ b/include/rtkBoxShape.h @@ -62,11 +62,7 @@ class RTK_EXPORT BoxShape : public ConvexShape itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(BoxShape); -#else - itkTypeMacro(BoxShape, ConvexShape); -#endif /** See rtk::ConvexShape::IsInside. */ bool diff --git a/include/rtkConditionalMedianImageFilter.h b/include/rtkConditionalMedianImageFilter.h index 79b2a4b11..9c8803333 100644 --- a/include/rtkConditionalMedianImageFilter.h +++ b/include/rtkConditionalMedianImageFilter.h @@ -61,11 +61,7 @@ class ITK_TEMPLATE_EXPORT ConditionalMedianImageFilter : public itk::InPlaceImag itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConditionalMedianImageFilter); -#else - itkTypeMacro(ConditionalMedianImageFilter, itk::InPlaceImageFilter); -#endif /** Set/Get neighborhood radius */ itkSetMacro(Radius, MedianRadiusType); diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h index eb8c919db..e91e9c8ca 100644 --- a/include/rtkConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkConjugateGradientConeBeamReconstructionFilter.h @@ -122,11 +122,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientConeBeamReconstructionFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientConeBeamReconstructionFilter); -#else - itkTypeMacro(ConjugateGradientConeBeamReconstructionFilter, itk::ImageToImageFilter); -#endif /** Setters for the inputs */ void diff --git a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h index d3f49ee7f..bb0678aec 100644 --- a/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetP_kPlusOneImageFilter.h @@ -49,11 +49,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetP_kPlusOneImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientGetP_kPlusOneImageFilter); -#else - itkTypeMacro(ConjugateGradientGetP_kPlusOneImageFilter, itk::ImageToImageFilter); -#endif /** Functions to set the inputs */ void diff --git a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h index ce8d1ac7e..2b0351a1e 100644 --- a/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetR_kPlusOneImageFilter.h @@ -50,11 +50,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetR_kPlusOneImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientGetR_kPlusOneImageFilter); -#else - itkTypeMacro(ConjugateGradientGetR_kPlusOneImageFilter, itk::ImageToImageFilter); -#endif /** Functions to set the inputs */ void diff --git a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h index 7323a02e0..798ea1f7e 100644 --- a/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h +++ b/include/rtkConjugateGradientGetX_kPlusOneImageFilter.h @@ -49,11 +49,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientGetX_kPlusOneImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientGetX_kPlusOneImageFilter); -#else - itkTypeMacro(ConjugateGradientGetX_kPlusOneImageFilter, itk::ImageToImageFilter); -#endif /** Functions to set the inputs */ void diff --git a/include/rtkConjugateGradientImageFilter.h b/include/rtkConjugateGradientImageFilter.h index bb66510a9..8b4a25a1e 100644 --- a/include/rtkConjugateGradientImageFilter.h +++ b/include/rtkConjugateGradientImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientImageFilter); -#else - itkTypeMacro(ConjugateGradientImageFilter, itk::InPlaceImageFilter); -#endif /** Get and Set macro*/ itkGetMacro(NumberOfIterations, int); diff --git a/include/rtkConjugateGradientOperator.h b/include/rtkConjugateGradientOperator.h index 50f40583a..1663b49db 100644 --- a/include/rtkConjugateGradientOperator.h +++ b/include/rtkConjugateGradientOperator.h @@ -43,11 +43,7 @@ class ITK_TEMPLATE_EXPORT ConjugateGradientOperator : public itk::ImageToImageFi itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ConjugateGradientOperator); -#else - itkTypeMacro(ConjugateGradientOperator, itk::ImageToImageFilter); -#endif /** The image to be updated.*/ virtual void diff --git a/include/rtkConstantImageSource.h b/include/rtkConstantImageSource.h index 5ea7a3f01..1b6c4be38 100644 --- a/include/rtkConstantImageSource.h +++ b/include/rtkConstantImageSource.h @@ -69,11 +69,7 @@ class ITK_TEMPLATE_EXPORT ConstantImageSource : public itk::ImageSource; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DaubechiesWaveletsConvolutionImageFilter); -#else - itkTypeMacro(DaubechiesWaveletsConvolutionImageFilter, itk::ImageSource); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h index 7934c28ca..92ccffeb5 100644 --- a/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h +++ b/include/rtkDaubechiesWaveletsDenoiseSequenceImageFilter.h @@ -86,11 +86,7 @@ class ITK_TEMPLATE_EXPORT DaubechiesWaveletsDenoiseSequenceImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DaubechiesWaveletsDenoiseSequenceImageFilter); -#else - itkTypeMacro(DaubechiesWaveletsDenoiseSequenceImageFilter, ImageToImageFilter); -#endif /** Set the number of levels of the deconstruction and reconstruction */ itkGetMacro(NumberOfLevels, unsigned int); diff --git a/include/rtkDePierroRegularizationImageFilter.h b/include/rtkDePierroRegularizationImageFilter.h index b36b1d11e..a347d3200 100644 --- a/include/rtkDePierroRegularizationImageFilter.h +++ b/include/rtkDePierroRegularizationImageFilter.h @@ -112,11 +112,7 @@ class ITK_TEMPLATE_EXPORT DePierroRegularizationImageFilter : public itk::ImageT itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DePierroRegularizationImageFilter); -#else - itkTypeMacro(DePierroRegularizationImageFilter, itk::ImageToImageFilter); -#endif /** Get / Set the hyper parameter for the regularization */ itkGetMacro(Beta, double); diff --git a/include/rtkDeconstructImageFilter.h b/include/rtkDeconstructImageFilter.h index 87b6f366e..d5d2a07e4 100644 --- a/include/rtkDeconstructImageFilter.h +++ b/include/rtkDeconstructImageFilter.h @@ -140,11 +140,7 @@ class ITK_TEMPLATE_EXPORT DeconstructImageFilter : public itk::ImageToImageFilte itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DeconstructImageFilter); -#else - itkTypeMacro(DeconstructImageFilter, ImageToImageFilter); -#endif /** ImageDimension enumeration. */ static constexpr unsigned int ImageDimension = TImage::ImageDimension; diff --git a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h index 658f154a1..02738d568 100644 --- a/include/rtkDeconstructSoftThresholdReconstructImageFilter.h +++ b/include/rtkDeconstructSoftThresholdReconstructImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT DeconstructSoftThresholdReconstructImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DeconstructSoftThresholdReconstructImageFilter); -#else - itkTypeMacro(DeconstructSoftThresholdReconstructImageFilter, ImageToImageFilter); -#endif /** ImageDimension enumeration. */ static constexpr unsigned int ImageDimension = TImage::ImageDimension; diff --git a/include/rtkDenoisingBPDQImageFilter.h b/include/rtkDenoisingBPDQImageFilter.h index 9cda5a26e..9c5df2e5e 100644 --- a/include/rtkDenoisingBPDQImageFilter.h +++ b/include/rtkDenoisingBPDQImageFilter.h @@ -53,11 +53,7 @@ class ITK_TEMPLATE_EXPORT DenoisingBPDQImageFilter : public itk::InPlaceImageFil itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DenoisingBPDQImageFilter); -#else - itkTypeMacro(DenoisingBPDQImageFilter, ImageToImageFilter); -#endif /** Sub filter type definitions */ typedef ForwardDifferenceGradientImageFilter; using ConstPointer = itk::SmartPointer; itkNewMacro(Self); -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(DualEnergyNegativeLogLikelihood); -#else - itkTypeMacro(DualEnergyNegativeLogLikelihood, rtk::ProjectionsDecompositionNegativeLogLikelihood); -#endif using ParametersType = Superclass::ParametersType; using DerivativeType = Superclass::DerivativeType; diff --git a/include/rtkEdfImageIO.h b/include/rtkEdfImageIO.h index 54d3f3317..17e059fde 100644 --- a/include/rtkEdfImageIO.h +++ b/include/rtkEdfImageIO.h @@ -55,11 +55,7 @@ class RTK_EXPORT EdfImageIO : public itk::ImageIOBase itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(EdfImageIO); -#else - itkTypeMacro(EdfImageIO, ImageIOBase); -#endif /*-------- This part of the interface deals with reading data. ------ */ void diff --git a/include/rtkEdfImageIOFactory.h b/include/rtkEdfImageIOFactory.h index 54fac5fb4..614f250cb 100644 --- a/include/rtkEdfImageIOFactory.h +++ b/include/rtkEdfImageIOFactory.h @@ -63,11 +63,7 @@ class RTK_EXPORT EdfImageIOFactory : public itk::ObjectFactoryBase itkFactorylessNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(EdfImageIOFactory); -#else - itkTypeMacro(EdfImageIOFactory, ObjectFactoryBase); -#endif /** Register one factory of this type */ static void diff --git a/include/rtkEdfRawToAttenuationImageFilter.h b/include/rtkEdfRawToAttenuationImageFilter.h index 82fd8a145..a66d86ec9 100644 --- a/include/rtkEdfRawToAttenuationImageFilter.h +++ b/include/rtkEdfRawToAttenuationImageFilter.h @@ -58,11 +58,7 @@ class ITKIOImageBase_HIDDEN EdfRawToAttenuationImageFilter : public itk::ImageTo itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(EdfRawToAttenuationImageFilter); -#else - itkTypeMacro(EdfRawToAttenuationImageFilter, itk::ImageToImageFilter); -#endif /** Set the vector of strings that contains the file names. Files * are processed in sequential order. */ diff --git a/include/rtkElektaSynergyGeometryReader.h b/include/rtkElektaSynergyGeometryReader.h index 773efc772..2117cdb4d 100644 --- a/include/rtkElektaSynergyGeometryReader.h +++ b/include/rtkElektaSynergyGeometryReader.h @@ -50,11 +50,7 @@ class RTK_EXPORT ElektaSynergyGeometryReader : public itk::LightProcessObject using GeometryType = ThreeDCircularProjectionGeometry; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ElektaSynergyGeometryReader); -#else - itkTypeMacro(ElektaSynergyGeometryReader, LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkElektaSynergyLookupTableImageFilter.h b/include/rtkElektaSynergyLookupTableImageFilter.h index 472ec599c..66ddf6937 100644 --- a/include/rtkElektaSynergyLookupTableImageFilter.h +++ b/include/rtkElektaSynergyLookupTableImageFilter.h @@ -59,11 +59,7 @@ class ITK_TEMPLATE_EXPORT ElektaSynergyLookupTableImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ElektaSynergyLookupTableImageFilter); -#else - itkTypeMacro(ElektaSynergyLookupTableImageFilter, LookupTableImageFilter); -#endif protected: ElektaSynergyLookupTableImageFilter(); diff --git a/include/rtkElektaSynergyRawLookupTableImageFilter.h b/include/rtkElektaSynergyRawLookupTableImageFilter.h index b58d3b086..d9d6d4f6f 100644 --- a/include/rtkElektaSynergyRawLookupTableImageFilter.h +++ b/include/rtkElektaSynergyRawLookupTableImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT ElektaSynergyRawLookupTableImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ElektaSynergyRawLookupTableImageFilter); -#else - itkTypeMacro(ElektaSynergyRawLookupTableImageFilter, LookupTableImageFilter); -#endif #ifdef ITK_USE_CONCEPT_CHECKING // Begin concept checking diff --git a/include/rtkElektaXVI5GeometryXMLFileReader.h b/include/rtkElektaXVI5GeometryXMLFileReader.h index 5e3da3b67..012607b30 100644 --- a/include/rtkElektaXVI5GeometryXMLFileReader.h +++ b/include/rtkElektaXVI5GeometryXMLFileReader.h @@ -61,11 +61,7 @@ class RTK_EXPORT ElektaXVI5GeometryXMLFileReader : public itk::XMLReader; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(GlobalResourceProbe); -#else - itkTypeMacro(GlobalResourceProbe, itk::Object); -#endif /** This is a singleton pattern New. There will only be ONE * reference to a GlobalResourceProbe object per process. Clients that diff --git a/include/rtkHilbertImageFilter.h b/include/rtkHilbertImageFilter.h index ba133d604..24341de48 100644 --- a/include/rtkHilbertImageFilter.h +++ b/include/rtkHilbertImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT HilbertImageFilter : public itk::ImageToImageFilter; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ImagXXMLFileReader); -#else - itkTypeMacro(ImagXXMLFileReader, itk::XMLReader); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkImageToVectorImageFilter.h b/include/rtkImageToVectorImageFilter.h index 4de796d4e..c8f939687 100644 --- a/include/rtkImageToVectorImageFilter.h +++ b/include/rtkImageToVectorImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT ImageToVectorImageFilter : public itk::ImageToImageFil itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ImageToVectorImageFilter); -#else - itkTypeMacro(ImageToVectorImageFilter, itk::ImageToImageFilter); -#endif /** When the input and output dimensions are equal, the filter * cannot guess the number of channels. Set/Get methods to diff --git a/include/rtkImportImageFilter.h b/include/rtkImportImageFilter.h index f823b1e0e..2a644c4f6 100644 --- a/include/rtkImportImageFilter.h +++ b/include/rtkImportImageFilter.h @@ -61,11 +61,7 @@ class ITK_TEMPLATE_EXPORT ImportImageFilter : public itk::ImageSource itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ImportImageFilter); -#else - itkTypeMacro(ImportImageFilter, ImageSource); -#endif /** Index type alias support. An index is used to access pixel values. */ using IndexType = itk::Index; diff --git a/include/rtkInterpolatorWithKnownWeightsImageFilter.h b/include/rtkInterpolatorWithKnownWeightsImageFilter.h index 3b2d02603..a33a58ade 100644 --- a/include/rtkInterpolatorWithKnownWeightsImageFilter.h +++ b/include/rtkInterpolatorWithKnownWeightsImageFilter.h @@ -76,11 +76,7 @@ class ITK_TEMPLATE_EXPORT InterpolatorWithKnownWeightsImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(InterpolatorWithKnownWeightsImageFilter); -#else - itkTypeMacro(InterpolatorWithKnownWeightsImageFilter, itk::InPlaceImageFilter); -#endif /** The 3D image to be updated.*/ void diff --git a/include/rtkIntersectionOfConvexShapes.h b/include/rtkIntersectionOfConvexShapes.h index fa2fdc1fd..c5663c3ff 100644 --- a/include/rtkIntersectionOfConvexShapes.h +++ b/include/rtkIntersectionOfConvexShapes.h @@ -57,11 +57,7 @@ class RTK_EXPORT IntersectionOfConvexShapes : public ConvexShape itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(IntersectionOfConvexShapes); -#else - itkTypeMacro(IntersectionOfConvexShapes, ConvexShape); -#endif /** See rtk::ConvexShape::IsInside. */ bool diff --git a/include/rtkIterativeConeBeamReconstructionFilter.h b/include/rtkIterativeConeBeamReconstructionFilter.h index ca78a273a..83d2c8f8b 100644 --- a/include/rtkIterativeConeBeamReconstructionFilter.h +++ b/include/rtkIterativeConeBeamReconstructionFilter.h @@ -96,11 +96,7 @@ class ITK_TEMPLATE_EXPORT IterativeConeBeamReconstructionFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(IterativeConeBeamReconstructionFilter); -#else - itkTypeMacro(IterativeConeBeamReconstructionFilter, itk::ImageToImageFilter); -#endif /** Accessors to forward and backprojection types. */ virtual void diff --git a/include/rtkIterativeFDKConeBeamReconstructionFilter.h b/include/rtkIterativeFDKConeBeamReconstructionFilter.h index 92597a7eb..6dc70a2f8 100644 --- a/include/rtkIterativeFDKConeBeamReconstructionFilter.h +++ b/include/rtkIterativeFDKConeBeamReconstructionFilter.h @@ -138,11 +138,7 @@ class ITK_TEMPLATE_EXPORT IterativeFDKConeBeamReconstructionFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(IterativeFDKConeBeamReconstructionFilter); -#else - itkTypeMacro(IterativeFDKConeBeamReconstructionFilter, IterativeConeBeamReconstructionFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(Geometry, ThreeDCircularProjectionGeometry); diff --git a/include/rtkJosephBackAttenuatedProjectionImageFilter.h b/include/rtkJosephBackAttenuatedProjectionImageFilter.h index a853ae10f..a6cfa2c63 100644 --- a/include/rtkJosephBackAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephBackAttenuatedProjectionImageFilter.h @@ -238,11 +238,7 @@ class ITK_TEMPLATE_EXPORT JosephBackAttenuatedProjectionImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(JosephBackAttenuatedProjectionImageFilter); -#else - itkTypeMacro(JosephBackAttenuatedProjectionImageFilter, JosephBackProjectionImageFilter); -#endif protected: JosephBackAttenuatedProjectionImageFilter(); diff --git a/include/rtkJosephBackProjectionImageFilter.h b/include/rtkJosephBackProjectionImageFilter.h index 24d165fca..66bf1554c 100644 --- a/include/rtkJosephBackProjectionImageFilter.h +++ b/include/rtkJosephBackProjectionImageFilter.h @@ -183,11 +183,7 @@ class ITK_TEMPLATE_EXPORT JosephBackProjectionImageFilter : public BackProjectio itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(JosephBackProjectionImageFilter); -#else - itkTypeMacro(JosephBackProjectionImageFilter, BackProjectionImageFilter); -#endif /** Get/Set the functor that is used to multiply each interpolation value with a volume value */ TInterpolationWeightMultiplication & diff --git a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h index 002cba882..38a4676e4 100644 --- a/include/rtkJosephForwardAttenuatedProjectionImageFilter.h +++ b/include/rtkJosephForwardAttenuatedProjectionImageFilter.h @@ -294,11 +294,7 @@ class ITK_TEMPLATE_EXPORT JosephForwardAttenuatedProjectionImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(JosephForwardAttenuatedProjectionImageFilter); -#else - itkTypeMacro(JosephForwardAttenuatedProjectionImageFilter, JosephForwardProjectionImageFilter); -#endif protected: JosephForwardAttenuatedProjectionImageFilter(); diff --git a/include/rtkJosephForwardProjectionImageFilter.h b/include/rtkJosephForwardProjectionImageFilter.h index 5992d598b..172e2c81f 100644 --- a/include/rtkJosephForwardProjectionImageFilter.h +++ b/include/rtkJosephForwardProjectionImageFilter.h @@ -193,11 +193,7 @@ class ITK_TEMPLATE_EXPORT JosephForwardProjectionImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(JosephForwardProjectionImageFilter); -#else - itkTypeMacro(JosephForwardProjectionImageFilter, ForwardProjectionImageFilter); -#endif /** Get/Set the functor that is used to multiply each interpolation value with a volume value */ TInterpolationWeightMultiplication & diff --git a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h index 3a072b4b7..336fa2ce1 100644 --- a/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h +++ b/include/rtkLUTbasedVariableI0RawToAttenuationImageFilter.h @@ -98,11 +98,7 @@ class ITK_TEMPLATE_EXPORT LUTbasedVariableI0RawToAttenuationImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(LUTbasedVariableI0RawToAttenuationImageFilter); -#else - itkTypeMacro(LUTbasedVariableI0RawToAttenuationImageFilter, LookupTableImageFilter); -#endif /** Air level I0 */ diff --git a/include/rtkLagCorrectionImageFilter.h b/include/rtkLagCorrectionImageFilter.h index c533ce9c6..3564e4654 100644 --- a/include/rtkLagCorrectionImageFilter.h +++ b/include/rtkLagCorrectionImageFilter.h @@ -67,11 +67,7 @@ class ITK_TEMPLATE_EXPORT LagCorrectionImageFilter : public itk::InPlaceImageFil itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(LagCorrectionImageFilter); -#else - itkTypeMacro(LagCorrectionImageFilter, ImageToImageFilter); -#endif using ImageRegionType = typename TImage::RegionType; using ImageSizeType = typename TImage::SizeType; diff --git a/include/rtkLaplacianImageFilter.h b/include/rtkLaplacianImageFilter.h index 92bf463b9..3879c1c4c 100644 --- a/include/rtkLaplacianImageFilter.h +++ b/include/rtkLaplacianImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT LaplacianImageFilter : public itk::ImageToImageFilter< itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(LaplacianImageFilter); -#else - itkTypeMacro(LaplacianImageFilter, itk::ImageToImageFilter); -#endif void SetWeights(const TOutputImage * weights); diff --git a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h index 44493fc14..b8dee1acc 100644 --- a/include/rtkLastDimensionL0GradientDenoisingImageFilter.h +++ b/include/rtkLastDimensionL0GradientDenoisingImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT LastDimensionL0GradientDenoisingImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(LastDimensionL0GradientDenoisingImageFilter); -#else - itkTypeMacro(LastDimensionL0GradientDenoisingImageFilter, itk::InPlaceImageFilter); -#endif /** Get / Set the threshold. Default is 0.001 */ itkGetMacro(Lambda, double); diff --git a/include/rtkLookupTableImageFilter.h b/include/rtkLookupTableImageFilter.h index 10f570755..37d6a23c8 100644 --- a/include/rtkLookupTableImageFilter.h +++ b/include/rtkLookupTableImageFilter.h @@ -163,11 +163,7 @@ class ITK_TEMPLATE_EXPORT LookupTableImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(LookupTableImageFilter); -#else - itkTypeMacro(LookupTableImageFilter, itk::UnaryFunctorImageFilter); -#endif /** Set lookup table. */ virtual void diff --git a/include/rtkMagnitudeThresholdImageFilter.h b/include/rtkMagnitudeThresholdImageFilter.h index 1f6d86879..e10eeb7be 100644 --- a/include/rtkMagnitudeThresholdImageFilter.h +++ b/include/rtkMagnitudeThresholdImageFilter.h @@ -52,11 +52,7 @@ class ITK_TEMPLATE_EXPORT MagnitudeThresholdImageFilter : public itk::InPlaceIma itkNewMacro(Self); /** Run-time type information (and related methods) */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MagnitudeThresholdImageFilter); -#else - itkTypeMacro(MagnitudeThresholdImageFilter, itk::ImageToImageFilter); -#endif /** Extract some information from the image types. Dimensionality * of the two images is assumed to be the same. */ diff --git a/include/rtkMaskCollimationImageFilter.h b/include/rtkMaskCollimationImageFilter.h index 584939e7d..e3cbb65a3 100644 --- a/include/rtkMaskCollimationImageFilter.h +++ b/include/rtkMaskCollimationImageFilter.h @@ -57,11 +57,7 @@ class ITK_TEMPLATE_EXPORT MaskCollimationImageFilter : public itk::InPlaceImageF itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MaskCollimationImageFilter); -#else - itkTypeMacro(MaskCollimationImageFilter, itk::ImageToImageFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(Geometry, GeometryType); diff --git a/include/rtkMaximumIntensityProjectionImageFilter.h b/include/rtkMaximumIntensityProjectionImageFilter.h index a9b3df1f6..96d3a6830 100644 --- a/include/rtkMaximumIntensityProjectionImageFilter.h +++ b/include/rtkMaximumIntensityProjectionImageFilter.h @@ -152,11 +152,7 @@ class ITK_TEMPLATE_EXPORT MaximumIntensityProjectionImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MaximumIntensityProjectionImageFilter); -#else - itkTypeMacro(MaximumIntensityProjectionImageFilter, JosephForwardProjectionImageFilter); -#endif protected: MaximumIntensityProjectionImageFilter() = default; diff --git a/include/rtkMechlemOneStepSpectralReconstructionFilter.h b/include/rtkMechlemOneStepSpectralReconstructionFilter.h index 46d159182..78efe61c8 100644 --- a/include/rtkMechlemOneStepSpectralReconstructionFilter.h +++ b/include/rtkMechlemOneStepSpectralReconstructionFilter.h @@ -165,11 +165,7 @@ class ITK_TEMPLATE_EXPORT MechlemOneStepSpectralReconstructionFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MechlemOneStepSpectralReconstructionFilter); -#else - itkTypeMacro(MechlemOneStepSpectralReconstructionFilter, itk::ImageToImageFilter); -#endif /** Internal type alias and parameters */ static constexpr unsigned int nBins = TPhotonCounts::PixelType::Dimension; diff --git a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h index d78d0d069..9092f3f8d 100644 --- a/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter.h @@ -111,12 +111,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDConjugateGradientConeBeamReconst itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter); -#else - itkTypeMacro(MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter, - FourDConjugateGradientConeBeamReconstructionFilter); -#endif /** Neither the Forward nor the Back projection filters can be set by the user */ void diff --git a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h index 4b66ad4ff..0c3a8e9e2 100644 --- a/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h +++ b/include/rtkMotionCompensatedFourDROOSTERConeBeamReconstructionFilter.h @@ -172,11 +172,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDROOSTERConeBeamReconstructionFil itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter); -#else - itkTypeMacro(MotionCompensatedFourDROOSTERConeBeamReconstructionFilter, FourDROOSTERConeBeamReconstructionFilter); -#endif using MotionCompensatedFourDCGFilterType = rtk::MotionCompensatedFourDConjugateGradientConeBeamReconstructionFilter; diff --git a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h index 0aeb5f704..ea9144f8b 100644 --- a/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h +++ b/include/rtkMotionCompensatedFourDReconstructionConjugateGradientOperator.h @@ -150,12 +150,7 @@ class ITK_TEMPLATE_EXPORT MotionCompensatedFourDReconstructionConjugateGradientO itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator); -#else - itkTypeMacro(MotionCompensatedFourDReconstructionConjugateGradientOperator, - FourDReconstructionConjugateGradientOperator); -#endif /** The forward and back projection filters cannot be set by the user */ void diff --git a/include/rtkMultiplyByVectorImageFilter.h b/include/rtkMultiplyByVectorImageFilter.h index 2e7b9a174..452d8d67b 100644 --- a/include/rtkMultiplyByVectorImageFilter.h +++ b/include/rtkMultiplyByVectorImageFilter.h @@ -51,11 +51,7 @@ class ITK_TEMPLATE_EXPORT MultiplyByVectorImageFilter : public itk::ImageToImage itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(MultiplyByVectorImageFilter); -#else - itkTypeMacro(MultiplyByVectorImageFilter, itk::ImageToImageFilter); -#endif /** The image containing the weights applied to the temporal components */ void diff --git a/include/rtkNesterovUpdateImageFilter.h b/include/rtkNesterovUpdateImageFilter.h index 221f510b6..f4bd1dbdc 100644 --- a/include/rtkNesterovUpdateImageFilter.h +++ b/include/rtkNesterovUpdateImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT NesterovUpdateImageFilter : public itk::InPlaceImageFi itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(NesterovUpdateImageFilter); -#else - itkTypeMacro(NesterovUpdateImageFilter, itk::InPlaceImageFilter); -#endif /** Get and Set macro*/ itkGetMacro(NumberOfIterations, int); diff --git a/include/rtkOSEMConeBeamReconstructionFilter.h b/include/rtkOSEMConeBeamReconstructionFilter.h index 8bf481042..8e3ea776c 100644 --- a/include/rtkOSEMConeBeamReconstructionFilter.h +++ b/include/rtkOSEMConeBeamReconstructionFilter.h @@ -149,11 +149,7 @@ class ITK_TEMPLATE_EXPORT OSEMConeBeamReconstructionFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OSEMConeBeamReconstructionFilter); -#else - itkTypeMacro(OSEMConeBeamReconstructionFilter, IterativeConeBeamReconstructionFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(Geometry, ThreeDCircularProjectionGeometry); diff --git a/include/rtkOraGeometryReader.h b/include/rtkOraGeometryReader.h index 0dcfe9b2e..0ff474bc0 100644 --- a/include/rtkOraGeometryReader.h +++ b/include/rtkOraGeometryReader.h @@ -54,11 +54,7 @@ class RTK_EXPORT OraGeometryReader : public itk::LightProcessObject using MarginVectorType = itk::Vector; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OraGeometryReader); -#else - itkTypeMacro(OraGeometryReader, itk::LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkOraImageIO.h b/include/rtkOraImageIO.h index 8a6ba8250..a5d61e08a 100644 --- a/include/rtkOraImageIO.h +++ b/include/rtkOraImageIO.h @@ -54,11 +54,7 @@ class RTK_EXPORT OraImageIO : public itk::MetaImageIO itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OraImageIO); -#else - itkTypeMacro(OraImageIO, itk::MetaImageIO); -#endif /*-------- This part of the interface deals with reading data. ------ */ diff --git a/include/rtkOraImageIOFactory.h b/include/rtkOraImageIOFactory.h index 0092961da..450d2b905 100644 --- a/include/rtkOraImageIOFactory.h +++ b/include/rtkOraImageIOFactory.h @@ -65,11 +65,7 @@ class RTK_EXPORT OraImageIOFactory : public itk::ObjectFactoryBase itkFactorylessNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OraImageIOFactory); -#else - itkTypeMacro(OraImageIOFactory, itk::ObjectFactoryBase); -#endif /** Register one factory of this type */ static void diff --git a/include/rtkOraLookupTableImageFilter.h b/include/rtkOraLookupTableImageFilter.h index d5db74d5a..83527405b 100644 --- a/include/rtkOraLookupTableImageFilter.h +++ b/include/rtkOraLookupTableImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT OraLookupTableImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OraLookupTableImageFilter); -#else - itkTypeMacro(OraLookupTableImageFilter, LookupTableImageFilter); -#endif void BeforeThreadedGenerateData() override; diff --git a/include/rtkOraXMLFileReader.h b/include/rtkOraXMLFileReader.h index 8cbb2808f..8a17dcfe5 100644 --- a/include/rtkOraXMLFileReader.h +++ b/include/rtkOraXMLFileReader.h @@ -48,11 +48,7 @@ class RTK_EXPORT OraXMLFileReader : public itk::XMLReader; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(OraXMLFileReader); -#else - itkTypeMacro(OraXMLFileReader, itk::XMLReader); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkParkerShortScanImageFilter.h b/include/rtkParkerShortScanImageFilter.h index 02dc025cc..f99e8d5a6 100644 --- a/include/rtkParkerShortScanImageFilter.h +++ b/include/rtkParkerShortScanImageFilter.h @@ -66,11 +66,7 @@ class ITK_TEMPLATE_EXPORT ParkerShortScanImageFilter : public itk::InPlaceImageF itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ParkerShortScanImageFilter); -#else - itkTypeMacro(ParkerShortScanImageFilter, itk::ImageToImageFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(Geometry, GeometryType); diff --git a/include/rtkPhaseGatingImageFilter.h b/include/rtkPhaseGatingImageFilter.h index 66632027f..8c120cb7b 100644 --- a/include/rtkPhaseGatingImageFilter.h +++ b/include/rtkPhaseGatingImageFilter.h @@ -45,11 +45,7 @@ class ITK_TEMPLATE_EXPORT PhaseGatingImageFilter : public SubSelectImageFilter

; diff --git a/include/rtkPolynomialGainCorrectionImageFilter.h b/include/rtkPolynomialGainCorrectionImageFilter.h index 65d17da16..0001c053e 100644 --- a/include/rtkPolynomialGainCorrectionImageFilter.h +++ b/include/rtkPolynomialGainCorrectionImageFilter.h @@ -67,11 +67,7 @@ class ITK_TEMPLATE_EXPORT PolynomialGainCorrectionImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(PolynomialGainCorrectionImageFilter); -#else - itkTypeMacro(PolynomialGainCorrectionImageFilter, itk::ImageToImageFilter); -#endif /** Dark image, 2D same size of one input projection */ void diff --git a/include/rtkProjectGeometricPhantomImageFilter.h b/include/rtkProjectGeometricPhantomImageFilter.h index 6436364dd..7560b2b2e 100644 --- a/include/rtkProjectGeometricPhantomImageFilter.h +++ b/include/rtkProjectGeometricPhantomImageFilter.h @@ -61,11 +61,7 @@ class ITK_TEMPLATE_EXPORT ProjectGeometricPhantomImageFilter : public itk::InPla itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ProjectGeometricPhantomImageFilter); -#else - itkTypeMacro(ProjectGeometricPhantomImageFilter, itk::InPlaceImageFilter); -#endif /** Get / Set the object pointer to the geometry. */ itkGetConstObjectMacro(GeometricPhantom, GeometricPhantom); diff --git a/include/rtkProjectionStackToFourDImageFilter.h b/include/rtkProjectionStackToFourDImageFilter.h index c80028a70..9403efcf5 100644 --- a/include/rtkProjectionStackToFourDImageFilter.h +++ b/include/rtkProjectionStackToFourDImageFilter.h @@ -120,11 +120,7 @@ class ITK_TEMPLATE_EXPORT ProjectionStackToFourDImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ProjectionStackToFourDImageFilter); -#else - itkTypeMacro(ProjectionStackToFourDImageFilter, itk::ImageToImageFilter); -#endif /** Set/Get the 4D image to be updated.*/ void diff --git a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h index 0819c4dd3..4aa592dcf 100644 --- a/include/rtkProjectionsDecompositionNegativeLogLikelihood.h +++ b/include/rtkProjectionsDecompositionNegativeLogLikelihood.h @@ -46,11 +46,7 @@ class ProjectionsDecompositionNegativeLogLikelihood : public itk::SingleValuedCo using Pointer = itk::SmartPointer; using ConstPointer = itk::SmartPointer; itkNewMacro(Self); -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ProjectionsDecompositionNegativeLogLikelihood); -#else - itkTypeMacro(ProjectionsDecompositionNegativeLogLikelihood, SingleValuedCostFunction); -#endif // enum { SpaceDimension=m_NumberOfMaterials }; diff --git a/include/rtkProjectionsReader.h b/include/rtkProjectionsReader.h index fe4bae3f5..57b442873 100644 --- a/include/rtkProjectionsReader.h +++ b/include/rtkProjectionsReader.h @@ -136,11 +136,7 @@ class ITK_TEMPLATE_EXPORT ProjectionsReader : public itk::ImageSource; using BackProjectionFilterPointer = typename BackProjectionFilterType::Pointer; diff --git a/include/rtkReg1DExtractShroudSignalImageFilter.h b/include/rtkReg1DExtractShroudSignalImageFilter.h index 96059ffbf..f06fdf694 100644 --- a/include/rtkReg1DExtractShroudSignalImageFilter.h +++ b/include/rtkReg1DExtractShroudSignalImageFilter.h @@ -58,11 +58,7 @@ class ITK_TEMPLATE_EXPORT Reg1DExtractShroudSignalImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(Reg1DExtractShroudSignalImageFilter); -#else - itkTypeMacro(Reg1DExtractShroudSignalImageFilter, itk::ImageToImageFilter); -#endif protected: diff --git a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h index 51d2a0a00..a4b24809b 100644 --- a/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h +++ b/include/rtkRegularizedConjugateGradientConeBeamReconstructionFilter.h @@ -129,11 +129,7 @@ class ITK_TEMPLATE_EXPORT RegularizedConjugateGradientConeBeamReconstructionFilt itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(RegularizedConjugateGradientConeBeamReconstructionFilter); -#else - itkTypeMacro(RegularizedConjugateGradientConeBeamReconstructionFilter, itk::ImageToImageFilter); -#endif /** The image to be updated.*/ void diff --git a/include/rtkReorderProjectionsImageFilter.h b/include/rtkReorderProjectionsImageFilter.h index a56b14099..8bdc6546e 100644 --- a/include/rtkReorderProjectionsImageFilter.h +++ b/include/rtkReorderProjectionsImageFilter.h @@ -68,11 +68,7 @@ class ITK_TEMPLATE_EXPORT ReorderProjectionsImageFilter : public itk::ImageToIma itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ReorderProjectionsImageFilter); -#else - itkTypeMacro(ReorderProjectionsImageFilter, ImageToImageFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(OutputGeometry, GeometryType); diff --git a/include/rtkSARTConeBeamReconstructionFilter.h b/include/rtkSARTConeBeamReconstructionFilter.h index c7c17eef1..3fcb780d3 100644 --- a/include/rtkSARTConeBeamReconstructionFilter.h +++ b/include/rtkSARTConeBeamReconstructionFilter.h @@ -172,11 +172,7 @@ class ITK_TEMPLATE_EXPORT SARTConeBeamReconstructionFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SARTConeBeamReconstructionFilter); -#else - itkTypeMacro(SARTConeBeamReconstructionFilter, IterativeConeBeamReconstructionFilter); -#endif /** Get / Set the object pointer to projection geometry */ itkGetModifiableObjectMacro(Geometry, ThreeDCircularProjectionGeometry); diff --git a/include/rtkScatterGlareCorrectionImageFilter.h b/include/rtkScatterGlareCorrectionImageFilter.h index 48b169179..9c8e721f9 100644 --- a/include/rtkScatterGlareCorrectionImageFilter.h +++ b/include/rtkScatterGlareCorrectionImageFilter.h @@ -69,11 +69,7 @@ class ITK_TEMPLATE_EXPORT ScatterGlareCorrectionImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ScatterGlareCorrectionImageFilter); -#else - itkTypeMacro(ScatterGlareCorrectionImageFilter, FFTProjectionsConvolutionImageFilter); -#endif itkGetConstMacro(Coefficients, CoefficientVectorType); virtual void diff --git a/include/rtkSchlomka2008NegativeLogLikelihood.h b/include/rtkSchlomka2008NegativeLogLikelihood.h index 02685f9aa..a59f69c19 100644 --- a/include/rtkSchlomka2008NegativeLogLikelihood.h +++ b/include/rtkSchlomka2008NegativeLogLikelihood.h @@ -56,11 +56,7 @@ class Schlomka2008NegativeLogLikelihood : public rtk::ProjectionsDecompositionNe itkNewMacro(Self); /** Run-time type information (and related methods) */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(Schlomka2008NegativeLogLikelihood); -#else - itkTypeMacro(Schlomka2008NegativeLogLikelihood, ProjectionsDecompositionNegativeLogLikelihood); -#endif using ParametersType = Superclass::ParametersType; using DerivativeType = Superclass::DerivativeType; diff --git a/include/rtkSelectOneProjectionPerCycleImageFilter.h b/include/rtkSelectOneProjectionPerCycleImageFilter.h index 9fa62c290..7faa62012 100644 --- a/include/rtkSelectOneProjectionPerCycleImageFilter.h +++ b/include/rtkSelectOneProjectionPerCycleImageFilter.h @@ -50,11 +50,7 @@ class ITK_TEMPLATE_EXPORT SelectOneProjectionPerCycleImageFilter : public SubSel itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SelectOneProjectionPerCycleImageFilter); -#else - itkTypeMacro(SelectOneProjectionPerCycleImageFilter, SubSelectImageFilter); -#endif /** File name of a text file with one phase value between 0 and 1 per line. */ itkGetMacro(SignalFilename, std::string); diff --git a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h index 49c56e6f0..6c53a667f 100644 --- a/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h +++ b/include/rtkSeparableQuadraticSurrogateRegularizationImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT SeparableQuadraticSurrogateRegularizationImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SeparableQuadraticSurrogateRegularizationImageFilter); -#else - itkTypeMacro(SeparableQuadraticSurrogateRegularizationImageFilter, itk::ImageToImageFilter); -#endif /** Set/Get for the radius */ itkSetMacro(Radius, typename TImage::RegionType::SizeType); diff --git a/include/rtkSheppLoganPhantom.h b/include/rtkSheppLoganPhantom.h index 2f5484fb6..16fa48fc6 100644 --- a/include/rtkSheppLoganPhantom.h +++ b/include/rtkSheppLoganPhantom.h @@ -58,11 +58,7 @@ class RTK_EXPORT SheppLoganPhantom : public GeometricPhantom itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SheppLoganPhantom); -#else - itkTypeMacro(SheppLoganPhantom, GeometricPhantom); -#endif protected: SheppLoganPhantom(); diff --git a/include/rtkSheppLoganPhantomFilter.h b/include/rtkSheppLoganPhantomFilter.h index 786434fe8..f8be42762 100644 --- a/include/rtkSheppLoganPhantomFilter.h +++ b/include/rtkSheppLoganPhantomFilter.h @@ -52,11 +52,7 @@ class ITK_TEMPLATE_EXPORT SheppLoganPhantomFilter : public ProjectGeometricPhant itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SheppLoganPhantomFilter); -#else - itkTypeMacro(SheppLoganPhantomFilter, ProjectGeometricPhantomImageFilter); -#endif protected: SheppLoganPhantomFilter(); diff --git a/include/rtkSignalToInterpolationWeights.h b/include/rtkSignalToInterpolationWeights.h index 1be0593bd..fd3dbee86 100644 --- a/include/rtkSignalToInterpolationWeights.h +++ b/include/rtkSignalToInterpolationWeights.h @@ -52,11 +52,7 @@ class RTK_EXPORT SignalToInterpolationWeights : public itk::CSVFileReaderBase itkNewMacro(Self); /** Run-time type information (and related methods) */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SignalToInterpolationWeights); -#else - itkTypeMacro(SignalToInterpolationWeights, itk::CSVFileReaderBase); -#endif /** DataFrame Object types */ using Array2DType = itk::Array2D; diff --git a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h index efa7c9b26..eee62cc38 100644 --- a/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h +++ b/include/rtkSimplexSpectralProjectionsDecompositionImageFilter.h @@ -69,11 +69,7 @@ class ITK_TEMPLATE_EXPORT SimplexSpectralProjectionsDecompositionImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SimplexSpectralProjectionsDecompositionImageFilter); -#else - itkTypeMacro(SimplexSpectralProjectionsDecompositionImageFilter, ImageToImageFilter); -#endif /** Set/Get the input material-decomposed stack of projections (only used for initialization) */ void diff --git a/include/rtkSingularValueThresholdImageFilter.h b/include/rtkSingularValueThresholdImageFilter.h index 0aa7e51b6..5ff134564 100644 --- a/include/rtkSingularValueThresholdImageFilter.h +++ b/include/rtkSingularValueThresholdImageFilter.h @@ -62,11 +62,7 @@ class ITK_TEMPLATE_EXPORT SingularValueThresholdImageFilter : public itk::InPlac itkNewMacro(Self); /** Run-time type information (and related methods) */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SingularValueThresholdImageFilter); -#else - itkTypeMacro(SingularValueThresholdImageFilter, ImageToImageFilter); -#endif /** Extract some information from the image types. Dimensionality * of the two images is assumed to be the same. */ diff --git a/include/rtkSoftThresholdImageFilter.h b/include/rtkSoftThresholdImageFilter.h index 3b5cd99a3..7d817491a 100644 --- a/include/rtkSoftThresholdImageFilter.h +++ b/include/rtkSoftThresholdImageFilter.h @@ -103,11 +103,7 @@ class ITK_TEMPLATE_EXPORT SoftThresholdImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SoftThresholdImageFilter); -#else - itkTypeMacro(SoftThresholdImageFilter, UnaryFunctorImageFilter); -#endif /** Pixel types. */ using InputPixelType = typename TInputImage::PixelType; diff --git a/include/rtkSoftThresholdTVImageFilter.h b/include/rtkSoftThresholdTVImageFilter.h index e7e8628c6..34ea5272f 100644 --- a/include/rtkSoftThresholdTVImageFilter.h +++ b/include/rtkSoftThresholdTVImageFilter.h @@ -57,11 +57,7 @@ class ITK_TEMPLATE_EXPORT SoftThresholdTVImageFilter : public itk::ImageToImageF itkNewMacro(Self); /** Run-time type information (and related methods) */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SoftThresholdTVImageFilter); -#else - itkTypeMacro(SoftThresholdTVImageFilter, ImageToImageFilter); -#endif /** Extract some information from the image types. Dimensionality * of the two images is assumed to be the same. */ diff --git a/include/rtkSpectralForwardModelImageFilter.h b/include/rtkSpectralForwardModelImageFilter.h index 7e0053312..0a81fa028 100644 --- a/include/rtkSpectralForwardModelImageFilter.h +++ b/include/rtkSpectralForwardModelImageFilter.h @@ -69,11 +69,7 @@ class ITK_TEMPLATE_EXPORT SpectralForwardModelImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SpectralForwardModelImageFilter); -#else - itkTypeMacro(SpectralForwardModelImageFilter, InPlaceImageFilter); -#endif /** Set/Get the incident spectrum input images */ void diff --git a/include/rtkSplatWithKnownWeightsImageFilter.h b/include/rtkSplatWithKnownWeightsImageFilter.h index 122ac6741..e81c13258 100644 --- a/include/rtkSplatWithKnownWeightsImageFilter.h +++ b/include/rtkSplatWithKnownWeightsImageFilter.h @@ -80,11 +80,7 @@ class ITK_TEMPLATE_EXPORT SplatWithKnownWeightsImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SplatWithKnownWeightsImageFilter); -#else - itkTypeMacro(SplatWithKnownWeightsImageFilter, itk::ImageToImageFilter); -#endif /** The 4D image to be updated.*/ void diff --git a/include/rtkSubSelectFromListImageFilter.h b/include/rtkSubSelectFromListImageFilter.h index 644ca13fb..9d8a5d841 100644 --- a/include/rtkSubSelectFromListImageFilter.h +++ b/include/rtkSubSelectFromListImageFilter.h @@ -44,11 +44,7 @@ class ITK_TEMPLATE_EXPORT SubSelectFromListImageFilter : public SubSelectImageFi itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SubSelectFromListImageFilter); -#else - itkTypeMacro(SubSelectFromListImageFilter, SubSelectImageFilter); -#endif void SetSelectedProjections(std::vector sprojs); diff --git a/include/rtkSubSelectImageFilter.h b/include/rtkSubSelectImageFilter.h index 51dc48e7a..39f94f235 100644 --- a/include/rtkSubSelectImageFilter.h +++ b/include/rtkSubSelectImageFilter.h @@ -73,11 +73,7 @@ class ITK_TEMPLATE_EXPORT SubSelectImageFilter using Pointer = itk::SmartPointer; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SubSelectImageFilter); -#else - itkTypeMacro(SubSelectImageFilter, itk::ImageToImageFilter); -#endif /** The set of projections from which a subset will be extracted */ void diff --git a/include/rtkSumOfSquaresImageFilter.h b/include/rtkSumOfSquaresImageFilter.h index 3c91c3533..932086781 100644 --- a/include/rtkSumOfSquaresImageFilter.h +++ b/include/rtkSumOfSquaresImageFilter.h @@ -52,11 +52,7 @@ class ITK_TEMPLATE_EXPORT SumOfSquaresImageFilter : public itk::InPlaceImageFilt itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(SumOfSquaresImageFilter); -#else - itkTypeMacro(SumOfSquaresImageFilter, itk::InPlaceImageFilter); -#endif /** Macro to get the SSD */ itkGetMacro(SumOfSquares, OutputInternalPixelType); diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h index 2dc607594..877bebd0b 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileReader.h @@ -59,11 +59,7 @@ class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileReader : public itk::XML static const unsigned int CurrentVersion = 3; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ThreeDCircularProjectionGeometryXMLFileReader); -#else - itkTypeMacro(ThreeDCircularProjectionGeometryXMLFileReader, itk::XMLFileReader); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h index 10a7c0968..338ed10b8 100644 --- a/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h +++ b/include/rtkThreeDCircularProjectionGeometryXMLFileWriter.h @@ -53,11 +53,7 @@ class RTK_EXPORT ThreeDCircularProjectionGeometryXMLFileWriter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ThreeDCircularProjectionGeometryXMLFileWriter); -#else - itkTypeMacro(ThreeDCircularProjectionGeometryXMLFileWriter, itk::XMLWriterBase); -#endif /** Test whether a file is writable. */ int diff --git a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h index 0087fcf3f..3b06154d9 100644 --- a/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalNuclearVariationDenoisingBPDQImageFilter.h @@ -130,11 +130,7 @@ class ITK_TEMPLATE_EXPORT TotalNuclearVariationDenoisingBPDQImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(TotalNuclearVariationDenoisingBPDQImageFilter); -#else - itkTypeMacro(TotalNuclearVariationDenoisingBPDQImageFilter, DenoisingBPDQImageFilter); -#endif /** Sub filter type definitions */ using SingularValueThresholdFilterType = SingularValueThresholdImageFilter; diff --git a/include/rtkTotalVariationDenoiseSequenceImageFilter.h b/include/rtkTotalVariationDenoiseSequenceImageFilter.h index f3d46a988..c9b33b9d9 100644 --- a/include/rtkTotalVariationDenoiseSequenceImageFilter.h +++ b/include/rtkTotalVariationDenoiseSequenceImageFilter.h @@ -91,11 +91,7 @@ class ITK_TEMPLATE_EXPORT TotalVariationDenoiseSequenceImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(TotalVariationDenoiseSequenceImageFilter); -#else - itkTypeMacro(TotalVariationDenoiseSequenceImageFilter, ImageToImageFilter); -#endif /** Set/Get for the TotalVariationDenoisingBPDQImageFilter */ itkGetMacro(Gamma, double); diff --git a/include/rtkTotalVariationDenoisingBPDQImageFilter.h b/include/rtkTotalVariationDenoisingBPDQImageFilter.h index d44314b68..98a7e852a 100644 --- a/include/rtkTotalVariationDenoisingBPDQImageFilter.h +++ b/include/rtkTotalVariationDenoisingBPDQImageFilter.h @@ -126,11 +126,7 @@ class ITK_TEMPLATE_EXPORT TotalVariationDenoisingBPDQImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(TotalVariationDenoisingBPDQImageFilter); -#else - itkTypeMacro(TotalVariationDenoisingBPDQImageFilter, DenoisingBPDQImageFilter); -#endif /** Sub filter type definitions */ using MagnitudeThresholdFilterType = diff --git a/include/rtkTotalVariationImageFilter.h b/include/rtkTotalVariationImageFilter.h index ae0645e2a..a4c9e10a9 100644 --- a/include/rtkTotalVariationImageFilter.h +++ b/include/rtkTotalVariationImageFilter.h @@ -62,11 +62,7 @@ class ITK_TEMPLATE_EXPORT TotalVariationImageFilter : public itk::ImageToImageFi itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(TotalVariationImageFilter); -#else - itkTypeMacro(TotalVariationImageFilter, ImageToImageFilter); -#endif /** Image related type alias. */ using InputImagePointer = typename TInputImage::Pointer; diff --git a/include/rtkUnwarpSequenceConjugateGradientOperator.h b/include/rtkUnwarpSequenceConjugateGradientOperator.h index 2c723fd7c..0b62a6b76 100644 --- a/include/rtkUnwarpSequenceConjugateGradientOperator.h +++ b/include/rtkUnwarpSequenceConjugateGradientOperator.h @@ -78,11 +78,7 @@ class ITK_TEMPLATE_EXPORT UnwarpSequenceConjugateGradientOperator : public Conju itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(UnwarpSequenceConjugateGradientOperator); -#else - itkTypeMacro(UnwarpSequenceConjugateGradientOperator, ConjugateGradientOperator); -#endif using WarpSequenceFilterType = rtk::WarpSequenceImageFilter; diff --git a/include/rtkUnwarpSequenceImageFilter.h b/include/rtkUnwarpSequenceImageFilter.h index 2bf4c3519..986fa6c09 100644 --- a/include/rtkUnwarpSequenceImageFilter.h +++ b/include/rtkUnwarpSequenceImageFilter.h @@ -92,11 +92,7 @@ class ITK_TEMPLATE_EXPORT UnwarpSequenceImageFilter : public itk::ImageToImageFi itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(UnwarpSequenceImageFilter); -#else - itkTypeMacro(UnwarpSequenceImageFilter, ImageToImageFilter); -#endif using CGOperatorFilterType = UnwarpSequenceConjugateGradientOperator; diff --git a/include/rtkUpsampleImageFilter.h b/include/rtkUpsampleImageFilter.h index a8942860d..057e1af7e 100644 --- a/include/rtkUpsampleImageFilter.h +++ b/include/rtkUpsampleImageFilter.h @@ -51,11 +51,7 @@ class ITK_TEMPLATE_EXPORT UpsampleImageFilter : public itk::ImageToImageFilter; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VarianObiGeometryReader); -#else - itkTypeMacro(VarianObiGeometryReader, LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkVarianObiRawImageFilter.h b/include/rtkVarianObiRawImageFilter.h index 66124d1fb..5871ac6ec 100644 --- a/include/rtkVarianObiRawImageFilter.h +++ b/include/rtkVarianObiRawImageFilter.h @@ -111,11 +111,7 @@ class ITK_TEMPLATE_EXPORT VarianObiRawImageFilter itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VarianObiRawImageFilter); -#else - itkTypeMacro(VarianObiRawImageFilter, itk::UnaryFunctorImageFilter); -#endif itkGetMacro(I0, double); itkSetMacro(I0, double); diff --git a/include/rtkVarianObiXMLFileReader.h b/include/rtkVarianObiXMLFileReader.h index 2c63af748..b99f0b53a 100644 --- a/include/rtkVarianObiXMLFileReader.h +++ b/include/rtkVarianObiXMLFileReader.h @@ -53,11 +53,7 @@ class RTK_EXPORT VarianObiXMLFileReader : public itk::XMLReader; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VarianObiXMLFileReader); -#else - itkTypeMacro(VarianObiXMLFileReader, itk::XMLReader); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkVarianProBeamGeometryReader.h b/include/rtkVarianProBeamGeometryReader.h index 69eb0a9dd..45c5dadb3 100644 --- a/include/rtkVarianProBeamGeometryReader.h +++ b/include/rtkVarianProBeamGeometryReader.h @@ -51,11 +51,7 @@ class RTK_EXPORT VarianProBeamGeometryReader : public itk::LightProcessObject using FileNamesContainer = std::vector; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VarianProBeamGeometryReader); -#else - itkTypeMacro(VarianProBeamGeometryReader, LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkVarianProBeamXMLFileReader.h b/include/rtkVarianProBeamXMLFileReader.h index 763a89668..e11bde7dc 100644 --- a/include/rtkVarianProBeamXMLFileReader.h +++ b/include/rtkVarianProBeamXMLFileReader.h @@ -52,11 +52,7 @@ class RTK_EXPORT VarianProBeamXMLFileReader : public itk::XMLReader; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VarianProBeamXMLFileReader); -#else - itkTypeMacro(VarianProBeamXMLFileReader, itk::XMLReader); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkVectorImageToImageFilter.h b/include/rtkVectorImageToImageFilter.h index e3726fbfe..6a5415570 100644 --- a/include/rtkVectorImageToImageFilter.h +++ b/include/rtkVectorImageToImageFilter.h @@ -60,11 +60,7 @@ class ITK_TEMPLATE_EXPORT VectorImageToImageFilter : public itk::ImageToImageFil itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(VectorImageToImageFilter); -#else - itkTypeMacro(VectorImageToImageFilter, itk::ImageToImageFilter); -#endif protected: VectorImageToImageFilter(); diff --git a/include/rtkWarpFourDToProjectionStackImageFilter.h b/include/rtkWarpFourDToProjectionStackImageFilter.h index 46004343c..7655b0c93 100644 --- a/include/rtkWarpFourDToProjectionStackImageFilter.h +++ b/include/rtkWarpFourDToProjectionStackImageFilter.h @@ -134,11 +134,7 @@ class ITK_TEMPLATE_EXPORT WarpFourDToProjectionStackImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(WarpFourDToProjectionStackImageFilter); -#else - itkTypeMacro(WarpFourDToProjectionStackImageFilter, rtk::FourDToProjectionStackImageFilter); -#endif using SignalVectorType = std::vector; diff --git a/include/rtkWarpProjectionStackToFourDImageFilter.h b/include/rtkWarpProjectionStackToFourDImageFilter.h index f3ad586d9..6861f896e 100644 --- a/include/rtkWarpProjectionStackToFourDImageFilter.h +++ b/include/rtkWarpProjectionStackToFourDImageFilter.h @@ -128,11 +128,7 @@ class ITK_TEMPLATE_EXPORT WarpProjectionStackToFourDImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(WarpProjectionStackToFourDImageFilter); -#else - itkTypeMacro(WarpProjectionStackToFourDImageFilter, ProjectionStackToFourDImageFilter); -#endif using SignalVectorType = std::vector; diff --git a/include/rtkWarpSequenceImageFilter.h b/include/rtkWarpSequenceImageFilter.h index 72a29832f..2cbeb8210 100644 --- a/include/rtkWarpSequenceImageFilter.h +++ b/include/rtkWarpSequenceImageFilter.h @@ -127,11 +127,7 @@ class ITK_TEMPLATE_EXPORT WarpSequenceImageFilter : public itk::ImageToImageFilt #endif /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(WarpSequenceImageFilter); -#else - itkTypeMacro(WarpSequenceImageFilter, IterativeConeBeamReconstructionFilter); -#endif /** Set the motion vector field used in input 1 */ void diff --git a/include/rtkWaterPrecorrectionImageFilter.h b/include/rtkWaterPrecorrectionImageFilter.h index b31af616a..d35184e62 100644 --- a/include/rtkWaterPrecorrectionImageFilter.h +++ b/include/rtkWaterPrecorrectionImageFilter.h @@ -56,11 +56,7 @@ class ITK_TEMPLATE_EXPORT WaterPrecorrectionImageFilter : public itk::InPlaceIma itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(WaterPrecorrectionImageFilter); -#else - itkTypeMacro(WaterPrecorrectionImageFilter, ImageToImageFilter); -#endif /** Get / Set the Median window that are going to be used during the operation */ diff --git a/include/rtkWeidingerForwardModelImageFilter.h b/include/rtkWeidingerForwardModelImageFilter.h index c256e0225..bf176c830 100644 --- a/include/rtkWeidingerForwardModelImageFilter.h +++ b/include/rtkWeidingerForwardModelImageFilter.h @@ -58,11 +58,7 @@ class ITK_TEMPLATE_EXPORT WeidingerForwardModelImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(WeidingerForwardModelImageFilter); -#else - itkTypeMacro(WeidingerForwardModelImageFilter, itk::ImageToImageFilter); -#endif /** Convenient parameters extracted from template types */ static constexpr unsigned int nBins = TPhotonCounts::PixelType::Dimension; diff --git a/include/rtkXRadGeometryReader.h b/include/rtkXRadGeometryReader.h index 9c75a5e5f..04f9d40bb 100644 --- a/include/rtkXRadGeometryReader.h +++ b/include/rtkXRadGeometryReader.h @@ -50,11 +50,7 @@ class RTK_EXPORT XRadGeometryReader : public itk::LightProcessObject using GeometryType = ThreeDCircularProjectionGeometry; /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XRadGeometryReader); -#else - itkTypeMacro(XRadGeometryReader, LightProcessObject); -#endif /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/include/rtkXRadImageIO.h b/include/rtkXRadImageIO.h index 715961d89..ff86617c6 100644 --- a/include/rtkXRadImageIO.h +++ b/include/rtkXRadImageIO.h @@ -54,11 +54,7 @@ class RTK_EXPORT XRadImageIO : public itk::ImageIOBase itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XRadImageIO); -#else - itkTypeMacro(XRadImageIO, ImageIOBase); -#endif /*-------- This part of the interface deals with reading data. ------ */ void diff --git a/include/rtkXRadImageIOFactory.h b/include/rtkXRadImageIOFactory.h index 882d465aa..d032be74e 100644 --- a/include/rtkXRadImageIOFactory.h +++ b/include/rtkXRadImageIOFactory.h @@ -63,11 +63,7 @@ class RTK_EXPORT XRadImageIOFactory : public itk::ObjectFactoryBase itkFactorylessNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XRadImageIOFactory); -#else - itkTypeMacro(XRadImageIOFactory, ObjectFactoryBase); -#endif /** Register one factory of this type */ static void diff --git a/include/rtkXRadRawToAttenuationImageFilter.h b/include/rtkXRadRawToAttenuationImageFilter.h index ed3ce075a..96b42fe14 100644 --- a/include/rtkXRadRawToAttenuationImageFilter.h +++ b/include/rtkXRadRawToAttenuationImageFilter.h @@ -54,11 +54,7 @@ class ITK_TEMPLATE_EXPORT XRadRawToAttenuationImageFilter : public itk::ImageToI itkNewMacro(Self); /** Runtime information support. */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XRadRawToAttenuationImageFilter); -#else - itkTypeMacro(XRadRawToAttenuationImageFilter, itk::ImageToImageFilter); -#endif protected: XRadRawToAttenuationImageFilter(); diff --git a/include/rtkXimImageIO.h b/include/rtkXimImageIO.h index 0b166d595..20dcb48b0 100644 --- a/include/rtkXimImageIO.h +++ b/include/rtkXimImageIO.h @@ -107,11 +107,7 @@ class RTK_EXPORT XimImageIO : public itk::ImageIOBase itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XimImageIO); -#else - itkTypeMacro(XimImageIO, itk::ImageIOBase); -#endif /*-------- This part of the interface deals with reading data. ------ */ void diff --git a/include/rtkXimImageIOFactory.h b/include/rtkXimImageIOFactory.h index 9096a5f78..1e0f6edf3 100644 --- a/include/rtkXimImageIOFactory.h +++ b/include/rtkXimImageIOFactory.h @@ -69,11 +69,7 @@ class RTK_EXPORT XimImageIOFactory : public itk::ObjectFactoryBase itkFactorylessNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(XimImageIOFactory); -#else - itkTypeMacro(XimImageIOFactory, itk::ObjectFactoryBase); -#endif /** Register one factory of this type */ static void diff --git a/include/rtkZengBackProjectionImageFilter.h b/include/rtkZengBackProjectionImageFilter.h index 13d23b591..43dbe4ee8 100644 --- a/include/rtkZengBackProjectionImageFilter.h +++ b/include/rtkZengBackProjectionImageFilter.h @@ -110,11 +110,7 @@ class ITK_TEMPLATE_EXPORT ZengBackProjectionImageFilter : public BackProjectionI itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ZengBackProjectionImageFilter); -#else - itkTypeMacro(ZengBackProjectionImageFilter, BackProjectionImageFilter); -#endif /** Get / Set the sigma zero of the PSF. Default is 1.5417233052142099 */ itkGetMacro(SigmaZero, double); diff --git a/include/rtkZengForwardProjectionImageFilter.h b/include/rtkZengForwardProjectionImageFilter.h index 9eb8f44a5..7e1cd5064 100644 --- a/include/rtkZengForwardProjectionImageFilter.h +++ b/include/rtkZengForwardProjectionImageFilter.h @@ -104,11 +104,7 @@ class ITK_TEMPLATE_EXPORT ZengForwardProjectionImageFilter itkNewMacro(Self); /** Run-time type information (and related methods). */ -#ifdef itkOverrideGetNameOfClassMacro itkOverrideGetNameOfClassMacro(ZengForwardProjectionImageFilter); -#else - itkTypeMacro(ZengForwardProjectionImageFilter, ForwardProjectionImageFilter); -#endif /** Get / Set the sigma zero of the PSF. Default is 1.5417233052142099 */ itkGetMacro(SigmaZero, double);