Skip to content

Commit b60a68b

Browse files
committed
Now works with latest itk (5.4) and prerelease (6.0)
1 parent 795b3d1 commit b60a68b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Anima/math-tools/optimizers/animaVoxelExhaustiveOptimizer.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ void VoxelExhaustiveOptimizer ::IncrementIndex(ParametersType &newPosition) {
181181
this->GetInitialPosition()[i];
182182
}
183183

184-
std::string VoxelExhaustiveOptimizer ::GetStopConditionDescription() const {
184+
const std::string
185+
VoxelExhaustiveOptimizer ::GetStopConditionDescription() const {
185186
return m_StopConditionDescription.str();
186187
}
187188

Anima/math-tools/optimizers/animaVoxelExhaustiveOptimizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ANIMAOPTIMIZERS_EXPORT VoxelExhaustiveOptimizer
4444
itkGetConstReferenceMacro(MaximumNumberOfIterations, unsigned long);
4545

4646
/** Get the reason for termination */
47-
std::string GetStopConditionDescription() const ITK_OVERRIDE;
47+
const std::string GetStopConditionDescription() const ITK_OVERRIDE;
4848

4949
/** Set if the Optimizer should Maximize the metric */
5050
itkSetMacro(Maximize, bool);

superbuild/ITK.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ set (cmake_args
2828

2929
set (location "")
3030
if (NOT DEFINED ${proj}_SRC_DIR)
31-
set(tag v5.2.1)
31+
set(tag v5.4.5)
3232
set(location GIT_REPOSITORY ${GITHUB_PREFIX}InsightSoftwareConsortium/ITK.git GIT_TAG ${tag})
3333
endif()
3434

3535
## #############################################################################
3636
## Check if patch has to be applied
3737
## #############################################################################
3838

39-
ep_GeneratePatchCommand(ITK ITK_PATCH_COMMAND ITK.patch)
39+
#ep_GeneratePatchCommand(ITK ITK_PATCH_COMMAND ITK.patch)
4040

4141
## #############################################################################
4242
## Add external-project

0 commit comments

Comments
 (0)