From 2e2b3332cd8dc4b6bd753de2be25525ca32ff5b3 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Tue, 9 Jun 2020 12:30:29 -0400
Subject: [PATCH] BUG: Simplify itk.BlockMatchingImageFilter feature points
 PointSet mangling

Simplify the Python wrapping name mangling to remove the
DefaultStaticMeshTraits, standard with itk 5 mesh wrapping.
---
 Modules/Core/Common/wrapping/itkPointSet.wrap               | 5 +----
 .../Common/wrapping/itkBlockMatchingImageFilter.wrap        | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Modules/Core/Common/wrapping/itkPointSet.wrap b/Modules/Core/Common/wrapping/itkPointSet.wrap
index 18e7a6a3407..726c12fd78e 100644
--- a/Modules/Core/Common/wrapping/itkPointSet.wrap
+++ b/Modules/Core/Common/wrapping/itkPointSet.wrap
@@ -17,9 +17,6 @@ itk_wrap_class("itk::PointSet" POINTER)
       "${ITKT_UI},${d},itk::DefaultStaticMeshTraits<${ITKT_UI},${d},${d},${ITKT_F},${ITKT_F},${ITKT_UI} >")
   endforeach()
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    # Also wrap the point set type needed for the kernel transforms,
-    # which may be a bug in ITK but they're needed currently.
-    itk_wrap_template("M${ITKM_D}${d}${d}STM${ITKM_D}${d}${d}${d}${d}${ITKM_F}${ITKM_F}M${ITKM_D}${d}${d}"
-      "itk::Matrix <${ITKT_D},${d},${d}>,${d},itk::DefaultStaticMeshTraits< itk::Matrix <${ITKT_D},${d},${d}>,${d},${d},${ITKT_F},${ITKT_F},itk::Matrix <${ITKT_D},${d},${d}> >")
+    itk_wrap_template("M${ITKM_D}${d}${d}" "itk::Matrix <${ITKT_D},${d},${d}>,${d}")
   endforeach()
 itk_end_wrap_class()
diff --git a/Modules/Registration/Common/wrapping/itkBlockMatchingImageFilter.wrap b/Modules/Registration/Common/wrapping/itkBlockMatchingImageFilter.wrap
index ab07b35ce0e..ac429c63df1 100644
--- a/Modules/Registration/Common/wrapping/itkBlockMatchingImageFilter.wrap
+++ b/Modules/Registration/Common/wrapping/itkBlockMatchingImageFilter.wrap
@@ -6,10 +6,8 @@ if(has_d_3)
   itk_end_wrap_class()
 
   itk_wrap_class("itk::PointSet" POINTER)
-    itk_wrap_template("VF33DTVF333FFVF3"
-      "itk::Vector< float, 3 >, 3, itk::DefaultStaticMeshTraits< itk::Vector< float, 3 >, 3, 3, float, float, itk::Vector< float, 3 > >")
-    itk_wrap_template("D3DTD33FFD"
-      "double, 3, itk::DefaultStaticMeshTraits< double, 3, 3, float, float, double >")
+    itk_wrap_template("VF33" "itk::Vector< float, 3 >, 3")
+    itk_wrap_template("D3" "double, 3")
   itk_end_wrap_class()
 
 endif()