From 6bf2ffeebfed8a8cad7873c528c695a0afba3b2b Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Tue, 17 Dec 2024 15:19:08 -0500 Subject: [PATCH] WIP: Preserve compatible behavior don't change default yet. --- CMakeLists.txt | 4 ---- Modules/IO/MINC/src/CMakeLists.txt | 2 -- Modules/IO/MINC/src/itkMINCImageIO.cxx | 4 +--- Modules/IO/MINC/test/itkMINCImageIOTest4.cxx | 5 +---- Modules/IO/TransformMINC/src/itkMINCTransformIO.cxx | 4 +--- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c17e8116898..24ce5ef741f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -372,10 +372,6 @@ mark_as_advanced(ITK_NIFTI_IO_ANALYZE_FLAVOR) option(ITK_NIFTI_IO_SFORM_PERMISSIVE_DEFAULT "Allow non-orthogonal rotation matrix in NIFTI sform by default" OFF) mark_as_advanced(ITK_NIFTI_IO_SFORM_PERMISSIVE_DEFAULT) -# Automatically convert MINC coordinate system from PositiveCoordinateOrientation RAS to PositiveCoordinateOrientation LPS -option(ITK_MINC_IO_RAS_TO_LPS "Convert MINC coordinate system from PositiveCoordinateOrientation RAS to PositiveCoordinateOrientation LPS by default" ON) - -mark_as_advanced(ITK_MINC_IO_RAS_TO_LPS) #----------------------------------------------------------------------------- # ITK build classes that are in the review process # ITK_USE_REVIEW is deprecated, only kept for backward compatibility diff --git a/Modules/IO/MINC/src/CMakeLists.txt b/Modules/IO/MINC/src/CMakeLists.txt index e3d20fed5e1..b3b81726736 100644 --- a/Modules/IO/MINC/src/CMakeLists.txt +++ b/Modules/IO/MINC/src/CMakeLists.txt @@ -1,5 +1,3 @@ -configure_file(itkMINCImageIOConfigurePrivate.h.in itkMINCImageIOConfigurePrivate.h @ONLY) -include_directories("${CMAKE_CURRENT_BINARY_DIR}") set(ITKIOMINC_SRC itkMINCImageIO.cxx itkMINCImageIOFactory.cxx) diff --git a/Modules/IO/MINC/src/itkMINCImageIO.cxx b/Modules/IO/MINC/src/itkMINCImageIO.cxx index 970a6f5d8bb..2b347ae1e34 100644 --- a/Modules/IO/MINC/src/itkMINCImageIO.cxx +++ b/Modules/IO/MINC/src/itkMINCImageIO.cxx @@ -29,8 +29,6 @@ #include // For unique_ptr. -#include "itkMINCImageIOConfigurePrivate.h" - extern "C" { @@ -238,7 +236,7 @@ MINCImageIO::CloseVolume() MINCImageIO::MINCImageIO() : m_MINCPImpl(std::make_unique()) - , m_RAStoLPS(ITK_MINC_IO_RAS_TO_LPS) + , m_RAStoLPS(false) { for (auto & dimensionIndex : m_MINCPImpl->m_DimensionIndices) { diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx index 59d19a52d65..1de25283e8e 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx @@ -28,9 +28,6 @@ #include "itkImageMomentsCalculator.h" #include "itkStdStreamStateSave.h" #include "itkTestingMacros.h" - -#include "itkMINCImageIOConfigurePrivate.h" - template int test_image_moments(const char * input_image, @@ -133,7 +130,7 @@ itkMINCImageIOTest4(int argc, char * argv[]) const char * input = argv[1]; const char * output = argv[2]; int ras_to_lps_test = atoi(argv[3]); - bool ras_to_lps = ras_to_lps_test < 0 ? ITK_MINC_IO_RAS_TO_LPS : ras_to_lps_test == 1; + bool ras_to_lps = ras_to_lps_test < 0 ? false : ras_to_lps_test == 1; double total = 0.0; double mx = 0.0; diff --git a/Modules/IO/TransformMINC/src/itkMINCTransformIO.cxx b/Modules/IO/TransformMINC/src/itkMINCTransformIO.cxx index ad39250f6e8..dd1871d858a 100644 --- a/Modules/IO/TransformMINC/src/itkMINCTransformIO.cxx +++ b/Modules/IO/TransformMINC/src/itkMINCTransformIO.cxx @@ -34,8 +34,6 @@ #include "itkImageRegionIterator.h" #include "vnl/vnl_vector_fixed.h" -#include "itkMINCImageIOConfigurePrivate.h" - namespace itk { @@ -43,7 +41,7 @@ namespace itk template MINCTransformIOTemplate::MINCTransformIOTemplate() : m_XFM_initialized(false) - , m_RAStoLPS(ITK_MINC_IO_RAS_TO_LPS) + , m_RAStoLPS(false) {} template