WIP: ITK5 Update #1033
WIP: ITK5 Update #1033
Conversation
Use PlatformMultiThreader for vtkSlicerApplicationLogic to minimize changes
ALso removed some overrides that the compiler complained about
| { | ||
| itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); | ||
| } | ||
| virtual void ComputeJacobianWithRespectToPosition( | ||
| const typename Superclass::IndexType &, | ||
| typename Superclass::JacobianType &) const ITK_OVERRIDE | ||
| typename Superclass::JacobianType &) const |
There was a problem hiding this comment.
If a method cannot be overridden, it is either not virtual or not defined. Not defined is more likely, possibly having been deprecated in ITKv3 to ITKv4 transition, and removed in v4 to v5 transition. Either way, this method should be removed as it will probably not be invoked. Same goes for a few other method overloads here.
There was a problem hiding this comment.
The signature has changed in ITKv5. From JacobianType in v4 to JacobianPositionType in v5.
Working on this in @hjmjohnson branch: Slicer/Slicer#1055
SuperBuild/External_ITK.cmake
Outdated
| @@ -99,7 +99,7 @@ if(NOT DEFINED ITK_DIR AND NOT Slicer_USE_SYSTEM_${proj}) | |||
| -DBUILD_TESTING:BOOL=OFF | |||
| -DBUILD_EXAMPLES:BOOL=OFF | |||
| -DITK_LEGACY_REMOVE:BOOL=OFF | |||
| -DITKV4_COMPATIBILITY:BOOL=ON | |||
| -DITKV4_COMPATIBILITY:BOOL=OFF | |||
There was a problem hiding this comment.
This will become more important soon, with the expected merging of this patch. You could leave it ON, or we could consider turning it ON once we update ITK to beta 2 or 5.0 final.
|
Regarding the test failure: test infrastructure might need to be updated. @jcfr? |
|
@sjh26 I have worked through a set of independent commits that allow building with both ITKv4 and ITKv5. Please see:
I would greatly appreciate your feedback. |
|
See also #1096 where @hjmjohnson PR's have been wrapped together. |
|
Closing as the effort is incorporating changes in other PR. |
Initial work for the ITK5 update. Covers a few of the same nullptr changes from #952
ITK_REMOVE_LEGACY is still OFF for this. Removing the legacy code will require reworking of the threading in the Slicer Application, and updating SimpleITK and BRAINSTools to ITK5