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

Bump elastix version to 2023-05-15, use C++17, support any scalar pixel type #211

Merged
merged 2 commits into from
May 16, 2023
Merged

Bump elastix version to 2023-05-15, use C++17, support any scalar pixel type #211

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
1043f10
ENH: Bump elastix version to 2023-05-15, use C++17
N-Dekker May 2, 2023
5a6f9fe
ENH: Support any scalar type (not just real) as input pixel type
N-Dekker May 11, 2023
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: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.16.3)
project(Elastix)

if(NOT CMAKE_CXX_STANDARD)
thewtex marked this conversation as resolved.
Show resolved Hide resolved
# SuperElastix/elastix uses C++17 specific features in some of its header files.
set(CMAKE_CXX_STANDARD 17)
endif()

# To ease enablement with Python packaging
if(DEFINED ENV{ELASTIX_USE_OPENCL})
set(ELASTIX_USE_OPENCL ON CACHE BOOL "Enable OpenCL support in Elastix")
Expand Down Expand Up @@ -51,7 +56,7 @@ if(SKBUILD)
endif()

set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
set(elastix_GIT_TAG "d652938573e5f193955908eba225a854b31ce36a")
set(elastix_GIT_TAG "b9b8e20aef83f94ed38a81cc38625a1bfddf1053")
FetchContent_Declare(
elx
GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
Expand Down
2 changes: 1 addition & 1 deletion wrapping/itkElastixRegistrationMethod.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
itk_wrap_class("itk::ElastixRegistrationMethod" POINTER)
itk_wrap_image_filter("${WRAP_ITK_REAL}" 2)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2)
itk_end_wrap_class()

2 changes: 1 addition & 1 deletion wrapping/itkTransformixFilter.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
itk_wrap_class("itk::TransformixFilter" POINTER)
itk_wrap_image_filter("${WRAP_ITK_REAL}" 1)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 1)
itk_end_wrap_class()