COMP: Get ITK_USE_FLOAT_SPACE_PRECISION=ON to compile again

dzenanz · Sep 2, 2024 · 3f92cee · 3f92cee
1 parent d71031e
commit 3f92cee
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/examples/CompleteMontage.cxx b/examples/CompleteMontage.cxx
@@ -349,7 +349,7 @@ completeMontage(const itk::TileConfiguration<Dimension> & stageTiles,
 {
   using TileConfig = itk::TileConfiguration<Dimension>;
   using ScalarPixelType = typename itk::NumericTraits<PixelType>::ValueType;
-  using TransformType = itk::TranslationTransform<double, Dimension>;
+  using TransformType = itk::TranslationTransform<itk::SpacePrecisionType, Dimension>;
   using ScalarImageType = itk::Image<ScalarPixelType, Dimension>;
   using OriginalImageType = itk::Image<PixelType, Dimension>; // possibly RGB instead of scalar
   using BiasFieldType = LogBiasFieldType<Dimension>;

diff --git a/examples/RefineMontage.cxx b/examples/RefineMontage.cxx
@@ -41,7 +41,7 @@ refineMontage(const itk::TileConfiguration<Dimension> & stageTiles,
               const std::string &                       inputPath)
 {
   using TileConfig = itk::TileConfiguration<Dimension>;
-  using TransformType = itk::TranslationTransform<double, Dimension>;
+  using TransformType = itk::TranslationTransform<itk::SpacePrecisionType, Dimension>;
   using ScalarImageType = itk::Image<PixelType, Dimension>;
   typename ScalarImageType::SpacingType sp;
   sp.Fill(1.0);

diff --git a/examples/ResampleMontage.cxx b/examples/ResampleMontage.cxx
@@ -43,7 +43,7 @@ resampleMontage(const itk::TileConfiguration<Dimension> & actualTiles,
                 const std::string &                       outFilename)
 {
   using TileConfig = itk::TileConfiguration<Dimension>;
-  using TransformType = itk::TranslationTransform<double, Dimension>;
+  using TransformType = itk::TranslationTransform<itk::SpacePrecisionType, Dimension>;
   using OriginalImageType = itk::Image<PixelType, Dimension>; // possibly RGB instead of scalar
   typename OriginalImageType::SpacingType sp;
   typename TransformType::ConstPointer    identity = TransformType::New();

diff --git a/include/itkPhaseCorrelationOptimizer.hxx b/include/itkPhaseCorrelationOptimizer.hxx
@@ -546,8 +546,8 @@ PhaseCorrelationOptimizer<TRealPixelType, VImageDimension>::ComputeOffset()
             ratio = (y0 + y2) / (2 * y1);
             if (offsetIndex > 0) // clip to -0.999... to 0.999... range
             {
-              ratio = std::min(ratio, 1.0 - std::numeric_limits<OffsetScalarType>::epsilon());
-              ratio = std::max(ratio, -1.0 + std::numeric_limits<OffsetScalarType>::epsilon());
+              ratio = std::min(ratio, 1.0f - std::numeric_limits<OffsetScalarType>::epsilon());
+              ratio = std::max(ratio, -1.0f + std::numeric_limits<OffsetScalarType>::epsilon());
             }
             omega = std::acos(ratio);
             theta = std::atan((y0 - y2) / (2 * y1 * std::sin(omega)));

diff --git a/test/itkMontageTestHelper.hxx b/test/itkMontageTestHelper.hxx
@@ -114,9 +114,9 @@ montageTest(const itk::TileConfiguration<Dimension> & stageTiles,
   int result = EXIT_SUCCESS;
   using ScalarPixelType = typename itk::NumericTraits<PixelType>::ValueType;
   using TileConfig = itk::TileConfiguration<Dimension>;
-  using PointType = itk::Point<double, Dimension>;
-  using VectorType = itk::Vector<double, Dimension>;
-  using TransformType = itk::TranslationTransform<double, Dimension>;
+  using PointType = itk::Point<itk::SpacePrecisionType, Dimension>;
+  using VectorType = itk::Vector<itk::SpacePrecisionType, Dimension>;
+  using TransformType = itk::TranslationTransform<itk::SpacePrecisionType, Dimension>;
   using ScalarImageType = itk::Image<ScalarPixelType, Dimension>;
   using OriginalImageType = itk::Image<PixelType, Dimension>; // possibly RGB instead of scalar
   using PCMType = itk::PhaseCorrelationImageRegistrationMethod<ScalarImageType, ScalarImageType>;

diff --git a/test/itkPairwiseTestHelper.hxx b/test/itkPairwiseTestHelper.hxx
@@ -135,13 +135,13 @@ calculateError(const itk::TileConfiguration<Dimension> &
 
     phaseCorrelationMethod->Update();
 
-    using TransformType = itk::TranslationTransform<double, Dimension>;
+    using TransformType = itk::TranslationTransform<itk::SpacePrecisionType, Dimension>;
     static_assert(std::is_same<TransformType, typename PhaseCorrelationMethodType::TransformType>::value,
                   "PhaseCorrelationMethod's TransformType is expected to be a TranslationTransform");
     const TransformType * regTr = phaseCorrelationMethod->GetOutput()->Get();
 
     // calculate error
-    using VectorType = itk::Vector<double, Dimension>;
+    using VectorType = itk::Vector<itk::SpacePrecisionType, Dimension>;
     VectorType tr = regTr->GetOffset(); // translation measured by registration
     for (unsigned d = 0; d < Dimension; d++)
     {