Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix itkTypeMacro and fuzzyCorrFilter #102

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Fix itkTypeMacro and fuzzyCorrFilter #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbce15
fix/remove itkTypeMacro
KrisThielemans Dec 9, 2024
1bc9e81
replace all itkTypeMacro occurences for ITK >=6.0
KrisThielemans Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/petpvcDiscreteIYPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion lib/petpvcFuzzyCorrectionFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcGTMImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcIntraRegRLImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcIntraRegVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcIterativeYangPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcLabbeImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcLabbeMTCPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcLabbePVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcLabbeRBVPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcMTCPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcMullerGartnerImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcRBVPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcRLPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcRegionConvolutionImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcRoussetPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcSTCPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions lib/petpvcVanCittertPVCImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down