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} >")