COMP: Fix duplicate wrapping warnings. Closes #51.

InsightSoftwareConsortium · Mar 1, 2022 · 893b043 · 893b043
1 parent 1c383c7
commit 893b043
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 66 deletions.
diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt
@@ -1,6 +1,7 @@
 itk_wrap_module(BoneMorphometry)
 
 set(WRAPPER_SUBMODULE_ORDER
+   itkBoneCommon
    itkBoneMorphometryFeaturesFilter
    itkBoneMorphometryFeaturesImageFilter
    itkReplaceFeatureMapNanInfImageFilter)

diff --git a/wrapping/itkBoneCommon.wrap b/wrapping/itkBoneCommon.wrap
@@ -0,0 +1,25 @@
+set(OutputVectorDim 5)
+
+WRAP_TYPE("itk::Image" "I" "itkImage.h")
+    ADD_TEMPLATE("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
+END_WRAP_TYPE()
+
+itk_wrap_class("itk::Image" POINTER)
+    itk_wrap_template("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
+itk_end_wrap_class()
+
+itk_wrap_class("itk::ImageSource" POINTER)
+    itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3" "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
+itk_end_wrap_class()
+
+itk_wrap_simple_class("itk::ImageIOBase" )
+
+itk_wrap_class("itk::ImageFileReader" POINTER)
+  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
+                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
+itk_end_wrap_class()
+
+itk_wrap_class("itk::ImageFileWriter" POINTER)
+  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
+                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
+itk_end_wrap_class()
diff --git a/wrapping/itkBoneMorphometryFeaturesImageFilter.wrap b/wrapping/itkBoneMorphometryFeaturesImageFilter.wrap
@@ -1,23 +1,4 @@
 set(OutputVectorDim 5)
-itk_wrap_class("itk::FixedArray")
-  itk_wrap_template("${ITKM_F}${OutputVectorDim}" "${ITKT_F},${OutputVectorDim}")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::Vector")
-  itk_wrap_template("${ITKM_F}${OutputVectorDim}" "${ITKT_F},${OutputVectorDim}")
-itk_end_wrap_class()
-
-WRAP_TYPE("itk::Image" "I" "itkImage.h")
-    ADD_TEMPLATE("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
-END_WRAP_TYPE()
-
-itk_wrap_class("itk::Image" POINTER)
-    itk_wrap_template("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::ImageSource" POINTER)
-    itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3" "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-itk_end_wrap_class()
 
 itk_wrap_class("itk::ImageToImageFilter" POINTER)
   foreach(t ${WRAP_ITK_SCALAR})
@@ -26,18 +7,6 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
   endforeach()
 itk_end_wrap_class()
 
-itk_wrap_simple_class("itk::ImageIOBase" )
-
-itk_wrap_class("itk::ImageFileReader" POINTER)
-  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
-                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::ImageFileWriter" POINTER)
-  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
-                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-itk_end_wrap_class()
-
 itk_wrap_class("itk::BoneMorphometryFeaturesImageFilter" POINTER)
   foreach(t ${WRAP_ITK_SCALAR})
     itk_wrap_template("${ITKM_I${t}3}IV${ITKM_F}${OutputVectorDim}3"

diff --git a/wrapping/itkReplaceFeatureMapNanInfImageFilter.wrap b/wrapping/itkReplaceFeatureMapNanInfImageFilter.wrap
@@ -1,41 +1,8 @@
 set(OutputVectorDim 5)
-itk_wrap_class("itk::FixedArray")
-  itk_wrap_template("${ITKM_F}${OutputVectorDim}" "${ITKT_F},${OutputVectorDim}")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::Vector")
-  itk_wrap_template("${ITKM_F}${OutputVectorDim}" "${ITKT_F},${OutputVectorDim}")
-itk_end_wrap_class()
-
-WRAP_TYPE("itk::Image" "I" "itkImage.h")
-    ADD_TEMPLATE("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
-END_WRAP_TYPE()
-
-itk_wrap_class("itk::Image" POINTER)
-    itk_wrap_template("V${ITKM_F}${OutputVectorDim}3" "itk::Vector<${ITKT_F},${OutputVectorDim}>,3")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::ImageSource" POINTER)
-    itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3" "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-itk_end_wrap_class()
 
 itk_wrap_class("itk::ImageToImageFilter" POINTER)
-  foreach(t ${WRAP_ITK_SCALAR})
-    itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3IV${ITKM_F}${OutputVectorDim}3"
-                      "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-  endforeach()
-itk_end_wrap_class()
-
-itk_wrap_simple_class("itk::ImageIOBase" )
-
-itk_wrap_class("itk::ImageFileReader" POINTER)
-  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
-                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
-itk_end_wrap_class()
-
-itk_wrap_class("itk::ImageFileWriter" POINTER)
-  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3"
-                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
+  itk_wrap_template("IV${ITKM_F}${OutputVectorDim}3IV${ITKM_F}${OutputVectorDim}3"
+                    "itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>, itk::Image<itk::Vector<${ITKT_F},${OutputVectorDim}>,3>")
 itk_end_wrap_class()
 
 itk_wrap_class("itk::ReplaceFeatureMapNanInfImageFilter" POINTER)