Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Modules/Core/Common/include/itkExtractImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ ExtractImageFilter<TInputImage, TOutputImage>::SetExtractionRegion(InputImageReg
<< InputImageDimension - OutputImageDimension << " zero sized dimensions to collapse.");
}

m_OutputImageRegion.SetSize(outputSize);
m_OutputImageRegion.SetIndex(outputIndex);
m_OutputImageRegion = { outputIndex, outputSize };
this->Modified();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ ExtractImageFilterCopyRegion(const typename BinaryUnsignedIntDispatch<T1, T2>::F
++count;
}
}
destRegion.SetIndex(destIndex);
destRegion.SetSize(destSize);
destRegion = { destIndex, destSize };
}

/** \class ExtractImageFilterRegionCopier
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/include/itkImageIORegion.h
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,7 @@ class ImageIORegionAdaptor
index[i] = inIORegion.GetIndex(i) + largestRegionIndex[i];
}

outImageRegion.SetSize(size);
outImageRegion.SetIndex(index);
outImageRegion = { index, size };
}
};
} // end namespace itk
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/include/itkImageToImageFilterDetail.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ ImageToImageFilterDefaultCopyRegion(const typename BinaryUnsignedIntDispatch<D1,
destSize[dim] = srcSize[dim];
}

destRegion.SetIndex(destIndex);
destRegion.SetSize(destSize);
destRegion = { destIndex, destSize };
}

/**
Expand Down Expand Up @@ -271,8 +270,7 @@ ImageToImageFilterDefaultCopyRegion(const typename BinaryUnsignedIntDispatch<D1,
destSize[dim] = 1;
}
}
destRegion.SetIndex(destIndex);
destRegion.SetSize(destSize);
destRegion = { destIndex, destSize };
}

/** \class ImageRegionCopier
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/include/itkNeighborhoodAlgorithm.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ ImageBoundaryFacesCalculator<TImage>::Compute(const TImage & img, RegionType reg
result.m_BoundaryFaces.emplace_back(fStart, fSize);
}
}
result.m_NonBoundaryRegion.SetSize(nbSize);
result.m_NonBoundaryRegion.SetIndex(nbStart);
result.m_NonBoundaryRegion = { nbStart, nbSize };
return result;
}

Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/test/itkAdaptorComparisonTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ itkAdaptorComparisonTest(int, char *[])
index[0] = 0;
index[1] = 0;
index[2] = 0;
region.SetSize(size);
region.SetIndex(index);
region = { index, size };

auto scalar_image = ScalarImageType::New();
auto vector_image = VectorImageType::New();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ itkConstNeighborhoodIteratorTest(int, char *[])
sz[0] = sz[1] = 10;
sz[2] = 5;
sz[3] = 1;
reg.SetIndex(idx);
reg.SetSize(sz);
reg = { idx, sz };

println("Creating ConstNeighborhoodIterator");
itk::ConstNeighborhoodIterator<TestImageType> it(radius, img, reg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ itkConstNeighborhoodIteratorWithOnlyIndexTestRun()
sz[0] = sz[1] = 10;
sz[2] = 5;
sz[3] = 1;
reg.SetIndex(idx);
reg.SetSize(sz);
reg = { idx, sz };

std::cout << "Creating ConstNeighborhoodIterator" << std::endl;
ConstNeighborhoodIteratorType it(radius, img, reg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
sz[0] = sz[1] = 10;
sz[2] = 5;
sz[3] = 1;
reg.SetIndex(idx);
reg.SetSize(sz);
reg = { idx, sz };

// initialize an iterator
println("Creating ConstShapedNeighborhoodIterator");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ itkConstShapedNeighborhoodIteratorTest2(int, char *[])
sz[0] = sz[1] = 10;
sz[2] = 5;
sz[3] = 1;
reg.SetIndex(idx);
reg.SetSize(sz);
reg = { idx, sz };

// initialize an iterator
println("Creating ConstShapedNeighborhoodIterator");
Expand Down
9 changes: 3 additions & 6 deletions Modules/Core/Common/test/itkConstantBoundaryConditionTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,7 @@ itkConstantBoundaryConditionTest(int, char *[])
requestIndex[1] = 0;
requestSize[0] = 3;
requestSize[1] = 2;
requestRegion.SetIndex(requestIndex);
requestRegion.SetSize(requestSize);
requestRegion = { requestIndex, requestSize };

auto expectedIndex = itk::MakeFilled<IndexType>(0);
expectedRegion.SetIndex(expectedIndex);
Expand All @@ -262,15 +261,13 @@ itkConstantBoundaryConditionTest(int, char *[])
requestIndex[1] = 8;
requestSize[0] = 3;
requestSize[1] = 3;
requestRegion.SetIndex(requestIndex);
requestRegion.SetSize(requestSize);
requestRegion = { requestIndex, requestSize };

expectedIndex[0] = 0;
expectedIndex[1] = 0;
expectedSize[0] = 0;
expectedSize[1] = 0;
expectedRegion.SetIndex(expectedIndex);
expectedRegion.SetSize(expectedSize);
expectedRegion = { expectedIndex, expectedSize };

inputRegion = bc.GetInputRequestedRegion(imageRegion, requestRegion);
if (!CheckInputRequestedRegion(imageRegion, inputRegion, expectedRegion))
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkExtractImage3Dto2DTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ itkExtractImage3Dto2DTest(int, char *[])
extractIndex[2] = extractIndex[1] = extractIndex[0] = 0;

extract->SetInput(im3d);
extractRegion.SetSize(extractSize);
extractRegion.SetIndex(extractIndex);
extractRegion = { extractIndex, extractSize };
extract->SetExtractionRegion(extractRegion);
extract->Update();

Expand All @@ -81,8 +80,7 @@ itkExtractImage3Dto2DTest(int, char *[])
extractIndex[2] = extractIndex[1] = extractIndex[0] = 0;

extract->SetInput(im3d);
extractRegion.SetSize(extractSize);
extractRegion.SetIndex(extractIndex);
extractRegion = { extractIndex, extractSize };
extract->SetExtractionRegion(extractRegion);
extract->Update();
// remove first column/row, should obtain :
Expand Down
9 changes: 3 additions & 6 deletions Modules/Core/Common/test/itkExtractImageTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ itkExtractImageTest(int, char *[])
extractIndex[1] = 2;
extractSize[0] = 5;
extractSize[1] = 6;
extractRegion.SetSize(extractSize);
extractRegion.SetIndex(extractIndex);
extractRegion = { extractIndex, extractSize };
extract->SetExtractionRegion(extractRegion);
extract->UpdateLargestPossibleRegion();
requestedRegion = extract->GetOutput()->GetRequestedRegion();
Expand Down Expand Up @@ -217,8 +216,7 @@ itkExtractImageTest(int, char *[])
extractIndex[1] = 1;
extractSize[0] = 7;
extractSize[1] = 11;
extractRegion.SetSize(extractSize);
extractRegion.SetIndex(extractIndex);
extractRegion = { extractIndex, extractSize };
extract->SetExtractionRegion(extractRegion);

// Create a stream
Expand Down Expand Up @@ -302,8 +300,7 @@ itkExtractImageTest(int, char *[])
extractIndex[1] = 0;
extractSize[0] = 0;
extractSize[1] = 3;
extractRegion.SetIndex(extractIndex);
extractRegion.SetSize(extractSize);
extractRegion = { extractIndex, extractSize };

lineExtract->SetExtractionRegion(extractRegion);
lineExtract->UpdateLargestPossibleRegion();
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/test/itkImageAlgorithmCopyTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ AverageTestCopy(typename TImage::SizeType & size)


const typename ImageType::IndexType index{};
region.SetSize(size);
region.SetIndex(index);
region = { index, size };

auto inImage = ImageType::New();
inImage->SetRegions(region);
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/test/itkImageDuplicatorTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ itkImageDuplicatorTest(int, char *[])
size[1] = 20;
size[2] = 30;
constexpr ImageType::IndexType index{};
region.SetSize(size);
region.SetIndex(index);
region = { index, size };

{
/** Create an image */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ class itkImageRegionConstIteratorWithOnlyIndexTestIteratorTester
// size[0] = 40;
start.Fill(10);
// start[0] = 8;
region.SetSize(size);
region.SetIndex(start);
region = { start, size };
m_Image->SetRequestedRegion(region);
}

Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkImageRegionIteratorTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,9 @@ itkImageRegionIteratorTest(int, char *[])

itk::Image<itk::Vector<unsigned short, 5>, 3>::RegionType region{ startIndex3D, imageSize3D };
o3->SetLargestPossibleRegion(region);
region.SetSize(bufferSize3D);
region.SetIndex(bufferStartIndex3D);
region = { bufferStartIndex3D, bufferSize3D };
o3->SetBufferedRegion(region);
region.SetSize(regionSize3D);
region.SetIndex(regionStartIndex3D);
region = { regionStartIndex3D, regionSize3D };
o3->SetRequestedRegion(region);

o3->SetOrigin(origin3D);
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkImageRegionTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ itkImageRegionTest(int, char *[])
RegionType regionA;
RegionType regionB;

regionA.SetSize(sizeA);
regionA.SetIndex(startA);
regionA = { startA, sizeA };

if (regionA.GetUpperIndex() != endA)
{
Expand Down Expand Up @@ -111,8 +110,7 @@ itkImageRegionTest(int, char *[])
std::cout << "Caught expected exception" << err;
}

regionB.SetSize(sizeB);
regionB.SetIndex(startB);
regionB = { startB, sizeB };

// Test IsInside( integerIndex )
IndexType index = startA;
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkImageReverseIteratorTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,9 @@ itkImageReverseIteratorTest(int, char *[])

ImageType::RegionType region{ startIndex3D, imageSize3D };
o3->SetLargestPossibleRegion(region);
region.SetSize(bufferSize3D);
region.SetIndex(bufferStartIndex3D);
region = { bufferStartIndex3D, bufferSize3D };
o3->SetBufferedRegion(region);
region.SetSize(regionSize3D);
region.SetIndex(regionStartIndex3D);
region = { regionStartIndex3D, regionSize3D };
o3->SetRequestedRegion(region);

o3->SetOrigin(origin3D);
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkImageScanlineIteratorTest1.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ itkImageScanlineIteratorTest1(int, char *[])

ImageType::RegionType region{ startIndex3D, imageSize3D };
o3->SetLargestPossibleRegion(region);
region.SetSize(bufferSize3D);
region.SetIndex(bufferStartIndex3D);
region = { bufferStartIndex3D, bufferSize3D };
o3->SetBufferedRegion(region);
region.SetSize(regionSize3D);
region.SetIndex(regionStartIndex3D);
region = { regionStartIndex3D, regionSize3D };
o3->SetRequestedRegion(region);

o3->SetOrigin(origin3D);
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/test/itkImageSliceIteratorTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ itkImageSliceIteratorTest(int, char *[])
start[1] = 25;
start[2] = 25;

region.SetIndex(start);
region.SetSize(size);
region = { start, size };

IteratorType ot(myImage, region);

Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/test/itkImportImageTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ itkImportImageTest(int, char *[])
itk::ImageRegion<Dimension> region;
constexpr itk::ImageRegion<Dimension>::IndexType index = { { 0, 0 } };
constexpr itk::ImageRegion<Dimension>::SizeType size = { { 8, 12 } };
region.SetIndex(index);
region.SetSize(size);
region = { index, size };
// local scope to make sure that imported data is not deleted with ImportImageFilter
// but with the ImportImageContainer is creates.
{
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/test/itkIteratorTests.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ itkIteratorTests(int, char *[])

ScalarImage::RegionType region{ startIndex3D, imageSize3D };
o3->SetLargestPossibleRegion(region);
region.SetSize(bufferSize3D);
region.SetIndex(bufferStartIndex3D);
region = { bufferStartIndex3D, bufferSize3D };
o3->SetBufferedRegion(region);
region.SetSize(regionSize3D);
region.SetIndex(regionStartIndex3D);
region = { regionStartIndex3D, regionSize3D };
o3->SetRequestedRegion(region);

o3->SetOrigin(origin3D);
Expand Down
18 changes: 6 additions & 12 deletions Modules/Core/Common/test/itkNeighborhoodAlgorithmTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ NeighborhoodAlgorithmTest()

ind.Fill(1);
size.Fill(4);
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };

// test 2: requestToProcessRegion is part of bufferedRegion
if (!ImageBoundaryFaceCalculatorTest(image.GetPointer(), region, radius))
Expand Down Expand Up @@ -153,8 +152,7 @@ NeighborhoodAlgorithmTest()

ind.Fill(1);
size.Fill(6);
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };

// test 4: bufferedRegion is part of the requestToProcessRegion
if (!ImageBoundaryFaceCalculatorTest(image.GetPointer(), region, radius))
Expand All @@ -164,17 +162,15 @@ NeighborhoodAlgorithmTest()

ind.Fill(0);
size.Fill(10);
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };
image->Initialize();
image->SetRegions(region);
image->Allocate();
radius.Fill(4);

ind.Fill(1);
size.Fill(2);
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };
// test 5: requestToProcessRegion is part of boundary of bufferedRegion
if (!ImageBoundaryFaceCalculatorTest(image.GetPointer(), region, radius))
{
Expand All @@ -187,16 +183,14 @@ NeighborhoodAlgorithmTest()
ind[1] = 249;
size[0] = 256;
size[1] = 7;
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };
image->Initialize();
image->SetRegions(region);
image->Allocate();

ind[1] = 253;
size[1] = 3;
region.SetIndex(ind);
region.SetSize(size);
region = { ind, size };
radius.Fill(4);
// test 6: test condition encountered by BoxMeanImageFilterTest with 24 threads
if (!ImageBoundaryFaceCalculatorTest(image.GetPointer(), region, radius))
Expand Down
Loading
Loading