Skip to content

ENH: Switch to latest version of SuperElastix/elastix (using ITK 5.1.1) #60

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

Merged
dzenanz merged 1 commit into from
Sep 14, 2020
Merged

ENH: Switch to latest version of SuperElastix/elastix (using ITK 5.1.1) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if(DEFINED ENV{ELASTIX_USE_OPENCL})
set(ELASTIX_USE_OPENCL ON CACHE BOOL "Enable OpenCL support in Elastix")
endif()

set(Elastix_LIBRARIES elastix transformix)
set(Elastix_LIBRARIES elastix_lib transformix_lib)
if(ELASTIX_USE_OPENCL)
list(APPEND Elastix_LIBRARIES elxOpenCL)
endif()
Expand Down Expand Up @@ -39,8 +39,9 @@ set(_itk_build_testing ${BUILD_TESTING})
#set(BUILD_TESTING OFF)
set(_itk_build_shared ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)
set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git")
set(elastix_GIT_TAG "a13be5c2daa1d2b8454609366aef3cba194be8c2")
set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
# Tag of commit "COMP: Fix implicit conversion warnings itkAdvancedImageMomentsCalculator"
set(elastix_GIT_TAG "a7e4fb99954f18eb34a65d60acc8ea1f1a5eeb12")
FetchContent_Declare(
elx
GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
Expand Down
1 change: 0 additions & 1 deletion include/itkElastixRegistrationMethod.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ namespace itk
template <typename TFixedImage, typename TMovingImage>
ElastixRegistrationMethod<TFixedImage, TMovingImage>::ElastixRegistrationMethod()
{
elastix::BaseComponent::InitializeElastixLibrary();
this->SetPrimaryInputName("FixedImage");
this->SetNumberOfIndexedOutputs(2);

Expand Down
2 changes: 0 additions & 2 deletions include/itkTransformixFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ namespace itk
template <typename TMovingImage>
TransformixFilter<TMovingImage>::TransformixFilter()
{
elastix::BaseComponent::InitializeElastixLibrary();

this->SetPrimaryInputName("TransformParameterObject");
this->SetPrimaryOutputName("ResultImage");
this->SetOutput("ResultDeformationField", this->MakeOutput("ResultDeformationField"));
Expand Down