Skip to content

COMP: Wrapping of VectorContainer and DefaultStaticMeshTraits #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewtex merged 1 commit into from
Jan 25, 2019
Merged

COMP: Wrapping of VectorContainer and DefaultStaticMeshTraits #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/Core/Common/wrapping/itkDefaultStaticMeshTraits.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} >")
Expand Down
8 changes: 5 additions & 3 deletions Modules/Core/Common/wrapping/itkVectorContainer.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Copy Markdown
Contributor

@fbudin69500 fbudin69500 Jan 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is "UC" not wrapped? I don't see anywhere else where it is wrapped in this file.

Copy link
Copy Markdown
Member Author

@thewtex thewtex Jan 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UC is wrapped here: https://github.com/InsightSoftwareConsortium/ITK/pull/442/files#diff-f6ed0a76b0d14eeb12481dde620b2ef6L30

If it was not wrapped, a build error or warning would result.

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})
Expand All @@ -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} >")
Expand Down