Skip to content

Commit a8ac2f1

Browse files
committed
STYLE: Use Image::CreateInitialized(const RegionType &) in tests
Replaced more than sixty cases of code like: auto image = ImageType::New(); image->SetRegions(region); image->AllocateInitialized(); with the following single statement: auto image = ImageType::CreateInitialized(region); in ITK test files ("itk*Test*.cxx").
1 parent 6589f2d commit a8ac2f1

File tree

52 files changed

+100
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+100
-266
lines changed

Modules/Core/Common/test/itkAdaptorComparisonTest.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,9 @@ itkAdaptorComparisonTest(int, char *[])
195195
region.SetSize(size);
196196
region.SetIndex(index);
197197

198-
auto scalar_image = ScalarImageType::New();
199-
auto vector_image = VectorImageType::New();
198+
auto scalar_image = ScalarImageType::CreateInitialized(region);
200199

201-
scalar_image->SetRegions(region);
202-
scalar_image->AllocateInitialized();
200+
auto vector_image = VectorImageType::New();
203201

204202
vector_image->SetRegions(region);
205203
vector_image->Allocate();

Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,11 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[])
275275
auto kernel = KernelType::New();
276276

277277
using ImageType = itk::Image<char, SpaceDimension>;
278-
auto image = ImageType::New();
279278
ImageType::RegionType region;
280279
region.SetIndex(startIndex);
281280
region.SetSize(size);
282281

283-
image->SetRegions(region);
284-
image->AllocateInitialized();
282+
auto image = ImageType::CreateInitialized(region);
285283

286284
using IteratorType = itk::ImageRegionConstIteratorWithIndex<ImageType>;
287285
IteratorType iter(image, image->GetBufferedRegion());

Modules/Core/Common/test/itkConnectedImageNeighborhoodShapeGTest.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,9 @@ TEST(ConnectedImageNeighborhoodShape, SupportsConstShapedNeighborhoodIterator)
248248
using OffsetType = itk::Offset<ImageDimension>;
249249

250250
// Create a "dummy" image.
251-
const auto image = ImageType::New();
252-
SizeType imageSize;
251+
SizeType imageSize;
253252
imageSize.Fill(1);
254-
image->SetRegions(imageSize);
255-
image->AllocateInitialized();
253+
const auto image = ImageType::CreateInitialized(imageSize);
256254

257255
// Create a radius, (just) large enough for all offsets activated below here.
258256
SizeType radius;

Modules/Core/Common/test/itkImageAlgorithmCopyTest2.cxx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,8 @@ itkImageAlgorithmCopyTest2(int, char *[])
7979
image1->Allocate();
8080
image1->FillBuffer(13);
8181

82-
auto image2 = Short3DImageType::New();
83-
image2->SetRegions(region);
84-
image2->AllocateInitialized();
85-
86-
87-
auto image3 = Float3DImageType::New();
88-
image3->SetRegions(region);
89-
image3->AllocateInitialized();
82+
auto image2 = Short3DImageType::CreateInitialized(region);
83+
auto image3 = Float3DImageType::CreateInitialized(region);
9084

9185
std::cout << "Copying two images of same type" << std::endl;
9286
itk::ImageAlgorithm::Copy(image1.GetPointer(), image2.GetPointer(), region, region);

Modules/Core/Common/test/itkImageDuplicatorTest.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ itkImageDuplicatorTest(int, char *[])
4141
{
4242
/** Create an image image */
4343
std::cout << "Creating simulated image: ";
44-
auto m_Image = ImageType::New();
45-
m_Image->SetRegions(region);
46-
m_Image->AllocateInitialized();
44+
auto m_Image = ImageType::CreateInitialized(region);
4745

4846
itk::ImageRegionIterator<ImageType> it(m_Image, region);
4947
it.GoToBegin();

Modules/Core/Common/test/itkImageGTest.cxx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ void
8383
Expect_allocated_initialized_image_equal_to_itself()
8484
{
8585
using SizeType = typename TImage::SizeType;
86-
87-
const auto image = TImage::New();
88-
image->SetRegions(SizeType::Filled(2));
89-
image->AllocateInitialized();
90-
86+
const auto image = TImage::CreateInitialized(SizeType::Filled(2));
9187
Expect_equal_to_itself(*image);
9288
}
9389

@@ -98,13 +94,8 @@ Expect_unequal_when_sizes_differ()
9894
{
9995
using SizeType = typename TImage::SizeType;
10096

101-
const auto image1 = TImage::New();
102-
image1->SetRegions(SizeType::Filled(2));
103-
image1->AllocateInitialized();
104-
105-
const auto image2 = TImage::New();
106-
image2->SetRegions(SizeType::Filled(3));
107-
image2->AllocateInitialized();
97+
const auto image1 = TImage::CreateInitialized(SizeType::Filled(2));
98+
const auto image2 = TImage::CreateInitialized(SizeType::Filled(3));
10899

109100
Expect_unequal(*image1, *image2);
110101
}

Modules/Core/Common/test/itkImageRandomIteratorTest2.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ itkImageRandomIteratorTest2(int argc, char * argv[])
4343

4444
using ImageType = itk::Image<PixelType, ImageDimension>;
4545

46-
auto image = ImageType::New();
47-
4846
ImageType::SizeType size;
4947

5048
size[0] = 1000;
@@ -59,8 +57,7 @@ itkImageRandomIteratorTest2(int argc, char * argv[])
5957
region.SetIndex(start);
6058
region.SetSize(size);
6159

62-
image->SetRegions(region);
63-
image->AllocateInitialized();
60+
auto image = ImageType::CreateInitialized(region);
6461

6562
using RandomIteratorType = itk::ImageRandomIteratorWithIndex<ImageType>;
6663

Modules/Core/Common/test/itkImageRegionRangeGTest.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -628,13 +628,10 @@ TEST(ImageRegionRange, ThrowsInReleaseWhenIterationRegionIsOutsideBufferedRegion
628628
using SizeType = ImageType::SizeType;
629629
using RegionType = ImageType::RegionType;
630630

631-
const auto image = ImageType::New();
632-
633631
const IndexType imageIndex{ { -1, -2 } };
634632
const SizeType imageSize{ { 3, 4 } };
635633

636-
image->SetRegions(RegionType{ imageIndex, imageSize });
637-
image->AllocateInitialized();
634+
const auto image = ImageType::CreateInitialized({ imageIndex, imageSize });
638635

639636
Check_Range_constructor_throws_ExceptionObject_when_iteration_region_is_outside_of_buffered_region(
640637
*image, RegionType{ imageIndex, imageSize + SizeType::Filled(1) });

Modules/Core/Common/test/itkLineIteratorTest.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ itkLineIteratorTest(int argc, char * argv[])
5252
region.SetIndex(index);
5353
region.SetSize(size);
5454

55-
auto output = ImageType::New();
56-
output->SetRegions(region);
57-
output->AllocateInitialized();
55+
auto output = ImageType::CreateInitialized(region);
5856

5957
// First test: empty line
6058
IndexType startIndex;

Modules/Core/Common/test/itkShapedImageNeighborhoodRangeGTest.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,7 @@ TEST(ShapedImageNeighborhoodRange, SupportsArbitraryBufferedRegionIndex)
10041004

10051005
const ImageType::RegionType bufferedRegion{ arbitraryIndex, imageSize };
10061006

1007-
const auto image = ImageType::New();
1008-
image->SetRegions(bufferedRegion);
1009-
image->AllocateInitialized();
1007+
const auto image = ImageType::CreateInitialized(bufferedRegion);
10101008

10111009
// Set a 'magic value' at the begin of the buffered region.
10121010
const ImageType::PixelType magicPixelValue = 42;

0 commit comments

Comments
 (0)