From 5b458f040e2df192e5b9acf1c310a95ed46cde7c Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 27 Aug 2024 10:42:55 +0200 Subject: [PATCH 1/3] WIP: Do not merge! Uses the N-Dekker/elastix fork of Matt's fork!!! --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 137c1a5..70e9b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ if(WASI OR EMSCRIPTEN) endif() # set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") -set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git") +set(elastix_GIT_REPOSITORY "https://github.com/N-Dekker/elastix.git") # Upstream + wasm patches # Branch: ITKElastix-2024-07-18-ebb429a33b set(elastix_GIT_TAG "0ab3f57a6528cce609feedeb1650e7c850beca94") From 257c0b12d784c9d3b6b29a2f1744f46b1849b616 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 27 Aug 2024 11:37:27 +0200 Subject: [PATCH 2/3] WIP: Use commit "Do not write transforms to file..." To commit https://github.com/N-Dekker/elastix/commit/8af959ce1a5b3ac9ae5faa10a67150571238741a "COMP: Do not write transforms to file with wasm" In branch https://github.com/N-Dekker/elastix/commits/ITKElastix-2024-07-18-ebb429a33b/ Skipped https://github.com/N-Dekker/elastix/commit/0ab3f57a6528cce609feedeb1650e7c850beca94 "COMP: Remove ITK_DISALLOW_COPY_AND_MOVE from UserData struct's" --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70e9b08..7e64bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ endif() set(elastix_GIT_REPOSITORY "https://github.com/N-Dekker/elastix.git") # Upstream + wasm patches # Branch: ITKElastix-2024-07-18-ebb429a33b -set(elastix_GIT_TAG "0ab3f57a6528cce609feedeb1650e7c850beca94") +set(elastix_GIT_TAG "8af959ce1a5b3ac9ae5faa10a67150571238741a") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY} From 3867c57e591be3611e2696029d5eaf249acaaefc Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 3 Sep 2024 16:33:24 +0200 Subject: [PATCH 3/3] WIP: Restore `#include "itkImageFileCastWriter.h"` Skipped https://github.com/thewtex/elastix/commit/55b7d3cf456c4ca553391aae418f3201a6d14be1 Removal of `#include "itkImageFileCastWriter.h"` seems problematic, as long as the WriteCastedImage calls are still there. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e64bbc..3138714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,8 +68,8 @@ endif() # set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git") set(elastix_GIT_REPOSITORY "https://github.com/N-Dekker/elastix.git") # Upstream + wasm patches -# Branch: ITKElastix-2024-07-18-ebb429a33b -set(elastix_GIT_TAG "8af959ce1a5b3ac9ae5faa10a67150571238741a") +# Branch: Branch_from_ITKElastix-2024-07-18-ebb429a33b +set(elastix_GIT_TAG "f0d287c7404b77fcf9ee39ab27168721d6496d67") FetchContent_Declare( elx GIT_REPOSITORY ${elastix_GIT_REPOSITORY}