Skip to content

Commit 1feb28e

Browse files
authored
Merge pull request #1480 from Luc35b/Removed-unnecessary-null-pointer-checks-issue
Removed unnecessary null pointer checks issue
2 parents 496b478 + ac32a11 commit 1feb28e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

openvdb/openvdb/math/ConjGradient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ inline void
588588
Vector<T>::resize(SizeType n)
589589
{
590590
if (n != mSize) {
591-
if (mData) delete[] mData;
591+
delete[] mData;
592592
mData = new T[n];
593593
mSize = n;
594594
}

openvdb/openvdb/tools/DenseSparseTools.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ class SparseExtractor
371371

372372
// Clean up an unused leaf.
373373

374-
if (leaf != nullptr) delete leaf;
374+
delete leaf;
375375
}
376376

377377
void join(SparseExtractor& rhs) {
@@ -530,7 +530,7 @@ class SparseMaskedExtractor
530530

531531
// Clean up an unused leaf.
532532

533-
if (leaf != nullptr) delete leaf;
533+
delete leaf;
534534
}
535535

536536
void join(SparseMaskedExtractor& rhs) {

openvdb/openvdb/tools/LevelSetUtil.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ struct MaskInteriorVoxels {
221221
}
222222
}
223223

224-
if (maskNodePt) delete maskNodePt;
224+
delete maskNodePt;
225225
}
226226

227227
LeafNodeType const * const * const mNodes;
@@ -346,7 +346,7 @@ struct LabelBoundaryVoxels {
346346
}
347347
}
348348

349-
if (maskNodePt) delete maskNodePt;
349+
delete maskNodePt;
350350
}
351351

352352
LeafNodeType const * const * const mNodes;
@@ -1254,7 +1254,7 @@ struct MaskIsovalueCrossingVoxels
12541254
}
12551255
}
12561256

1257-
if (maskNodePt) delete maskNodePt;
1257+
delete maskNodePt;
12581258
}
12591259

12601260
void join(MaskIsovalueCrossingVoxels& rhs) {

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Rasterize_Points.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ struct WeightedAverageOp
14011401
{
14021402
}
14031403

1404-
~WeightedAverageOp() { if (mNode) delete mNode; }
1404+
~WeightedAverageOp() { delete mNode; }
14051405

14061406
const char* getName() const { return mHandle.getAttribute()->getName(); }
14071407

@@ -1693,7 +1693,7 @@ struct Attribute
16931693
clearNodes();
16941694

16951695
for (size_t n = 0, N = mOutputNodes.size(); n < N; ++n) {
1696-
if (mOutputNodes[n] != nullptr) delete mOutputNodes[n];
1696+
delete mOutputNodes[n];
16971697
}
16981698
}
16991699

@@ -1702,7 +1702,7 @@ struct Attribute
17021702
void clearNodes()
17031703
{
17041704
for (size_t n = 0; n < mNodeCount; ++n) {
1705-
if (mNodes[n] != nullptr) delete mNodes[n];
1705+
delete mNodes[n];
17061706
}
17071707
}
17081708

0 commit comments

Comments
 (0)