BUG: Backport ImageAdaptor::ComputeOffset for ImageRegionIterator#6066
BUG: Backport ImageAdaptor::ComputeOffset for ImageRegionIterator#6066hjmjohnson wants to merge 1 commit intoInsightSoftwareConsortium:release-5.4from
Conversation
|
| Filename | Overview |
|---|---|
| Modules/Core/ImageAdaptors/include/itkImageAdaptor.h | Adds ComputeOffset inline method that delegates to m_Image->ComputeOffset, consistent with the existing delegation of ComputeIndex and GetOffsetTable — correct and minimal change. |
| Modules/Core/ImageAdaptors/test/itkImageAdaptorGTest.cxx | Adds two GTests: one verifying ComputeOffset returns identical values to the internal image, and one verifying end-to-end ImageRegionIterator support. Contains a minor comment typo ("intenal"). |
Sequence Diagram
sequenceDiagram
participant Iter as ImageRegionIterator<AdaptorType>
participant Adaptor as ImageAdaptor
participant Image as m_Image (TImage)
Note over Iter,Image: Increment() — wrapping at end of row
Iter->>Adaptor: ComputeIndex(offset)
Adaptor->>Image: m_Image->ComputeIndex(offset)
Image-->>Adaptor: IndexType
Adaptor-->>Iter: IndexType
Note over Iter,Adaptor: (before this PR) ComputeOffset fell through to ImageBase::ComputeOffset
Iter->>Adaptor: ComputeOffset(ind)
Adaptor->>Image: m_Image->ComputeOffset(ind)
Image-->>Adaptor: OffsetValueType
Adaptor-->>Iter: OffsetValueType
Note over Iter: m_Offset, m_SpanEndOffset, m_SpanBeginOffset updated correctly
Reviews (1): Last reviewed commit: "BUG: Add ImageAdaptor::ComputeOffset, to..." | Re-trigger Greptile
|
@N-Dekker was |
10801b6 to
bcab3dc
Compare
Just for the sake of clarity, the
|
Fixed issue InsightSoftwareConsortium#5870, "ImageAdaptor should have its own ComputeOffset, ImageRegionIterator support broken" `ImageRegionConstIterator<AdapterType>::Increment()` depends on `AdapterType::ComputeOffset`.
bcab3dc to
5ca44c9
Compare
Cherry-pick of 1e3a883 from main (N-Dekker). Adds
ComputeOffsettoImageAdaptor, fixingImageRegionIteratorsupport with image adaptors.Test adapted for release-5.4: replaced
itk::MakeIndexRangewithImageRegionConstIteratorWithIndexand added explicit template arguments (no CTAD on release-5.4).Backport for #6051 (Tier 2). Locally verified: 3/3 GTests pass.