Merge branch 'master' into spacePrecision

dzenanz · Sep 2, 2024 · bf777a9 · bf777a9
2 parents 667868e + d71031e
commit bf777a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -4,12 +4,12 @@ on: [push,pull_request]
 
 jobs:
   cxx-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@b223658f3ab10680ab2ec3286d070b9601ea6ef1
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0
     with:
       cmake-options: "Module_Montage_BUILD_EXAMPLES:BOOL=ON"
 
   python-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@b223658f3ab10680ab2ec3286d070b9601ea6ef1
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0
     with:
       test-notebooks: true
     secrets:

diff --git a/wrapping/itkTileMergeImageFilter.wrap b/wrapping/itkTileMergeImageFilter.wrap
@@ -1,13 +1,22 @@
+itk_wrap_include("itkLinearInterpolateImageFunction.h")
+itk_wrap_include("itkNearestNeighborInterpolateImageFunction.h")
 itk_wrap_class("itk::TileMergeImageFilter" POINTER)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    foreach(t ${WRAP_ITK_SCALAR})
-      itk_wrap_template("${ITKM_I${t}${d}}" "${ITKT_I${t}${d}}, double")
-    endforeach()
-    foreach(t ${WRAP_ITK_RGB})
-      itk_wrap_template("${ITKM_I${t}${d}}" "${ITKT_I${t}${d}}, itk::RGBPixel<float>")
-    endforeach()
-    foreach(t ${WRAP_ITK_RGBA})
-      itk_wrap_template("${ITKM_I${t}${d}}" "${ITKT_I${t}${d}}, itk::RGBAPixel<float>")
+  foreach(iif LinearInterpolateImageFunction NearestNeighborInterpolateImageFunction)
+    if (${iif} STREQUAL "LinearInterpolateImageFunction")
+      set(abbr "L")  # abbreviation to use in Python wrapping type name
+    else()
+      set(abbr "NN")
+    endif()
+    foreach(d ${ITK_WRAP_IMAGE_DIMS})
+      foreach(t ${WRAP_ITK_SCALAR})
+        itk_wrap_template("${ITKM_I${t}${d}}${abbr}" "${ITKT_I${t}${d}}, double, itk::${iif}<${ITKT_I${t}${d}}>")
+      endforeach()
+      foreach(t ${WRAP_ITK_RGB})
+        itk_wrap_template("${ITKM_I${t}${d}}${abbr}" "${ITKT_I${t}${d}}, itk::RGBPixel<float>, itk::${iif}<${ITKT_I${t}${d}}>")
+      endforeach()
+      foreach(t ${WRAP_ITK_RGBA})
+        itk_wrap_template("${ITKM_I${t}${d}}${abbr}" "${ITKT_I${t}${d}}, itk::RGBAPixel<float>, itk::${iif}<${ITKT_I${t}${d}}>")
+      endforeach()
     endforeach()
   endforeach()
 itk_end_wrap_class()
diff --git a/wrapping/itkTileMontage.wrap b/wrapping/itkTileMontage.wrap
@@ -2,6 +2,7 @@ itk_wrap_class("itk::TileMontage" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_SCALAR})
       itk_wrap_template("${ITKM_I${t}${d}}${ITKM_F}" "${ITKT_I${t}${d}},${ITKT_F}")
+      itk_wrap_template("${ITKM_I${t}${d}}${ITKM_D}" "${ITKT_I${t}${d}},${ITKT_D}")
     endforeach()
   endforeach()
 itk_end_wrap_class()