Merge pull request InsightSoftwareConsortium#5940 from hjmjohnson/1261-scan-build-warnings

COMP: Address scan-build warnings

Author: hjmjohnson

Modules/Core/Common/include/itkSingleton.h

@@ -140,7 +140,7 @@ Singleton(const char * globalName, std::function<void()> deleteFunc)
   T *                                      instance = SingletonIndex::GetInstance()->GetGlobalInstance<T>(globalName);
   if (instance == nullptr)
   {
-    instance = new T;
+    instance = new T{};
     SingletonIndex::GetInstance()->SetGlobalInstance<T>(globalName, instance, std::move(deleteFunc));
   }
   return instance;

Modules/Core/Common/src/itkPoolMultiThreader.cxx

@@ -278,7 +278,7 @@ PoolMultiThreader::ParallelizeImageRegion(unsigned int         dimension,
         }
       }
       iRegion = region;
-      total = splitter->GetSplit(0, splitCount, iRegion);
+      splitter->GetSplit(0, splitCount, iRegion);
 
       // execute this thread's share
       ExceptionHandler exceptionHandler;

Modules/Core/Common/test/itkArray2DGTest.cxx

@@ -70,13 +70,14 @@ TEST(Array2D, MoveConstruct)
     const auto * const * const originalDataArray{ original.data_array() };
     const unsigned int         originalSize{ original.size() };
 
-    const auto moveConstructed = std::move(original);
+    const auto moveConstructed = std::forward<decltype(original)>(original);
 
     // After the "move", the move-constructed object has retrieved the original data.
     EXPECT_EQ(moveConstructed.data_array(), originalDataArray);
     EXPECT_EQ(moveConstructed.size(), originalSize);
 
-    // After the "move", the original is left empty.
+    // Intentionally verify the moved-from object is in a valid empty state.
+    // NOLINTNEXTLINE(bugprone-use-after-move,clang-analyzer-cplusplus.Move)
     EXPECT_EQ(original.data_array(), nullptr);
     EXPECT_EQ(original.size(), 0U);
   };
@@ -102,7 +103,8 @@ TEST(Array2D, MoveAssign)
     EXPECT_EQ(moveAssigmentTarget.data_array(), originalDataArray);
     EXPECT_EQ(moveAssigmentTarget.size(), originalSize);
 
-    // After the "move", the original is left empty.
+    // Intentionally verify the moved-from object is in a valid empty state.
+    // NOLINTNEXTLINE(bugprone-use-after-move,clang-analyzer-cplusplus.Move)
     EXPECT_EQ(original.data_array(), nullptr);
     EXPECT_EQ(original.size(), 0U);
   };

Modules/Core/Common/test/itkImageVectorOptimizerParametersHelperTest.cxx

@@ -78,8 +78,6 @@ testMemoryAccess(OptimizerParametersType & params, ImageVectorPointer imageOfVec
 int
 itkImageVectorOptimizerParametersHelperTest(int, char *[])
 {
-  int result = EXIT_SUCCESS;
-
   SizeType      size;
   constexpr int dimLength{ 3 };
   size.Fill(dimLength);
@@ -128,7 +126,7 @@ itkImageVectorOptimizerParametersHelperTest(int, char *[])
   // to the image data.
   params.SetParametersObject(imageOfVectors);
 
-  result = testMemoryAccess(params, imageOfVectors, dimLength);
+  const int result = testMemoryAccess(params, imageOfVectors, dimLength);
 
   // Test MoveDataPointer
   itk::Array<ValueType> array(imageOfVectors->GetPixelContainer()->Size(), 1.23);

Modules/Core/Common/test/itkRangeGTestUtilities.h

@@ -94,7 +94,7 @@ class RangeGTestUtilities
   ExpectMoveConstructedRangeHasSameIteratorsAsOriginalBeforeMove(TRange && originalRange)
   {
     const TRange originalRangeBeforeMove = originalRange;
-    TRange       moveConstructedRange(std::move(originalRange));
+    TRange       moveConstructedRange(std::forward<TRange>(originalRange));
 
     ExpectRangesHaveEqualBeginAndEnd(moveConstructedRange, originalRangeBeforeMove);
   }
@@ -107,7 +107,7 @@ class RangeGTestUtilities
     const TRange originalRangeBeforeMove = originalRange;
 
     TRange moveAssignedRange;
-    moveAssignedRange = std::move(originalRange);
+    moveAssignedRange = std::forward<TRange>(originalRange);
 
     ExpectRangesHaveEqualBeginAndEnd(moveAssignedRange, originalRangeBeforeMove);
   }

Modules/Core/Common/test/itkVariableLengthVectorTest.cxx

@@ -186,7 +186,6 @@ itkVariableLengthVectorTest(int, char *[])
       ASSERT(&x[0] != start, "DontShrintToFit(bigger) => reallocate");
       // ASSERT(x[0] is uninitialized);
       x[0] = ref[0];
-      start = &x[0];
     }
 
     // Test on assignments

Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshCellInterfaceTest.cxx

@@ -17,7 +17,9 @@
  *=========================================================================*/
 
 #include <iostream>
+#include <numeric>
 #include <string_view>
+#include <vector>
 
 #include "itkQuadEdgeMesh.h"
 
@@ -114,20 +116,18 @@ TestCellInterface(const std::string_view name, TCell * aCell)
 
   using PointIdentifier = MeshType::PointIdentifier;
 
-  auto * pointIds = new PointIdentifier[cell->GetNumberOfPoints() * 2];
-  for (unsigned int i = 0; i < cell->GetNumberOfPoints() * 2; ++i)
-  {
-    pointIds[i] = i;
-  }
+  const unsigned int           numberOfPoints = cell->GetNumberOfPoints();
+  std::vector<PointIdentifier> pointIds(numberOfPoints * 2);
+  std::iota(pointIds.begin(), pointIds.end(), PointIdentifier{});
 
-  cell->SetPointIds(pointIds);
+  cell->SetPointIds(pointIds.data());
   // exercising the const GetPointIds() method
   // null for QE Cells
   if (cell2->GetPointIds())
   {
     cell->SetPointIds(cell2->GetPointIds());
   }
-  if (cell->GetNumberOfPoints() > 0)
+  if (numberOfPoints > 0)
   {
     cell->SetPointId(0, 100);
   }
@@ -142,7 +142,7 @@ TestCellInterface(const std::string_view name, TCell * aCell)
   }
   std::cout << std::endl;
 
-  cell->SetPointIds(&pointIds[cell->GetNumberOfPoints()], &pointIds[cell->GetNumberOfPoints() * 2]);
+  cell->SetPointIds(&pointIds[numberOfPoints], &pointIds[numberOfPoints * 2]);
   std::cout << "    Iterator test: PointIds for populated cell: ";
   typename TCell::PointIdIterator pxpointId = cell->PointIdsBegin();
   typename TCell::PointIdIterator pxendId = cell->PointIdsEnd();
@@ -165,9 +165,6 @@ TestCellInterface(const std::string_view name, TCell * aCell)
     xpointId++;
   }
   std::cout << std::endl;
-
-
-  delete[] pointIds;
   return EXIT_SUCCESS;
 }
 
@@ -208,42 +205,40 @@ TestQECellInterface(const std::string_view name, TCell * aCell)
 
   using PointIdentifier = typename TCell::PointIdentifier;
 
-  auto * pointIds = new PointIdentifier[cell->GetNumberOfPoints() * 2];
-  for (unsigned int i = 0; i < cell->GetNumberOfPoints() * 2; ++i)
+  const unsigned int numberOfPoints = cell->GetNumberOfPoints();
+  if (numberOfPoints > 0)
   {
-    pointIds[i] = i;
-  }
-
-  // actually populate
-  cell->SetPointIds(pointIds);
-  // exercising the non const internal equivalent.
-  cell->InternalSetPointIds(cell->InternalGetPointIds());
-  // exercising the const internal equivalent
-  cell->InternalSetPointIds(cell2->InternalGetPointIds());
+    std::vector<PointIdentifier> pointIds(numberOfPoints * 2);
+    std::iota(pointIds.begin(), pointIds.end(), PointIdentifier{});
 
+    // actually populate
+    cell->SetPointIds(pointIds.data());
+    // exercising the non const internal equivalent.
+    cell->InternalSetPointIds(cell->InternalGetPointIds());
+    // exercising the const internal equivalent
+    cell->InternalSetPointIds(cell2->InternalGetPointIds());
 
-  std::cout << "    ConstIterator test: PointIds for populated cell: ";
-  typename TCell::PointIdInternalConstIterator       ppointId = cell2->InternalPointIdsBegin();
-  const typename TCell::PointIdInternalConstIterator pendId = cell2->InternalPointIdsEnd();
-  while (ppointId != pendId)
-  {
-    std::cout << *ppointId << ", ";
-    ppointId++;
-  }
-  std::cout << std::endl;
+    std::cout << "    ConstIterator test: PointIds for populated cell: ";
+    typename TCell::PointIdInternalConstIterator       ppointId = cell2->InternalPointIdsBegin();
+    const typename TCell::PointIdInternalConstIterator pendId = cell2->InternalPointIdsEnd();
+    while (ppointId != pendId)
+    {
+      std::cout << *ppointId << ", ";
+      ppointId++;
+    }
+    std::cout << std::endl;
 
-  cell->InternalSetPointIds(cell2->InternalPointIdsBegin(), cell2->InternalPointIdsEnd());
-  std::cout << "    Iterator test: PointIds for populated cell: ";
-  typename TCell::PointIdInternalIterator       pxpointId = cell->InternalPointIdsBegin();
-  const typename TCell::PointIdInternalIterator pxendId = cell->InternalPointIdsEnd();
-  while (pxpointId != pxendId)
-  {
-    std::cout << *pxpointId << ", ";
-    pxpointId++;
+    cell->InternalSetPointIds(cell2->InternalPointIdsBegin(), cell2->InternalPointIdsEnd());
+    std::cout << "    Iterator test: PointIds for populated cell: ";
+    typename TCell::PointIdInternalIterator       pxpointId = cell->InternalPointIdsBegin();
+    const typename TCell::PointIdInternalIterator pxendId = cell->InternalPointIdsEnd();
+    while (pxpointId != pxendId)
+    {
+      std::cout << *pxpointId << ", ";
+      pxpointId++;
+    }
+    std::cout << std::endl;
   }
-  std::cout << std::endl;
-
-  delete[] pointIds;
   return EXIT_SUCCESS;
 }
 

Modules/Core/TestKernel/test/itkRandomImageSourceAttributesTest.cxx

@@ -82,6 +82,10 @@ itkRandomImageSourceAttributesTest(int, char *[])
     constexpr ImageType2D::ValueType  max{ 1000.0 };
 
     testStatus = itkRandomImageSourceAttributesTestHelper<ImageType2D>(size, spacing, origin, direction, min, max);
+    if (testStatus != EXIT_SUCCESS)
+    {
+      return EXIT_FAILURE;
+    }
   }
 
   {

Modules/Filtering/BiasCorrection/test/itkMRIBiasFieldCorrectionFilterTest.cxx

@@ -329,12 +329,10 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[])
   optimizerInitialRadius = 0.02;
   volumeCorrectionMaximumIteration = 200;
   interSliceCorrectionMaximumIteration = 100;
-  optimizerInitialRadius = 0.02;
 
   filter->SetOptimizerInitialRadius(optimizerInitialRadius);
   filter->SetVolumeCorrectionMaximumIteration(volumeCorrectionMaximumIteration);
   filter->SetInterSliceCorrectionMaximumIteration(interSliceCorrectionMaximumIteration);
-  filter->SetOptimizerInitialRadius(optimizerInitialRadius);
 
   ITK_TEST_SET_GET_BOOLEAN(filter, UsingInterSliceIntensityCorrection, usingInterSliceIntensityCorrection);
   ITK_TEST_SET_GET_BOOLEAN(filter, UsingSlabIdentification, usingSlabIdentification);

Modules/Filtering/Path/test/itkHilbertPathTest.cxx

@@ -60,7 +60,7 @@ HilbertPathTestHelper(unsigned int maxHilbertPathOder)
 
     // path->EvaluateToIndex( 6 )
 
-    for (unsigned int d = 0; d < 10; ++d)
+    for (unsigned int d = 0; d < path->NumberOfSteps(); ++d)
     {
       const IndexType index = path->TransformPathIndexToMultiDimensionalIndex(d);
 
@@ -98,6 +98,10 @@ itkHilbertPathTest(int, char *[])
   ITK_EXERCISE_BASIC_OBJECT_METHODS(path2D, HilbertPath, Path);
 
   testStatus = HilbertPathTestHelper<HilbertPathType2D>(maxHilbertPathOder);
+  if (testStatus != EXIT_SUCCESS)
+  {
+    return EXIT_FAILURE;
+  }
 
   // Test dimension = 3
   using HilbertPathType3D = itk::HilbertPath<IndexValueType, 3>;
@@ -109,6 +113,10 @@ itkHilbertPathTest(int, char *[])
   ITK_EXERCISE_BASIC_OBJECT_METHODS(path3D, HilbertPath, Path);
 
   testStatus = HilbertPathTestHelper<HilbertPathType3D>(maxHilbertPathOder);
+  if (testStatus != EXIT_SUCCESS)
+  {
+    return EXIT_FAILURE;
+  }
 
   // Test dimension = 4
   using HilbertPathType4D = itk::HilbertPath<IndexValueType, 4>;