Skip to content

Commit 32b5990

Browse files
committed
BUG: Fix itkFrequencyImageRegionIterator
Test it via recently added gtest (see InsightSoftwareConsortium#4827) Closes InsightSoftwareConsortium#4828
1 parent e9b3d24 commit 32b5990

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Modules/Filtering/ImageFrequency/include/itkFrequencyImageRegionConstIteratorWithIndex.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,10 @@ class ITK_TEMPLATE_EXPORT FrequencyImageRegionConstIteratorWithIndex : public Im
174174
void
175175
Init()
176176
{
177-
this->m_FrequencyOrigin = this->m_Image->GetOrigin();
178-
this->m_FrequencySpacing = this->m_Image->GetSpacing();
177+
for (unsigned int dim = 0; dim < ImageType::ImageDimension; ++dim) {
178+
this->m_FrequencyOrigin[dim] = this->m_Image->GetOrigin()[dim];
179+
this->m_FrequencySpacing[dim] = this->m_Image->GetSpacing()[dim];
180+
}
179181
}
180182

181183
FrequencyType m_FrequencyOrigin;

Modules/Filtering/ImageFrequency/include/itkFrequencyImageRegionIteratorWithIndex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ITK_TEMPLATE_EXPORT FrequencyImageRegionIteratorWithIndex
6767
public:
6868
/** Standard class type alias. */
6969
using Self = FrequencyImageRegionIteratorWithIndex;
70-
using Superclass = ImageRegionIteratorWithIndex<TImage>;
70+
using Superclass = FrequencyImageRegionConstIteratorWithIndex<TImage>;
7171

7272
/** Types inherited from the Superclass */
7373
using typename Superclass::IndexType;

Modules/Filtering/ImageFrequency/test/itkFrequencyIteratorsGTest.cxx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "itkHalfHermitianToRealInverseFFTImageFilter.h"
2727
#include "itkFFTShiftImageFilter.h"
2828
#include "itkFrequencyBandImageFilter.h" // Simplest of frequency filters for testing
29+
#include "itkFrequencyImageRegionConstIteratorWithIndex.h"
30+
#include "itkFrequencyImageRegionIteratorWithIndex.h"
2931
#include "itkFrequencyFFTLayoutImageRegionConstIteratorWithIndex.h"
3032
#include "itkFrequencyFFTLayoutImageRegionIteratorWithIndex.h"
3133
#include "itkFrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex.h"
@@ -264,7 +266,9 @@ compareAllTypesOfIterators(typename TImageType::Pointer image, double difference
264266
// Checks that an iterator that is just constructed by `IteratorType(image, region)` is at the begin.
265267
TEST_F(FrequencyIterators, AreConstructedAtBegin)
266268
{
267-
CheckIteratorsConstructedAtBegin<itk::FrequencyFFTLayoutImageRegionConstIteratorWithIndex,
269+
CheckIteratorsConstructedAtBegin<itk::FrequencyImageRegionConstIteratorWithIndex,
270+
itk::FrequencyImageRegionIteratorWithIndex,
271+
itk::FrequencyFFTLayoutImageRegionConstIteratorWithIndex,
268272
itk::FrequencyFFTLayoutImageRegionIteratorWithIndex,
269273
itk::FrequencyHalfHermitianFFTLayoutImageRegionConstIteratorWithIndex,
270274
itk::FrequencyHalfHermitianFFTLayoutImageRegionIteratorWithIndex,

0 commit comments

Comments
 (0)