Skip to content

Commit aac0b8e

Browse files
authored
Merge pull request InsightSoftwareConsortium#5541 from N-Dekker/Use-CalculateProductOfElements
Use CalculateProductOfElements in Denoising, ImageStatistics, and IO tests
2 parents 5e788ec + 66b4758 commit aac0b8e

File tree

6 files changed

+6
-31
lines changed

6 files changed

+6
-31
lines changed

Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,7 @@ PatchBasedDenoisingBaseImageFilter<TInputImage, TOutputImage>::GetPatchLengthInV
174174
{
175175
const PatchRadiusType diameter = this->GetPatchDiameterInVoxels();
176176

177-
typename PatchRadiusType::SizeValueType length = 1;
178-
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
179-
{
180-
length *= diameter[dim];
181-
}
182-
return length;
177+
return diameter.CalculateProductOfElements();
183178
}
184179

185180
template <typename TInputImage, typename TOutputImage>

Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ void
6363
ImagePCADecompositionCalculator<TInputImage, TBasisImage>::CalculateBasisMatrix()
6464
{
6565
m_Size = m_BasisImages[0]->GetRequestedRegion().GetSize();
66-
m_NumPixels = 1;
67-
for (unsigned int i = 0; i < BasisImageDimension; ++i)
68-
{
69-
m_NumPixels *= m_Size[i];
70-
}
66+
m_NumPixels = m_Size.CalculateProductOfElements();
7167

7268
m_BasisMatrix = BasisMatrixType(static_cast<unsigned int>(m_BasisImages.size()), m_NumPixels);
7369

Modules/Filtering/ImageStatistics/include/itkImagePCAShapeModelEstimator.hxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,7 @@ ImagePCAShapeModelEstimator<TInputImage, TOutputImage>::CalculateInnerProduct()
271271
// training data
272272
m_InputImageSize = (inputImagePointerArray[0])->GetBufferedRegion().GetSize();
273273

274-
m_NumberOfPixels = 1;
275-
for (unsigned int i = 0; i < InputImageDimension; ++i)
276-
{
277-
m_NumberOfPixels *= m_InputImageSize[i];
278-
}
274+
m_NumberOfPixels = m_InputImageSize.CalculateProductOfElements();
279275

280276
// Calculate the means
281277
m_Means.set_size(m_NumberOfPixels);

Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ ActualTest(std::string filename, typename TImageType::SizeType size)
4747

4848
image->SetRegions(region);
4949

50-
size_t numberOfPixels = 1;
51-
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
52-
{
53-
numberOfPixels *= region.GetSize(i);
54-
}
50+
const size_t numberOfPixels = size.CalculateProductOfElements();
5551

5652
const size_t sizeInMebiBytes = sizeof(PixelType) * numberOfPixels / (1024 * 1024);
5753

Modules/IO/Meta/test/itkLargeMetaImageWriteReadTest.cxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ ActualTest(std::string filename, typename TImageType::SizeType size)
5353

5454
image->SetRegions(region);
5555

56-
size_t numberOfPixels = 1;
57-
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
58-
{
59-
numberOfPixels *= region.GetSize(i);
60-
}
56+
const size_t numberOfPixels = size.CalculateProductOfElements();
6157

6258
const size_t sizeInMebiBytes = sizeof(PixelType) * numberOfPixels / (1024 * 1024);
6359

Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ itkLargeTIFFImageWriteReadTestHelper(std::string filename, typename TImage::Size
5050

5151
image->SetRegions(region);
5252

53-
SizeValueType numberOfPixels = 1;
54-
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
55-
{
56-
numberOfPixels *= static_cast<SizeValueType>(region.GetSize(i));
57-
}
53+
const SizeValueType numberOfPixels = size.CalculateProductOfElements();
5854

5955
constexpr SizeValueType oneMebiByte = static_cast<SizeValueType>(1024) * static_cast<SizeValueType>(1024);
6056

0 commit comments

Comments
 (0)