Skip to content

COMP: Use future recommended code for remote modules with ITKv5.4.4 #5183

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

Draft
wants to merge 3 commits into
base: release-5.4
Choose a base branch
from
Draft

COMP: Use future recommended code for remote modules with ITKv5.4.4 #5183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b54478c
COMP: Use modern macro for name of class
hjmjohnson Jan 25, 2025
1d3e60c
COMP: Use future recommended code
hjmjohnson Jan 25, 2025
e2ca9d3
ENH: Bump itkVersion.cmake for 5.4.3
hjmjohnson Jan 25, 2025
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
2 changes: 1 addition & 1 deletion CMake/itkVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ITK version number components.
set(ITK_VERSION_MAJOR "5")
set(ITK_VERSION_MINOR "4")
set(ITK_VERSION_PATCH "2")
set(ITK_VERSION_PATCH "3")
2 changes: 1 addition & 1 deletion Modules/Remote/AdaptiveDenoising.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ itk_fetch_module(
"
MODULE_COMPLIANCE_LEVEL 3
GIT_REPOSITORY https://github.com/ntustison/ITKAdaptiveDenoising.git
GIT_TAG 24825c8d246e941334f47968553f0ae388851f0c
GIT_TAG 012ba8882167b64405f7cefc489655f8395093ea
)
2 changes: 1 addition & 1 deletion Modules/Remote/AnisotropicDiffusionLBR.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ itk_fetch_module(
"
MODULE_COMPLIANCE_LEVEL 2
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKAnisotropicDiffusionLBR.git
GIT_TAG d46aab0e0c8f02b89eaa0420e61970559177683f
GIT_TAG 0aa8dae3b86b045940b3a18c323f50d260f33c38
)
2 changes: 1 addition & 1 deletion Modules/Remote/GenericLabelInterpolator.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ itk_fetch_module(
"A generic interpolator for multi-label images."
MODULE_COMPLIANCE_LEVEL 2
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator.git
GIT_TAG ebf2436469ccf82c08fab54b7446f699ad0eae01
GIT_TAG 5405b036ebf05addd5688d18fab7dade4acc9c93
)
2 changes: 1 addition & 1 deletion Modules/Remote/GrowCut.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ itk_fetch_module(
"ITKGrowCut segments a 3D image from user-provided foreground and background seeds."
MODULE_COMPLIANCE_LEVEL 3
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKGrowCut.git
GIT_TAG cbf93ab65117abfbf5798745117e34f22ff04728
GIT_TAG 3a755af076b6a6b29488c0c1c60787160fa25ea2
)
2 changes: 1 addition & 1 deletion Modules/Remote/IOScanco.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ itk_fetch_module(
"An ITK module to read and write Scanco microCT .isq files."
MODULE_COMPLIANCE_LEVEL 2
GIT_REPOSITORY https://github.com/KitwareMedical/ITKIOScanco.git
GIT_TAG 10b80f69048e79ab3069e89635822a6851099278
GIT_TAG 12fc12b01a964ccbd30bc8743f4e6cabaa2dcd5e
)
2 changes: 1 addition & 1 deletion Modules/Remote/MGHIO.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ itk_fetch_module(
"MGHIO ImageIO plugin for ITK"
MODULE_COMPLIANCE_LEVEL 2
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/itkMGHImageIO.git
GIT_TAG 0adac35fa22945c7a5f3a63dd8d01454577c24d3
GIT_TAG ae9c326d509db6bb89593ead96e0c13e678bb1ab
)
2 changes: 1 addition & 1 deletion Modules/Remote/MorphologicalContourInterpolation.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ This work is supported by NIH grant R01 EB014346
'Continued development and maintenance of the ITK-SNAP 3D image segmentation software'."
MODULE_COMPLIANCE_LEVEL 3
GIT_REPOSITORY https://github.com/KitwareMedical/ITKMorphologicalContourInterpolation.git
GIT_TAG fc7ffdc939395a272e1ccba8d027db80d0eb834e
GIT_TAG 439e40c41ff2676126f5572722e7b2a46a41e776
)
2 changes: 1 addition & 1 deletion Modules/Remote/RLEImage.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ This work is supported by NIH grant R01 EB014346
'Continued development and maintenance of the ITK-SNAP 3D image segmentation software'."
MODULE_COMPLIANCE_LEVEL 3
GIT_REPOSITORY https://github.com/KitwareMedical/ITKRLEImage.git
GIT_TAG 85559c99ece93d695889dbc908c52efbc2bf50a9
GIT_TAG 399206a57cf9fb33c56d92255ed73d5998603859
)
2 changes: 1 addition & 1 deletion Modules/Remote/SimpleITKFilters.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ itk_fetch_module(
contains a discrete hessian, and a composite filter to compute objectness."
MODULE_COMPLIANCE_LEVEL 3
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/ITKSimpleITKFilters.git
GIT_TAG bb896868fc6480835495d0da4356d5db009592a6
GIT_TAG 146c3214ff4a7e1d6a0a45589aee3fe72e9e2e83
)
2 changes: 1 addition & 1 deletion Modules/Remote/SubdivisionQuadEdgeMeshFilter.remote.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ See the following Insight Journal's publication:
https://www.insight-journal.org/browse/publication/831"
MODULE_COMPLIANCE_LEVEL 2
GIT_REPOSITORY https://github.com/InsightSoftwareConsortium/itkSubdivisionQuadEdgeMeshFilter
GIT_TAG 6e30c49f7ef9a5b4854bff39834f9d7e181130aa
GIT_TAG 9c204f898636990a21bb2f3267a5c66995588b66
)
2 changes: 1 addition & 1 deletion Modules/Video/BridgeVXL/include/vidl_itk_istream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT vidl_itk_istream : public vidl_istream
virtual ~vidl_itk_istream() {}

/** Runtime information support. */
// Cannot use as we do not derive from ITK Object with GetNameOfClass itkTypeMacro(vidl_itk_istream, vidl_istream);
// Cannot use as we do not derive from ITK Object with GetNameOfClass itkOverrideGetNameOfClassMacro(vidl_itk_istream);
const char *
GetNameOfClass() const
{
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Doxygen/DoxygenConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ set(DOXYGEN_PREDEFINED
"itkVirtualGetNameOfClassMacro(thisClass)= 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"
Expand Down
2 changes: 1 addition & 1 deletion Wrapping/DoxygenConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ set(DOXYGEN_PREDEFINED
"itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;"
"itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;"
"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"
Expand Down
Loading