Skip to content

BUG: fix itkPeriodicBoundaryConditionTest itkGradientImageFilterTest #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

BUG: fix itkPeriodicBoundaryConditionTest itkGradientImageFilterTest #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 38 additions & 11 deletions Modules/Core/Common/include/itkPeriodicBoundaryCondition.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,19 @@ PeriodicBoundaryCondition< TInputImage, TOutputImage >
::operator()(const OffsetType & point_index, const OffsetType & boundary_offset,
const NeighborhoodType *data) const
{
// This is guaranteed to be called with an object that is using
// PeriodicBoundaryCondition
const auto * iterator = reinterpret_cast< const ConstNeighborhoodIterator< TInputImage, Self > * >( data );
const TInputImage * imagePointer = nullptr;
if (dynamic_cast< const ConstNeighborhoodIterator< TInputImage > * >( data ))
{
imagePointer = dynamic_cast< const ConstNeighborhoodIterator< TInputImage > * >( data )->GetImagePointer();
}
else if (dynamic_cast< const ConstNeighborhoodIterator< TInputImage, Self > * >( data ))
{
imagePointer = dynamic_cast< const ConstNeighborhoodIterator< TInputImage, Self > * >( data )->GetImagePointer();
}
else
{
// What to do for error?
}
typename TInputImage::PixelType * ptr;
int linear_index = 0;
unsigned int i;
Expand All @@ -55,21 +65,21 @@ PeriodicBoundaryCondition< TInputImage, TOutputImage >

// These are the step sizes for increments in each dimension of the image.
const typename TInputImage::OffsetValueType * offset_table =
iterator->GetImagePointer()->GetOffsetTable();
imagePointer->GetOffsetTable();

for ( i = 0; i < ImageDimension; ++i )
{
if ( boundary_offset[i] != 0 )
{ // If the neighborhood overlaps on the low edge, then wrap from the
// high edge of the image.
if ( point_index[i] < static_cast< OffsetValueType >( iterator->GetRadius(i) ) )
if ( point_index[i] < static_cast< OffsetValueType >( data->GetRadius(i) ) )
{
ptr += iterator->GetImagePointer()->GetBufferedRegion().GetSize()[i]
ptr += imagePointer->GetBufferedRegion().GetSize()[i]
* offset_table[i] - boundary_offset[i] * offset_table[i];
}
else // wrap from the low side of the image
{
ptr -= iterator->GetImagePointer()->GetBufferedRegion().GetSize()[i]
ptr -= imagePointer->GetBufferedRegion().GetSize()[i]
* offset_table[i] + boundary_offset[i] * offset_table[i];
}
}
Expand All @@ -85,9 +95,26 @@ PeriodicBoundaryCondition< TInputImage, TOutputImage >
const NeighborhoodType *data,
const NeighborhoodAccessorFunctorType & neighborhoodAccessorFunctor) const
{
<<<<<<< HEAD
// This is guaranteed to be called with an object that is using
// PeriodicBoundaryCondition
const auto * iterator = reinterpret_cast< const ConstNeighborhoodIterator< TInputImage, Self > * >( data );
=======
const TInputImage * imagePointer = nullptr;
if (dynamic_cast< const ConstNeighborhoodIterator< TInputImage > * >( data ))
{
imagePointer = dynamic_cast< const ConstNeighborhoodIterator< TInputImage > * >( data )->GetImagePointer();
}
else if (dynamic_cast< const ConstNeighborhoodIterator< TInputImage > * >( data ))
{
imagePointer = dynamic_cast< const ConstNeighborhoodIterator< TInputImage, Self > * >( data )->GetImagePointer();
}
else
{
// What to do for error?
}

>>>>>>> BUG: fix itkPeriodicBoundaryConditionTest itkGradientImageFilterTest
typename TInputImage::InternalPixelType * ptr;
int linear_index = 0;
unsigned int i;
Expand All @@ -110,21 +137,21 @@ PeriodicBoundaryCondition< TInputImage, TOutputImage >

// These are the step sizes for increments in each dimension of the image.
const typename TInputImage::OffsetValueType * offset_table =
iterator->GetImagePointer()->GetOffsetTable();
imagePointer->GetOffsetTable();

for ( i = 0; i < ImageDimension; ++i )
{
if ( boundary_offset[i] != 0 )
{ // If the neighborhood overlaps on the low edge, then wrap from the
// high edge of the image.
if ( point_index[i] < static_cast< OffsetValueType >( iterator->GetRadius(i) ) )
if ( point_index[i] < static_cast< OffsetValueType >( data->GetRadius(i) ) )
{
ptr += iterator->GetImagePointer()->GetBufferedRegion().GetSize()[i]
ptr += imagePointer->GetBufferedRegion().GetSize()[i]
* offset_table[i] - boundary_offset[i] * offset_table[i];
}
else // wrap from the low side of the image
{
ptr -= iterator->GetImagePointer()->GetBufferedRegion().GetSize()[i]
ptr -= imagePointer->GetBufferedRegion().GetSize()[i]
* offset_table[i] + boundary_offset[i] * offset_table[i];
}
}
Expand Down