Merge pull request #102 from KrisThielemans/fixFuzzyCorrFilter

Fix itkTypeMacro and fuzzyCorrFilter
UCL · Dec 9, 2024 · 3ad7877 · 3ad7877
2 parents fb4e727 + 1bc9e81
commit 3ad7877
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 1 deletion.
diff --git a/lib/petpvcDiscreteIYPVCImageFilter.h b/lib/petpvcDiscreteIYPVCImageFilter.h
@@ -56,7 +56,11 @@ class DiscreteIYPVCImageFilter:public ImageToImageFilter< TInputImage, TInputIma
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(DiscreteIYPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(DiscreteIYPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcFuzzyCorrectionFilter.h b/lib/petpvcFuzzyCorrectionFilter.h
@@ -53,7 +53,11 @@ class FuzzyCorrectionFilter : public ImageToImageFilter<TImage, TImage>
 
     itkNewMacro(Self);
 
-    itkTypeMacro(FuzzyCorrFilter, ImageToImageFilter);
+#if ITK_VERSION_MAJOR < 6
+    itkTypeMacro(FuzzyCorrectionFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(FuzzyCorrectionFilter);
+#endif
 
     //Returns correction factors.
 

diff --git a/lib/petpvcGTMImageFilter.h b/lib/petpvcGTMImageFilter.h
@@ -54,7 +54,11 @@ class GTMImageFilter : public ImageToImageFilter<TImage, TImage>
 
     itkNewMacro(Self);
 
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(GTMImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(GTMImageFilter);
+#endif
 
     //Returns correction factors.
     vnl_matrix<float> GetMatrix() {

diff --git a/lib/petpvcIntraRegRLImageFilter.h b/lib/petpvcIntraRegRLImageFilter.h
@@ -53,7 +53,11 @@ class IntraRegRLImageFilter:public ImageToImageFilter< TInputImage, TInputImage
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(IntraRegRLImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(IntraRegRLImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcIntraRegVCImageFilter.h b/lib/petpvcIntraRegVCImageFilter.h
@@ -53,7 +53,11 @@ class IntraRegVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(IntraRegVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(IntraRegVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcIterativeYangPVCImageFilter.h b/lib/petpvcIterativeYangPVCImageFilter.h
@@ -53,7 +53,11 @@ class IterativeYangPVCImageFilter:public ImageToImageFilter< TInputImage, TInput
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(IterativeYangPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(IterativeYangPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcLabbeImageFilter.h b/lib/petpvcLabbeImageFilter.h
@@ -55,7 +55,11 @@ class LabbeImageFilter : public ImageToImageFilter<TImage, TImage>
 
     itkNewMacro(Self);
 
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(LabbeImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(LabbeImageFilter);
+#endif
 
     //Returns correction factors.
     vnl_matrix<float> GetMatrix() {

diff --git a/lib/petpvcLabbeMTCPVCImageFilter.h b/lib/petpvcLabbeMTCPVCImageFilter.h
@@ -52,7 +52,11 @@ class LabbeMTCPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(LabbeMTCPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(LabbeMTCPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcLabbePVCImageFilter.h b/lib/petpvcLabbePVCImageFilter.h
@@ -50,7 +50,11 @@ class LabbePVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage >
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(LabbePVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(LabbePVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcLabbeRBVPVCImageFilter.h b/lib/petpvcLabbeRBVPVCImageFilter.h
@@ -52,7 +52,11 @@ class LabbeRBVPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(LabbeRBVPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(LabbeRBVPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcMTCPVCImageFilter.h b/lib/petpvcMTCPVCImageFilter.h
@@ -52,7 +52,11 @@ class MTCPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage >
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(MTCPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(MTCPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcMullerGartnerImageFilter.h b/lib/petpvcMullerGartnerImageFilter.h
@@ -77,7 +77,11 @@ class MullerGartnerImageFilter :
 
     itkNewMacro(Self);
 
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(MullerGartnerImageFilter, InPlaceImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(MullerGartnerImageFilter);
+#endif
 
     //PET image
     typedef TInputImage1 Input1ImageType;

diff --git a/lib/petpvcRBVPVCImageFilter.h b/lib/petpvcRBVPVCImageFilter.h
@@ -51,7 +51,11 @@ class RBVPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage >
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(RBVPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(RBVPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcRLPVCImageFilter.h b/lib/petpvcRLPVCImageFilter.h
@@ -56,7 +56,11 @@ class RichardsonLucyPVCImageFilter:public ImageToImageFilter< TInputImage, TInpu
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(RichardsonLucyPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(RichardsonLucyPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcRegionConvolutionImageFilter.h b/lib/petpvcRegionConvolutionImageFilter.h
@@ -50,7 +50,11 @@ class RegionConvolutionPVCImageFilter:public ImageToImageFilter< TInputImage, TI
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(RegionConvolutionPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(RegionConvolutionPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcRoussetPVCImageFilter.h b/lib/petpvcRoussetPVCImageFilter.h
@@ -48,7 +48,11 @@ class RoussetPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(RoussetPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(RoussetPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcSTCPVCImageFilter.h b/lib/petpvcSTCPVCImageFilter.h
@@ -69,7 +69,11 @@ class STCPVCImageFilter:public ImageToImageFilter< TInputImage, TInputImage >
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(STCPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(STCPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;

diff --git a/lib/petpvcVanCittertPVCImageFilter.h b/lib/petpvcVanCittertPVCImageFilter.h
@@ -55,7 +55,11 @@ class VanCittertPVCImageFilter:public ImageToImageFilter< TInputImage, TInputIma
     itkNewMacro(Self);
 
     /** Run-time type information (and related methods). */
+#if ITK_VERSION_MAJOR < 6
     itkTypeMacro(VanCittertPVCImageFilter, ImageToImageFilter);
+#else
+    itkOverrideGetNameOfClassMacro(VanCittertPVCImageFilter);
+#endif
 
     /** Image related typedefs. */
     typedef TInputImage             InputImageType;