ITK: Update ITK to version 5.3.0

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Dec 1, 2023 · 400d2d5 · 400d2d5
1 parent 7b1b957
commit 400d2d5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
@@ -49,7 +49,7 @@ OSInformation()
 message(STATUS "* -------------- Dependent Libraries -------------------------------------------")
 message(STATUS "* Eigen (${Eigen3_VERSION}) ${Eigen3_DIR}")
 message(STATUS "* HDF5 (${HDF5_VERSION}) ${HDF5_INSTALL}")
-message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}")
+# message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}")
 message(STATUS "* Pybind11 (${pybind11_VERSION}) ${pybind11_DIR}")
 message(STATUS "* TBB (${TBB_VERSION}) ${TBB_DIR}")
 message(STATUS "* fmt (${fmt_VERSION}) ${fmt_DIR}")

diff --git a/src/Plugins/ITKImageProcessing/CMakeLists.txt b/src/Plugins/ITKImageProcessing/CMakeLists.txt
@@ -53,6 +53,8 @@ if(NOT GENERATOR_IS_MULTI_CONFIG)
   set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${ITK_LIB_DIR})
 endif()
 
+message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}")
+
 include("${complex_SOURCE_DIR}/cmake/Plugin.cmake")
 
 set(PLUGIN_NAME "ITKImageProcessing")

diff --git a/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp b/...Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp
@@ -20,7 +20,7 @@ namespace itk
 class Dream3DFilterInterruption : public Command
 {
 public:
-  ITK_DISALLOW_COPY_AND_ASSIGN(Dream3DFilterInterruption);
+  ITK_DISALLOW_COPY_AND_MOVE(Dream3DFilterInterruption);
 
   /** Standard class type aliases. */
   using Self = Dream3DFilterInterruption;

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.cpp
@@ -10,7 +10,7 @@ Result<OutputActions> ReadImagePreflight(const std::string& fileName, DataPath i
 
   try
   {
-    itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::ImageIOFactory::ReadMode);
+    itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::CommonEnums::IOFileMode::ReadMode);
     if(imageIO == nullptr)
     {
       return MakeErrorResult<OutputActions>(-5, fmt::format("ITK could not read the given file \"{}\". Format is likely unsupported.", fileName));

diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp
@@ -108,7 +108,7 @@ Result<> ReadImageExecute(const std::string& fileName, ArgsT&&... args)
 {
   try
   {
-    itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::ImageIOFactory::ReadMode);
+    itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(fileName.c_str(), itk::CommonEnums::IOFileMode::ReadMode);
     if(imageIO == nullptr)
     {
       return MakeErrorResult(-5, fmt::format("ITK could not read the given file \"{}\". Format is likely unsupported.", fileName));

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -7,7 +7,7 @@
   "registries": [
     {
       "kind": "git",
-      "repository": "https://github.com/bluequartzsoftware/complex-registry",
+      "repository": "https://github.com/imikejackson/complex-registry",
       "packages": [
         "blosc",
         "boost-mp11",
@@ -32,7 +32,7 @@
         "zlib",
         "zstd"
       ],
-      "baseline": "29602a9d88e4c918904a0bd0fab83c5289700908"
+      "baseline": "bdadae19f8f991a9df224a35f01a2ba2effc0d92"
     }
   ]
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -65,7 +65,8 @@
       "description": "ITK",
       "dependencies": [
         {
-          "name": "itk"
+          "name": "itk",
+          "version>=": "5.3.0"
         }
       ]
     },