From 04473ca89034f3f2170c15827b8b4a02a984ad11 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Thu, 24 Jan 2019 15:21:16 -0500
Subject: [PATCH] COMP: Wrapping of VectorContainer and DefaultStaticMeshTraits

Address the runtime warnings:

  Template itk::VectorContainer<unsignedchar,signedshort>
 already defined as <class 'itkVectorContainerPython.itkVectorContainerUCSS'>
 is redefined as <class 'itkVectorContainerPython.itkVectorContainerUCSS'>
Warning: template already defined 'itk::VectorContainer<unsignedchar,signedshort>'
Template itk::VectorContainer<unsignedlonglong,unsignedchar>
 already defined as <class 'itkVectorContainerPython.itkVectorContainerULLUC'>
 is redefined as <class 'itkVectorContainerPython.itkVectorContainerULLUC'>
Warning: template already defined 'itk::VectorContainer<unsignedlonglong,unsignedchar>'
Template itk::VectorContainer<unsignedchar,unsignedchar>
 already defined as <class 'itkVectorContainerPython.itkVectorContainerUCUC'>
 is redefined as <class 'itkVectorContainerPython.itkVectorContainerUCUC'>
Warning: template already defined 'itk::VectorContainer<unsignedchar,unsignedchar>'
Warning: Unknown parameter 'itk::DefaultStaticMeshTraits< double,2,2,double,double,double >' in template 'itk::PointSet'
Warning: Unknown parameter 'itk::DefaultStaticMeshTraits< double,3,3,double,double,double >' in template 'itk::PointSet'

by removing duplicate instantiations and adding the missing ones.

This is a follow-up to 443955f9644fdddf280afee7ba2334a512e4dd7a
---
 .../Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap  | 2 +-
 Modules/Core/Common/wrapping/itkVectorContainer.wrap      | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Modules/Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap b/Modules/Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap
index 9dd4f84efcf..31b5c93d8eb 100644
--- a/Modules/Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap
+++ b/Modules/Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap
@@ -4,7 +4,7 @@ itk_wrap_class("itk::DefaultStaticMeshTraits")
     foreach(t ${types})
       itk_wrap_template("${ITKM_${t}}${d}" "${ITKT_${t}},${d}")
     endforeach()
-    itk_wrap_template("${ITKM_D}${d}${d}${ITKM_D}${ITKM_F}${ITKM_D}" "${ITKT_D},${d},${d},${ITKT_D},${ITKT_F},${ITKT_D}")
+    itk_wrap_template("${ITKM_D}${d}${d}${ITKM_D}${ITKM_D}${ITKM_D}" "${ITKT_D},${d},${d},${ITKT_D},${ITKT_D},${ITKT_D}")
     itk_wrap_template("${ITKM_D}${d}${d}${ITKM_F}${ITKM_F}${ITKM_D}" "${ITKT_D},${d},${d},${ITKT_F},${ITKT_F},${ITKT_D}")
     itk_wrap_template("M${ITKM_D}${d}${d}${d}${d}${ITKM_F}${ITKM_F}M${ITKM_D}${d}${d}"
     "itk::Matrix< ${ITKT_D},${d},${d} >, ${d},${d},${ITKT_F},${ITKT_F}, itk::Matrix< ${ITKT_D}, ${d}, ${d} >")
diff --git a/Modules/Core/Common/wrapping/itkVectorContainer.wrap b/Modules/Core/Common/wrapping/itkVectorContainer.wrap
index 231ebebbfb1..1a76b1b9a83 100644
--- a/Modules/Core/Common/wrapping/itkVectorContainer.wrap
+++ b/Modules/Core/Common/wrapping/itkVectorContainer.wrap
@@ -4,8 +4,11 @@ itk_wrap_class("itk::VectorContainer" POINTER)
   # double is always needed by KernelTransform
   UNIQUE(scalar_types "${WRAP_ITK_SCALAR};D")
   foreach(t ${scalar_types})
-    itk_wrap_template("${ITKM_IT}${ITKM_${t}}" "${ITKT_IT},${ITKT_${t}}")
-    itk_wrap_template("${ITKM_UC}${ITKM_${t}}" "${ITKT_UC},${ITKT_${t}}")
+    # These are wrapped below with "vectypes"
+    if(NOT ${t} STREQUAL "UC")
+      itk_wrap_template("${ITKM_IT}${ITKM_${t}}" "${ITKT_IT},${ITKT_${t}}")
+      itk_wrap_template("${ITKM_UC}${ITKM_${t}}" "${ITKT_UC},${ITKT_${t}}")
+    endif()
   endforeach()
   UNIQUE(real_types "${WRAP_ITK_REAL};D")
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
@@ -19,7 +22,6 @@ itk_wrap_class("itk::VectorContainer" POINTER)
     itk_wrap_template("${ITKM_UC}${ITKM_O${d}}"  "${ITKT_UC},${ITKT_O${d}}")
     itk_wrap_template("${ITKM_UI}${ITKM_CID${d}}" "${ITKT_UI},${ITKT_CID${d}}")
   endforeach()
-  itk_wrap_template("${ITKM_UC}${ITKM_SS}"    "${ITKT_UC},${ITKT_SS}")
   # used in FastMarchingExtensionImageFilter
   itk_wrap_template("${ITKM_UI}${ITKM_VUC1}"    "${ITKT_UI},${ITKT_VUC1}")
   itk_wrap_template("${ITKM_IT}S${ITKM_IT}"    "${ITKT_IT}, std::set< ${ITKT_IT} >")