BUG: Fix JoinSeriesImageFilter 4D image support regression

SuperElastix · May 11, 2017 · 6e65610 · 6e65610
1 parent d97eab4
commit 6e65610
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -145,9 +145,9 @@ option( SimpleITK_INT64_PIXELIDS "Instantiate 64-bit integer pixels, including u
 sitk_legacy_naming(SimpleITK_INT64_PIXELIDS)
 
 
-option( SimpleITK_4D_IMAGES "Add Image and I/O support for four spatial dimensions." OFF )
+option( SimpleITK_4D_IMAGES "Add Image and I/O support for four spatial dimensions." ON )
 mark_as_advanced( SimpleITK_4D_IMAGES )
-sitk_legacy_naming(SimpleITK_4D_IMAGES)
+sitk_legacy_naming( SimpleITK_4D_IMAGES )
 
 
 # Setup build locations.

diff --git a/Code/BasicFilters/json/JoinSeriesImageFilter.json b/Code/BasicFilters/json/JoinSeriesImageFilter.json
@@ -5,7 +5,7 @@
   "number_of_inputs" : 1,
   "pixel_types" : "NonLabelPixelIDTypeList",
   "output_image_type" : "typename InputImageType::template Rebind<typename InputImageType::PixelType, InputImageType::ImageDimension+1>::Type",
-  "custom_register" : "this->m_MemberFactory->RegisterMemberFunctions< PixelIDTypeList, 2 > ();\n  #ifdef SimpleITK_4D_IMAGES\n    this->m_MemberFactory->RegisterMemberFunctions< PixelIDTypeList, 3 > ();\n  #endif",
+  "custom_register" : "this->m_MemberFactory->RegisterMemberFunctions< PixelIDTypeList, 2 > ();\n  #ifdef SITK_4D_IMAGES\n    this->m_MemberFactory->RegisterMemberFunctions< PixelIDTypeList, 3 > ();\n  #endif",
   "members" : [
     {
       "name" : "Origin",

diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake
@@ -148,7 +148,7 @@ option(BUILD_SHARED_LIBS "Build SimpleITK ITK with shared libraries. This does n
 # as this option does not robustly work across platforms it will be marked as advanced
 mark_as_advanced( FORCE BUILD_SHARED_LIBS )
 
-option( SimpleITK_4D_IMAGES "Add Image and I/O support for four spatial dimensions." OFF )
+option( SimpleITK_4D_IMAGES "Add Image and I/O support for four spatial dimensions." ON )
 mark_as_advanced( SimpleITK_4D_IMAGES )
 
 #-----------------------------------------------------------------------------