Merge pull request InsightSoftwareConsortium#4811 from thewtex/space-…

…precision-for-release-5.4
Kitware · Aug 21, 2024 · e78f1c9 · e78f1c9
2 parents 276a52a + 2734a97
commit e78f1c9
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 36 deletions.
diff --git a/Examples/DataRepresentation/Image/Image4.cxx b/Examples/DataRepresentation/Image/Image4.cxx
@@ -441,7 +441,8 @@ main(int, char *[])
   // SoftwareGuide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  using MatrixType = itk::Matrix<double, Dimension, Dimension>;
+  using MatrixType =
+    itk::Matrix<itk::SpacePrecisionType, Dimension, Dimension>;
   MatrixType SpacingMatrix;
   SpacingMatrix.Fill(0.0F);
 

diff --git a/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx b/Modules/Core/Common/test/itkSpatialOrientationAdaptorGTest.cxx
@@ -34,10 +34,10 @@ TEST(SpatialOrientationAdaptor, test1)
   EXPECT_EQ(itk::SpatialOrientationEnums::ValidCoordinateOrientations::ITK_COORDINATE_ORIENTATION_RAI,
             adapter.FromDirectionCosines(d1));
 
-  const double  data[] = { 0.5986634407395047, 0.22716302314740483, -0.768113953548866,
-                          0.5627936241740271, 0.563067040943212,   0.6051601804419384,
-                          0.5699696670095713, -0.794576911518317,  0.20924175102261847 };
-  DirectionType d2{ DirectionType::InternalMatrixType{ data } };
+  const itk::SpacePrecisionType data[] = { 0.5986634407395047, 0.22716302314740483, -0.768113953548866,
+                                           0.5627936241740271, 0.563067040943212,   0.6051601804419384,
+                                           0.5699696670095713, -0.794576911518317,  0.20924175102261847 };
+  DirectionType                 d2{ DirectionType::InternalMatrixType{ data } };
   EXPECT_EQ(itk::SpatialOrientationEnums::ValidCoordinateOrientations::ITK_COORDINATE_ORIENTATION_ASL,
             adapter.FromDirectionCosines(d2));
 }
diff --git a/Modules/Core/ImageFunction/include/itkGaussianDerivativeImageFunction.h b/Modules/Core/ImageFunction/include/itkGaussianDerivativeImageFunction.h
@@ -77,7 +77,7 @@ class ITK_TEMPLATE_EXPORT GaussianDerivativeImageFunction
   static constexpr unsigned int ImageDimension2 = ImageDimension;
 #endif
 
-  using ContinuousIndexType = ContinuousIndex<SpacePrecisionType, Self::ImageDimension>;
+  using ContinuousIndexType = typename Superclass::ContinuousIndexType;
 
   using NeighborhoodType = Neighborhood<InputPixelType, Self::ImageDimension>;
   using OperatorNeighborhoodType = Neighborhood<TOutput, Self::ImageDimension>;
@@ -96,7 +96,7 @@ class ITK_TEMPLATE_EXPORT GaussianDerivativeImageFunction
 
   /** Point type alias support */
   // using PointType = Point< TOutput, Self::ImageDimension >;
-  using PointType = typename InputImageType::PointType;
+  using PointType = typename Superclass::PointType;
 
   /** Evaluate the function at the specified point. */
   OutputType

diff --git a/Modules/Core/ImageFunction/include/itkImageFunction.h b/Modules/Core/ImageFunction/include/itkImageFunction.h
@@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT ImageFunction : public FunctionBase<Point<TCoordRep, T
 
   /** Evaluate the function at specified Point position.
    * Subclasses must provide this method. */
-  TOutput
+  OutputType
   Evaluate(const PointType & point) const override = 0;
 
   /** Evaluate the function at specified Index position.

diff --git a/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx
@@ -35,7 +35,7 @@
 
 
 using InputPixelType = double;
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 
 // Set up for 1D Images
 enum

diff --git a/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx
@@ -49,7 +49,7 @@ enum
 using ImageType = itk::Image<InputPixelType, ImageDimension>;
 using ImageAdaptorType = itk::ImageAdaptor<ImageType, RedChannelPixelAccessor>;
 
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 
 using InterpolatorType = itk::LinearInterpolateImageFunction<ImageAdaptorType, CoordRepType>;
 using IndexType = InterpolatorType::IndexType;

diff --git a/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx b/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx
@@ -25,7 +25,7 @@
 
 using SizeType = itk::Size<3>;
 using ImageType = itk::Image<unsigned short, 3>;
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 using InterpolatorType = itk::LinearInterpolateImageFunction<ImageType, CoordRepType>;
 using IndexType = InterpolatorType::IndexType;
 using PointType = InterpolatorType::PointType;

diff --git a/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx
@@ -34,7 +34,7 @@ enum
 }; // RGB is a vector of dimension 3
 using PixelType = itk::RGBPixel<unsigned short>;
 using ImageType = itk::Image<PixelType, ImageDimension>;
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 using InterpolatorType = itk::VectorLinearInterpolateImageFunction<ImageType, CoordRepType>;
 using IndexType = InterpolatorType::IndexType;
 using PointType = InterpolatorType::PointType;

diff --git a/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx
@@ -30,7 +30,7 @@ enum
 };
 using PixelType = itk::Vector<unsigned short, VectorDimension>;
 using ImageType = itk::Image<PixelType, ImageDimension>;
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 using InterpolatorType = itk::VectorLinearInterpolateImageFunction<ImageType, CoordRepType>;
 using IndexType = InterpolatorType::IndexType;
 using PointType = InterpolatorType::PointType;

diff --git a/...geFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx b/...geFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx
@@ -31,7 +31,7 @@ enum
 };
 using PixelType = itk::Vector<unsigned short, VectorDimension>;
 using ImageType = itk::Image<PixelType, ImageDimension>;
-using CoordRepType = double;
+using CoordRepType = itk::SpacePrecisionType;
 
 using InterpolatorType = itk::VectorLinearInterpolateNearestNeighborExtrapolateImageFunction<ImageType, CoordRepType>;
 

diff --git a/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx b/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx
@@ -56,7 +56,7 @@ itkImageMaskSpatialObjectTest2(int, char *[])
   // Set the direction for a non-oriented image
   // to better test the frequently encountered case
   // Use non axis aligned image directions
-  itk::Euler3DTransform<double>::Pointer tfm = itk::Euler3DTransform<double>::New();
+  auto tfm = itk::Euler3DTransform<itk::SpacePrecisionType>::New();
   tfm->SetRotation(30.0 * itk::Math::pi_over_180, 15.0 * itk::Math::pi_over_180, 10.0 * itk::Math::pi_over_180);
   const ImageType::DirectionType direction = tfm->GetMatrix();
   image->SetDirection(direction);

diff --git a/Modules/Core/TestKernel/test/itkRandomImageSourceAttributesTest.cxx b/Modules/Core/TestKernel/test/itkRandomImageSourceAttributesTest.cxx
@@ -76,7 +76,7 @@ itkRandomImageSourceAttributesTest(int, char *[])
     const ImageType2D::SizeType      size{ { 25, 25 } };
     const ImageType2D::SpacingType   spacing{ { { 0.7, 2.1 } } };
     const ImageType2D::PointType     origin{ { { -1.7, 5.2 } } };
-    const double                     d[4] = { 0, 1.0, 1.0, 0 };
+    const itk::SpacePrecisionType    d[4] = { 0, 1.0, 1.0, 0 };
     const ImageType2D::DirectionType direction = ImageType2D::DirectionType::InternalMatrixType(d);
     const ImageType2D::ValueType     min{ 0.0 };
     const ImageType2D::ValueType     max{ 1000.0 };
@@ -90,7 +90,7 @@ itkRandomImageSourceAttributesTest(int, char *[])
     const ImageType3D::SizeType      size{ { 14, 17, 36 } };
     const ImageType3D::SpacingType   spacing{ { { 0.7, 0.4, 1.2 } } };
     const ImageType3D::PointType     origin{ { { -1.7, 5.2, 3.4 } } };
-    const double                     d[9] = { 0, 1.0, 0, 1.0, 0, 0, 0, 1.0, 0 };
+    const itk::SpacePrecisionType    d[9] = { 0, 1.0, 0, 1.0, 0, 0, 0, 1.0, 0 };
     const ImageType3D::DirectionType direction = ImageType3D::DirectionType::InternalMatrixType(d);
     const ImageType3D::ValueType     min{ 0.0 };
     const ImageType3D::ValueType     max{ 10.0 };

diff --git a/Modules/Filtering/ImageGrid/test/itkBinShrinkImageFilterTest2.cxx b/Modules/Filtering/ImageGrid/test/itkBinShrinkImageFilterTest2.cxx
@@ -42,7 +42,7 @@ CheckValueIsPhysicalPoint(const TImageType * img)
     for (unsigned int i = 0; i < TImageType::ImageDimension; ++i)
     {
       img->TransformIndexToPhysicalPoint(it.GetIndex(), pt);
-      if (!itk::Math::FloatAlmostEqual(pt[i], it.Get()[i]))
+      if (!itk::Math::FloatAlmostEqual<itk::SpacePrecisionType>(pt[i], it.Get()[i]))
       {
         typename TImageType::PointType::VectorType diff;
         for (unsigned int j = 0; j < TImageType::ImageDimension; ++j)

diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx
@@ -847,7 +847,7 @@ ShapeLabelMapFilter<TImage, TLabelImage>::ComputeOrientedBoundingBox(LabelObject
   // iterate over all corners (2^D) of the pixel
   for (unsigned int p = 0; p < 1u << ImageDimension; ++p)
   {
-    Vector<double, ImageDimension> spacingAxis(0.5 * spacing);
+    Vector<double, ImageDimension> spacingAxis(spacing * 0.5);
 
     // permute signs of spacing vector components, based on a bit of p
     // to component of spacingAxis mapping

diff --git a/Modules/Filtering/LabelMap/test/itkShapeLabelMapFilterGTest.cxx b/Modules/Filtering/LabelMap/test/itkShapeLabelMapFilterGTest.cxx
@@ -238,9 +238,9 @@ TEST_F(ShapeLabelMapFixture, 3D_T3x2x1_Direction)
 
   DirectionType direction;
 
-  const double d[9] = { 0.7950707161543119,     -0.44533237368675166, 0.41175433605536305,
-                        -0.6065167008084678,    -0.5840224148057925,  0.5394954222649374,
-                        0.00021898465942798317, -0.6786728931900383,  -0.7344406416415056 };
+  const itk::SpacePrecisionType d[9] = { 0.7950707161543119,     -0.44533237368675166, 0.41175433605536305,
+                                         -0.6065167008084678,    -0.5840224148057925,  0.5394954222649374,
+                                         0.00021898465942798317, -0.6786728931900383,  -0.7344406416415056 };
 
   direction = DirectionType::InternalMatrixType(d);
 
@@ -342,9 +342,9 @@ TEST_F(ShapeLabelMapFixture, 3D_T2x2x2_Spacing_Direction)
 
   DirectionType direction;
 
-  const double d[9] = { 0.7950707161543119,     -0.44533237368675166, 0.41175433605536305,
-                        -0.6065167008084678,    -0.5840224148057925,  0.5394954222649374,
-                        0.00021898465942798317, -0.6786728931900383,  -0.7344406416415056 };
+  const itk::SpacePrecisionType d[9] = { 0.7950707161543119,     -0.44533237368675166, 0.41175433605536305,
+                                         -0.6065167008084678,    -0.5840224148057925,  0.5394954222649374,
+                                         0.00021898465942798317, -0.6786728931900383,  -0.7344406416415056 };
 
   direction = DirectionType::InternalMatrixType(d);
 
@@ -455,7 +455,7 @@ TEST_F(ShapeLabelMapFixture, 2D_T1_1_FlipDirection)
 
   DirectionType direction;
 
-  const double d[4] = { 0, 1.0, 1.0, 0 };
+  const itk::SpacePrecisionType d[4] = { 0, 1.0, 1.0, 0 };
 
   direction = DirectionType::InternalMatrixType(d);
 
@@ -489,7 +489,7 @@ TEST_F(ShapeLabelMapFixture, 2D_T1_2_Direction)
 
   DirectionType direction;
 
-  const double d[4] = { 0, 1.0, 1.0, 0 };
+  const itk::SpacePrecisionType d[4] = { 0, 1.0, 1.0, 0 };
 
   direction = DirectionType::InternalMatrixType(d);
 

diff --git a/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.hxx b/Modules/Filtering/Path/include/itkExtractOrthogonalSwath2DImageFilter.hxx
@@ -163,7 +163,7 @@ ExtractOrthogonalSwath2DImageFilter<TImage>::GenerateData()
   ProgressReporter progress(this, 0, outputRegion.GetNumberOfPixels());
 
   using OutputIterator = ImageRegionIteratorWithIndex<ImageType>;
-  using InterpolatorType = LinearInterpolateImageFunction<ImageType, double>;
+  using InterpolatorType = LinearInterpolateImageFunction<ImageType, itk::SpacePrecisionType>;
 
   ImageIndexType                      index;
   double                              orthogonalOffset;

diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest12.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest12.cxx
@@ -103,9 +103,9 @@ itkNiftiImageIOTest12(int argc, char * argv[])
 
     ImageType::IndexType threeIndex = { { 3, 3, 3 } };
     ImageType::PointType origPhysLocationIndexThree;
-    image->TransformIndexToPhysicalPoint<double>(threeIndex, origPhysLocationIndexThree);
+    image->TransformIndexToPhysicalPoint<itk::SpacePrecisionType>(threeIndex, origPhysLocationIndexThree);
     ImageType::PointType readPhysLocationIndexThree;
-    readImage->TransformIndexToPhysicalPoint<double>(threeIndex, readPhysLocationIndexThree);
+    readImage->TransformIndexToPhysicalPoint<itk::SpacePrecisionType>(threeIndex, readPhysLocationIndexThree);
 
     // If the origins, and the spacings, and the direction cosines are the smae,
     // then index locations should all represent the same physical locations as well.

diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest14.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest14.cxx
@@ -128,7 +128,7 @@ itkNiftiImageIOTest14(int argc, char * argv[])
 
     auto read_origin = test_image->GetOrigin();
 
-    if (itk::Math::FloatAlmostEqual(read_origin[3], 2.0, 4, 1e-6))
+    if (itk::Math::FloatAlmostEqual<itk::SpacePrecisionType>(read_origin[3], 2.0, 4, 1e-6))
     {
       imageHasCorrectTimeOrigin = true;
     }

diff --git a/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx b/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx
@@ -67,8 +67,8 @@ template <typename TImage>
 bool
 CheckRotation(typename TImage::Pointer img)
 {
-  vnl_matrix_fixed<double, 3, 3>       rotation = img->GetDirection().GetVnlMatrix().extract(3, 3, 0, 0);
-  const vnl_matrix_fixed<double, 3, 3> candidate_identity = rotation * rotation.transpose();
+  vnl_matrix_fixed<itk::SpacePrecisionType, 3, 3> rotation = img->GetDirection().GetVnlMatrix().extract(3, 3, 0, 0);
+  const vnl_matrix_fixed<itk::SpacePrecisionType, 3, 3> candidate_identity = rotation * rotation.transpose();
   return candidate_identity.is_identity(1.0e-4);
 }
 

diff --git a/Testing/ContinuousIntegration/AzurePipelinesLinux.yml b/Testing/ContinuousIntegration/AzurePipelinesLinux.yml
@@ -53,7 +53,6 @@ jobs:
         sudo pip3 install ninja
         sudo apt-get update
         sudo apt-get install -y python3-venv
-        sudo python3 -m pip install --upgrade setuptools
         sudo python3 -m pip install lxml scikit-ci-addons
       displayName: 'Install dependencies'
 
@@ -126,7 +125,6 @@ jobs:
         sudo pip3 install ninja
         sudo apt-get update
         sudo apt-get install -y python3-venv
-        sudo python3 -m pip install --upgrade setuptools
         sudo python3 -m pip install lxml scikit-ci-addons
       displayName: 'Install dependencies'
 

diff --git a/Testing/ContinuousIntegration/AzurePipelinesLinuxPython.yml b/Testing/ContinuousIntegration/AzurePipelinesLinuxPython.yml
@@ -51,7 +51,6 @@ jobs:
     - bash: |
         set -x
         python3 -m pip install ninja numpy>=1.20 typing-extensions
-        python3 -m pip install --upgrade setuptools
         python3 -m pip install lxml scikit-ci-addons dask distributed
       displayName: 'Install dependencies'