BUG: Do not wrap signed distance map filters for integer image outputs

InsightSoftwareConsortium · Sep 9, 2020 · 076e990 · 076e990
1 parent b60c3c6
commit 076e990
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h
@@ -216,6 +216,8 @@ class ITK_TEMPLATE_EXPORT SignedDanielssonDistanceMapImageFilter : public ImageT
   // Begin concept checking
   itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible<int, PixelType>));
   itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits<PixelType>));
+  itkConceptMacro(OutputImagePixelTypeIsFloatingPointCheck,
+                  (Concept::IsFloatingPoint<typename OutputImageType::PixelType>));
   // End concept checking
 #endif
 

diff --git a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h
@@ -153,6 +153,15 @@ class ITK_TEMPLATE_EXPORT SignedMaurerDistanceMapImageFilter : public ImageToIma
   itkSetMacro(BackgroundValue, InputPixelType);
   itkGetConstReferenceMacro(BackgroundValue, InputPixelType);
 
+#ifdef ITK_USE_CONCEPT_CHECKING
+  // Begin concept checking
+  itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible<int, PixelType>));
+  itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits<PixelType>));
+  itkConceptMacro(OutputImagePixelTypeIsFloatingPointCheck,
+                  (Concept::IsFloatingPoint<typename OutputImageType::PixelType>));
+  // End concept checking
+#endif
+
 protected:
   SignedMaurerDistanceMapImageFilter();
   ~SignedMaurerDistanceMapImageFilter() override = default;

diff --git a/Modules/Filtering/DistanceMap/wrapping/itkSignedDanielssonDistanceMapImageFilter.wrap b/Modules/Filtering/DistanceMap/wrapping/itkSignedDanielssonDistanceMapImageFilter.wrap
@@ -1,5 +1,3 @@
 itk_wrap_class("itk::SignedDanielssonDistanceMapImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SIGN_INT}" 2)
-  itk_wrap_image_filter("${WRAP_ITK_REAL}" 2)
-  itk_wrap_image_filter_combinations("${WRAP_ITK_USIGN_INT}" "${WRAP_ITK_REAL}")
+  itk_wrap_image_filter_combinations("${WRAP_ITK_SCALAR}" "${WRAP_ITK_REAL}")
 itk_end_wrap_class()
diff --git a/Modules/Filtering/DistanceMap/wrapping/itkSignedMaurerDistanceMapImageFilter.wrap b/Modules/Filtering/DistanceMap/wrapping/itkSignedMaurerDistanceMapImageFilter.wrap
@@ -1,5 +1,3 @@
 itk_wrap_class("itk::SignedMaurerDistanceMapImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SIGN_INT}" 2 2+)
-  itk_wrap_image_filter("${WRAP_ITK_REAL}" 2 2+)
-  itk_wrap_image_filter_combinations("${WRAP_ITK_USIGN_INT}" "${WRAP_ITK_REAL}" 2+)
+  itk_wrap_image_filter_combinations("${WRAP_ITK_SCALAR}" "${WRAP_ITK_REAL}" 2+)
 itk_end_wrap_class()