Skip to content

Commit 9df8f74

Browse files
N-Dekkerhjmjohnson
authored andcommitted
STYLE: Replace reset(new T[n]) with make_unique_for_overwrite<T[]>(n)
Replaced `\.reset\(new (\w+)\[(.+)\]\);` with ` = make_unique_for_overwrite<$1[]>($2);`, using regular expressions in Visual Studio 2019. Following C++ Core Guidelines, September 23, 2022, "Avoid calling `new` and `delete` explicitly", from http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rr-newdelete
1 parent 49150c8 commit 9df8f74

4 files changed

Lines changed: 17 additions & 11 deletions

File tree

Modules/Core/Common/include/itkNeighborhoodAllocator.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*=========================================================================*/
1818
#ifndef itkNeighborhoodAllocator_h
1919
#define itkNeighborhoodAllocator_h
20+
#include "itkMakeUniqueForOverwrite.h"
2021
#include <algorithm>
2122
#include <iostream>
2223
#include <memory>
@@ -63,7 +64,7 @@ class NeighborhoodAllocator
6364
void
6465
Allocate(unsigned int n)
6566
{
66-
m_Data.reset(new TPixel[n]);
67+
m_Data = make_unique_for_overwrite<TPixel[]>(n);
6768
m_ElementCount = n;
6869
}
6970

@@ -158,7 +159,7 @@ class NeighborhoodAllocator
158159
if (n != m_ElementCount)
159160
{
160161
*this = NeighborhoodAllocator();
161-
m_Data.reset(new TPixel[n]);
162+
m_Data = make_unique_for_overwrite<TPixel[]>(n);
162163
m_ElementCount = n;
163164
}
164165
}

Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.hxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#ifndef itkOrthogonalSwath2DPathFilter_hxx
1919
#define itkOrthogonalSwath2DPathFilter_hxx
2020

21+
#include "itkMakeUniqueForOverwrite.h"
2122
#include "itkMath.h"
2223
#include "itkNumericTraits.h"
2324

@@ -36,9 +37,9 @@ OrthogonalSwath2DPathFilter<TParametricPath, TSwathMeritImage>::GenerateData()
3637

3738
// Re-initialize the member variables
3839
m_SwathSize = swathMeritImage->GetLargestPossibleRegion().GetSize();
39-
m_StepValues.reset(new int[m_SwathSize[0] * m_SwathSize[1] * m_SwathSize[1]]);
40-
m_MeritValues.reset(new double[m_SwathSize[0] * m_SwathSize[1] * m_SwathSize[1]]);
41-
m_OptimumStepsValues.reset(new int[m_SwathSize[0]]);
40+
m_StepValues = make_unique_for_overwrite<int[]>(m_SwathSize[0] * m_SwathSize[1] * m_SwathSize[1]);
41+
m_MeritValues = make_unique_for_overwrite<double[]>(m_SwathSize[0] * m_SwathSize[1] * m_SwathSize[1]);
42+
m_OptimumStepsValues = make_unique_for_overwrite<int[]>(m_SwathSize[0]);
4243
m_FinalOffsetValues->Initialize();
4344

4445
// Perform the remaining calculations; use dynamic programming

Modules/IO/MRC/src/itkMRCImageIO.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "itkMetaDataObject.h"
2222
#include "itkIOCommon.h"
2323
#include "itkByteSwapper.h"
24+
#include "itkMakeUniqueForOverwrite.h"
2425

2526
#include <fstream>
2627
#include <memory> // For unique_ptr.
@@ -246,7 +247,7 @@ MRCImageIO::InternalReadImageInformation(std::ifstream & file)
246247

247248
this->OpenFileForReading(file, m_FileName);
248249

249-
buffer.reset(new char[m_MRCHeader->GetHeaderSize()]);
250+
buffer = make_unique_for_overwrite<char[]>(m_MRCHeader->GetHeaderSize());
250251
if (!this->ReadBufferAsBinary(file, static_cast<void *>(buffer.get()), m_MRCHeader->GetHeaderSize()))
251252
{
252253
itkExceptionMacro(<< "Header Read failed: Wanted " << m_MRCHeader->GetHeaderSize() << " bytes, but read "
@@ -259,7 +260,7 @@ MRCImageIO::InternalReadImageInformation(std::ifstream & file)
259260
itkExceptionMacro(<< "Unrecognized header");
260261
}
261262

262-
buffer.reset(new char[m_MRCHeader->GetExtendedHeaderSize()]);
263+
buffer = make_unique_for_overwrite<char[]>(m_MRCHeader->GetExtendedHeaderSize());
263264
if (!this->ReadBufferAsBinary(file, static_cast<void *>(buffer.get()), m_MRCHeader->GetExtendedHeaderSize()))
264265
{
265266
itkExceptionMacro(<< "Extended Header Read failed.");

Modules/Registration/Common/include/itkImageToImageMetric.hxx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "itkImageRandomConstIteratorWithIndex.h"
2222
#include "itkMath.h"
23+
#include "itkMakeUniqueForOverwrite.h"
2324

2425
namespace itk
2526
{
@@ -305,10 +306,10 @@ ImageToImageMetric<TFixedImage, TMovingImage>::MultiThreadingInitialize()
305306
{
306307
this->SetNumberOfWorkUnits(m_NumberOfWorkUnits);
307308

308-
m_ThreaderNumberOfMovingImageSamples.reset(new unsigned int[m_NumberOfWorkUnits - 1]);
309+
m_ThreaderNumberOfMovingImageSamples = make_unique_for_overwrite<unsigned int[]>(m_NumberOfWorkUnits - 1);
309310

310311
// Allocate the array of transform clones to be used in every thread
311-
m_ThreaderTransform.reset(new TransformPointer[m_NumberOfWorkUnits - 1]);
312+
m_ThreaderTransform = make_unique_for_overwrite<TransformPointer[]>(m_NumberOfWorkUnits - 1);
312313
for (ThreadIdType ithread = 0; ithread < m_NumberOfWorkUnits - 1; ++ithread)
313314
{
314315
this->m_ThreaderTransform[ithread] = this->m_Transform->Clone();
@@ -422,8 +423,10 @@ ImageToImageMetric<TFixedImage, TMovingImage>::MultiThreadingInitialize()
422423
}
423424
else
424425
{
425-
this->m_ThreaderBSplineTransformWeights.reset(new BSplineTransformWeightsType[m_NumberOfWorkUnits - 1]);
426-
this->m_ThreaderBSplineTransformIndices.reset(new BSplineTransformIndexArrayType[m_NumberOfWorkUnits - 1]);
426+
this->m_ThreaderBSplineTransformWeights =
427+
make_unique_for_overwrite<BSplineTransformWeightsType[]>(m_NumberOfWorkUnits - 1);
428+
this->m_ThreaderBSplineTransformIndices =
429+
make_unique_for_overwrite<BSplineTransformIndexArrayType[]>(m_NumberOfWorkUnits - 1);
427430
}
428431

429432
for (unsigned int j = 0; j < FixedImageDimension; ++j)

0 commit comments

Comments
 (0)