BUG: Update associated test

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

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.h
@@ -155,10 +155,9 @@ class ITK_TEMPLATE_EXPORT SignedMaurerDistanceMapImageFilter : public ImageToIma
 
 #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>));
+  itkConceptMacro(IntConvertibleToInputCheck, (Concept::Convertible<int, InputPixelType>));
+  itkConceptMacro(InputHasNumericTraitsCheck, (Concept::HasNumericTraits<InputPixelType>));
+  itkConceptMacro(OutputImagePixelTypeIsFloatingPointCheck, (Concept::IsFloatingPoint<OutputPixelType>));
   // End concept checking
 #endif
 

diff --git a/Modules/Filtering/DistanceMap/test/CMakeLists.txt b/Modules/Filtering/DistanceMap/test/CMakeLists.txt
@@ -47,9 +47,9 @@ itk_add_test(NAME itkSignedDanielssonDistanceMapImageFilterTest1
     itkSignedDanielssonDistanceMapImageFilterTest1 DATA{${ITK_DATA_ROOT}/Input/BinaryImageWithVariousShapes01.png} ${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest1.mhd 2)
 itk_add_test(NAME itkSignedDanielssonDistanceMapImageFilterTest2
       COMMAND ITKDistanceMapTestDriver
-    --compare DATA{${ITK_DATA_ROOT}/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.png}
-              ${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest2.png
-    itkSignedDanielssonDistanceMapImageFilterTest2 DATA{${ITK_DATA_ROOT}/Input/BinaryImageWithVariousShapes01.png} ${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest2.png)
+    --compare DATA{${ITK_DATA_ROOT}/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.mha}
+              ${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest2.mha
+    itkSignedDanielssonDistanceMapImageFilterTest2 DATA{${ITK_DATA_ROOT}/Input/BinaryImageWithVariousShapes01.png} ${ITK_TEST_OUTPUT_DIR}/itkSignedDanielssonDistanceMapImageFilterTest2.mha)
 # Test the distance filter on a 3D volume.
 # The output should be the same as the output of the Maurer distance map filter.
 itk_add_test(NAME itkSignedDanielssonDistanceMapImageFilterTest3D

diff --git a/Modules/Filtering/DistanceMap/test/itkSignedDanielssonDistanceMapImageFilterTest2.cxx b/Modules/Filtering/DistanceMap/test/itkSignedDanielssonDistanceMapImageFilterTest2.cxx
@@ -33,7 +33,7 @@ itkSignedDanielssonDistanceMapImageFilterTest2(int argc, char * argv[])
 
   constexpr unsigned int ImageDimension = 2;
   using InputPixelType = unsigned char;
-  using OutputPixelType = unsigned char;
+  using OutputPixelType = float;
 
   using InputImageType = itk::Image<InputPixelType, ImageDimension>;
   using OutputImageType = itk::Image<OutputPixelType, ImageDimension>;

diff --git a/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.mha.md5 b/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.mha.md5
@@ -0,0 +1 @@
+8ffac93bde2f7d15315eff5b755924e1
diff --git a/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.mha.sha512 b/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.mha.sha512
@@ -0,0 +1 @@
+3d3edd03a084eae679ed3dcd81bd0d636729e783e0c7bc85c2de86d41b551956e9ca19df94f1cec03eb0394b883f6ddb9fcdb3069f722577629c209c3253691b
diff --git a/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.png.md5 b/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.png.md5
diff --git a/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.png.sha512 b/Testing/Data/Baseline/BasicFilters/itkSignedDanielssonDistanceMapImageFilterTest2.png.sha512
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		3d3edd03a084eae679ed3dcd81bd0d636729e783e0c7bc85c2de86d41b551956e9ca19df94f1cec03eb0394b883f6ddb9fcdb3069f722577629c209c3253691b