Skip to content

Commit aa58196

Browse files
author
Lars H. Rohweder
committed
remove unecessary nullptr check before 'delete' and 'delete[]'
1 parent 6dd2dca commit aa58196

Some content is hidden

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

41 files changed

+184
-332
lines changed

‎libraries/openexr/IlmImf/ImfDeepScanLineInputFile.cpp‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ LineBuffer::LineBuffer ():
191191

192192
LineBuffer::~LineBuffer ()
193193
{
194-
if (compressor != 0)
195-
delete compressor;
194+
delete compressor;
196195
}
197196

198197
} // namespace
@@ -295,14 +294,12 @@ DeepScanLineInputFile::Data::Data (int numThreads):
295294
DeepScanLineInputFile::Data::~Data ()
296295
{
297296
for (size_t i = 0; i < lineBuffers.size(); i++)
298-
if (lineBuffers[i] != 0)
299-
delete lineBuffers[i];
297+
delete lineBuffers[i];
300298

301299
for (size_t i = 0; i < slices.size(); i++)
302300
delete slices[i];
303301

304-
if (sampleCountTableComp != 0)
305-
delete sampleCountTableComp;
302+
delete sampleCountTableComp;
306303

307304
if (multiPartBackwardSupport)
308305
delete multiPartFile;
@@ -513,7 +510,7 @@ readPixelData (InputStreamMutex *streamData,
513510
{
514511
// (TODO) check if the packed data size is too big?
515512
// (TODO) better memory management. Don't delete buffer all the time.
516-
if (buffer != 0) delete[] buffer;
513+
delete[] buffer;
517514
buffer = new char[packedDataSize];
518515
streamData->is->read (buffer, packedDataSize);
519516
}
@@ -612,8 +609,7 @@ LineBufferTask::execute ()
612609
// (TODO) optimize this. don't do this every time.
613610
//
614611

615-
if (_lineBuffer->compressor != 0)
616-
delete _lineBuffer->compressor;
612+
delete _lineBuffer->compressor;
617613
Int64 maxBytesPerLine = 0;
618614
for (int i = _lineBuffer->minY - _ifd->minY;
619615
i <= maxY - _ifd->minY;
@@ -975,19 +971,19 @@ DeepScanLineInputFile::DeepScanLineInputFile
975971
}
976972
catch (IEX_NAMESPACE::BaseExc &e)
977973
{
978-
if (is) delete is;
979-
if (_data && _data->_streamData) delete _data->_streamData;
980-
if (_data) delete _data;
974+
delete is;
975+
if (_data) delete _data->_streamData;
976+
delete _data;
981977

982978
REPLACE_EXC (e, "Cannot read image file "
983979
"\"" << fileName << "\". " << e);
984980
throw;
985981
}
986982
catch (...)
987983
{
988-
if (is) delete is;
989-
if (_data && _data->_streamData) delete _data->_streamData;
990-
if (_data) delete _data;
984+
delete is;
985+
if (_data) delete _data->_streamData;
986+
delete _data;
991987

992988
throw;
993989
}
@@ -1755,10 +1751,7 @@ void DeepScanLineInputFile::readPixelSampleCounts (const char* rawPixelData,
17551751
}
17561752
}
17571753

1758-
if(decomp)
1759-
{
1760-
delete decomp;
1761-
}
1754+
delete decomp;
17621755
}
17631756

17641757

‎libraries/openexr/IlmImf/ImfDeepScanLineOutputFile.cpp‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,8 @@ LineBuffer::LineBuffer (int linesInBuffer) :
180180

181181
LineBuffer::~LineBuffer ()
182182
{
183-
if (compressor != 0)
184-
delete compressor;
185-
186-
if (sampleCountTableCompressor != 0)
187-
delete sampleCountTableCompressor;
183+
delete compressor;
184+
delete sampleCountTableCompressor;
188185
}
189186

190187
} // namespace
@@ -265,8 +262,7 @@ DeepScanLineOutputFile::Data::Data (int numThreads):
265262
DeepScanLineOutputFile::Data::~Data ()
266263
{
267264
for (size_t i = 0; i < lineBuffers.size(); i++)
268-
if (lineBuffers[i] != 0)
269-
delete lineBuffers[i];
265+
delete lineBuffers[i];
270266

271267
for (size_t i = 0; i < slices.size(); i++)
272268
delete slices[i];
@@ -752,8 +748,7 @@ LineBufferTask::execute ()
752748
//
753749

754750
// (TODO) don't do this all the time.
755-
if (_lineBuffer->compressor != 0)
756-
delete _lineBuffer->compressor;
751+
delete _lineBuffer->compressor;
757752
_lineBuffer->compressor = newCompressor (_ofd->header.compression(),
758753
maxBytesPerLine,
759754
_ofd->header);
@@ -951,8 +946,7 @@ DeepScanLineOutputFile::initialize (const Header &header)
951946
_data->header);
952947
_data->format = defaultFormat (compressor);
953948
_data->linesInBuffer = numLinesInBuffer (compressor);
954-
if (compressor != 0)
955-
delete compressor;
949+
delete compressor;
956950

957951
int lineOffsetSize = (_data->maxY - _data->minY +
958952
_data->linesInBuffer) / _data->linesInBuffer;

‎libraries/openexr/IlmImf/ImfDeepTiledInputFile.cpp‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ readTileData (InputStreamMutex *streamData,
440440
{
441441
// (TODO) check if the packed data size is too big?
442442
// (TODO) better memory management here. Don't delete buffer everytime.
443-
if (buffer != 0) delete[] buffer;
443+
delete[] buffer;
444444
buffer = new char[dataSize];
445445
streamData->is->read (buffer, dataSize);
446446
}
@@ -611,8 +611,7 @@ TileBufferTask::execute ()
611611
}
612612

613613
// (TODO) don't do this every time.
614-
if (_tileBuffer->compressor != 0)
615-
delete _tileBuffer->compressor;
614+
delete _tileBuffer->compressor;
616615
_tileBuffer->compressor = newTileCompressor
617616
(_ifd->header.compression(),
618617
maxBytesPerTileLine,
@@ -824,19 +823,19 @@ DeepTiledInputFile::DeepTiledInputFile (const char fileName[], int numThreads):
824823
}
825824
catch (IEX_NAMESPACE::BaseExc &e)
826825
{
827-
if (is) delete is;
828-
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
829-
if (_data) delete _data;
826+
delete is;
827+
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
828+
delete _data;
830829

831830
REPLACE_EXC (e, "Cannot open image file "
832831
"\"" << fileName << "\". " << e);
833832
throw;
834833
}
835834
catch (...)
836835
{
837-
if (is) delete is;
838-
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
839-
if (_data) delete _data;
836+
delete is;
837+
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
838+
delete _data;
840839

841840
throw;
842841
}
@@ -879,17 +878,17 @@ DeepTiledInputFile::DeepTiledInputFile (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream
879878
}
880879
catch (IEX_NAMESPACE::BaseExc &e)
881880
{
882-
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
883-
if (_data) delete _data;
881+
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
882+
delete _data;
884883

885884
REPLACE_EXC (e, "Cannot open image file "
886885
"\"" << is.fileName() << "\". " << e);
887886
throw;
888887
}
889888
catch (...)
890889
{
891-
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
892-
if (_data) delete _data;
890+
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
891+
delete _data;
893892

894893
throw;
895894
}
@@ -1052,8 +1051,7 @@ DeepTiledInputFile::~DeepTiledInputFile ()
10521051
{
10531052
if (!_data->memoryMapped)
10541053
for (size_t i = 0; i < _data->tileBuffers.size(); i++)
1055-
if (_data->tileBuffers[i]->buffer != 0)
1056-
delete [] _data->tileBuffers[i]->buffer;
1054+
delete [] _data->tileBuffers[i]->buffer;
10571055

10581056
if (_data->_deleteStream)
10591057
delete _data->_streamData->is;

‎libraries/openexr/IlmImf/ImfDeepTiledOutputFile.cpp‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,8 @@ TileBuffer::TileBuffer ():
252252

253253
TileBuffer::~TileBuffer ()
254254
{
255-
if (compressor != 0)
256-
delete compressor;
257-
258-
if (sampleCountTableCompressor != 0)
259-
delete sampleCountTableCompressor;
255+
delete compressor;
256+
delete sampleCountTableCompressor;
260257
}
261258

262259

@@ -993,8 +990,7 @@ TileBufferTask::execute ()
993990
_tileBuffer->dataPtr = _tileBuffer->buffer;
994991

995992
// (TODO) don't do this all the time.
996-
if (_tileBuffer->compressor != 0)
997-
delete _tileBuffer->compressor;
993+
delete _tileBuffer->compressor;
998994
_tileBuffer->compressor = newTileCompressor
999995
(_ofd->header.compression(),
1000996
maxBytesPerTileLine,
@@ -1074,19 +1070,19 @@ DeepTiledOutputFile::DeepTiledOutputFile
10741070
}
10751071
catch (IEX_NAMESPACE::BaseExc &e)
10761072
{
1077-
if (_data && _data->_streamData && _data->_streamData->os) delete _data->_streamData->os;
1078-
if (_data && _data->_streamData) delete _data->_streamData;
1079-
if (_data) delete _data;
1073+
if (_data && _data->_streamData) delete _data->_streamData->os;
1074+
if (_data) delete _data->_streamData;
1075+
delete _data;
10801076

10811077
REPLACE_EXC (e, "Cannot open image file "
10821078
"\"" << fileName << "\". " << e);
10831079
throw;
10841080
}
10851081
catch (...)
10861082
{
1087-
if (_data && _data->_streamData && _data->_streamData->os) delete _data->_streamData->os;
1088-
if (_data->_streamData) delete _data->_streamData;
1089-
if (_data) delete _data;
1083+
if (_data && _data->_streamData) delete _data->_streamData->os;
1084+
if (_data) delete _data->_streamData;
1085+
delete _data;
10901086

10911087
throw;
10921088
}
@@ -1118,17 +1114,17 @@ DeepTiledOutputFile::DeepTiledOutputFile
11181114
}
11191115
catch (IEX_NAMESPACE::BaseExc &e)
11201116
{
1121-
if (_data && _data->_streamData) delete _data->_streamData;
1122-
if (_data) delete _data;
1117+
if (_data) delete _data->_streamData;
1118+
delete _data;
11231119

11241120
REPLACE_EXC (e, "Cannot open image file "
11251121
"\"" << os.fileName() << "\". " << e);
11261122
throw;
11271123
}
11281124
catch (...)
11291125
{
1130-
if (_data && _data->_streamData) delete _data->_streamData;
1131-
if (_data) delete _data;
1126+
if (_data) delete _data->_streamData;
1127+
delete _data;
11321128

11331129
throw;
11341130
}
@@ -1154,15 +1150,15 @@ DeepTiledOutputFile::DeepTiledOutputFile(const OutputPartData* part)
11541150
}
11551151
catch (IEX_NAMESPACE::BaseExc &e)
11561152
{
1157-
if (_data) delete _data;
1153+
delete _data;
11581154

11591155
REPLACE_EXC (e, "Cannot initialize output part "
11601156
"\"" << part->partNumber << "\". " << e);
11611157
throw;
11621158
}
11631159
catch (...)
11641160
{
1165-
if (_data) delete _data;
1161+
delete _data;
11661162

11671163
throw;
11681164
}
@@ -1218,8 +1214,7 @@ DeepTiledOutputFile::initialize (const Header &header)
12181214

12191215
_data->format = defaultFormat (compressor);
12201216

1221-
if (compressor != 0)
1222-
delete compressor;
1217+
delete compressor;
12231218

12241219
_data->tileOffsets = TileOffsets (_data->tileDesc.mode,
12251220
_data->numXLevels,
@@ -1293,7 +1288,7 @@ DeepTiledOutputFile::~DeepTiledOutputFile ()
12931288
// this file or by a parent multipart file.
12941289
//
12951290

1296-
if (_data->partNumber == -1 && _data->_streamData)
1291+
if (_data->partNumber == -1)
12971292
delete _data->_streamData;
12981293

12991294
delete _data;

‎libraries/openexr/IlmImf/ImfDwaCompressor.cpp‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,8 +1922,7 @@ DwaCompressor::compress
19221922
if (outBufferSize > _outBufferSize)
19231923
{
19241924
_outBufferSize = outBufferSize;
1925-
if (_outBuffer == 0)
1926-
delete[] _outBuffer;
1925+
delete[] _outBuffer;
19271926
_outBuffer = new char[outBufferSize];
19281927
}
19291928

@@ -2435,8 +2434,7 @@ DwaCompressor::uncompress
24352434
if (_maxScanLineSize * numScanLines() > _outBufferSize)
24362435
{
24372436
_outBufferSize = _maxScanLineSize * numScanLines();
2438-
if (_outBuffer != 0)
2439-
delete[] _outBuffer;
2437+
delete[] _outBuffer;
24402438
_outBuffer = new char[_maxScanLineSize * numScanLines()];
24412439
}
24422440

@@ -3023,8 +3021,7 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
30233021
if (maxLossyDctAcSize * numLossyDctChans > _packedAcBufferSize)
30243022
{
30253023
_packedAcBufferSize = maxLossyDctAcSize * numLossyDctChans;
3026-
if (_packedAcBuffer != 0)
3027-
delete[] _packedAcBuffer;
3024+
delete[] _packedAcBuffer;
30283025
_packedAcBuffer = new char[_packedAcBufferSize];
30293026
}
30303027

@@ -3035,16 +3032,14 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
30353032
if (maxLossyDctDcSize * numLossyDctChans > _packedDcBufferSize)
30363033
{
30373034
_packedDcBufferSize = maxLossyDctDcSize * numLossyDctChans;
3038-
if (_packedDcBuffer != 0)
3039-
delete[] _packedDcBuffer;
3035+
delete[] _packedDcBuffer;
30403036
_packedDcBuffer = new char[_packedDcBufferSize];
30413037
}
30423038

30433039
if (rleBufferSize > _rleBufferSize)
30443040
{
30453041
_rleBufferSize = rleBufferSize;
3046-
if (_rleBuffer != 0)
3047-
delete[] _rleBuffer;
3042+
delete[] _rleBuffer;
30483043
_rleBuffer = new char[rleBufferSize];
30493044
}
30503045

@@ -3104,8 +3099,7 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
31043099
if (planarUncBufferSize[i] > _planarUncBufferSize[i])
31053100
{
31063101
_planarUncBufferSize[i] = planarUncBufferSize[i];
3107-
if (_planarUncBuffer[i] != 0)
3108-
delete[] _planarUncBuffer[i];
3102+
delete[] _planarUncBuffer[i];
31093103
_planarUncBuffer[i] = new char[planarUncBufferSize[i]];
31103104
}
31113105
}

‎libraries/openexr/IlmImf/ImfHuf.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,11 +705,8 @@ hufFreeDecTable (HufDec *hdecod) // io: Decoding table
705705
{
706706
for (int i = 0; i < HUF_DECSIZE; i++)
707707
{
708-
if (hdecod[i].p)
709-
{
710708
delete [] hdecod[i].p;
711709
hdecod[i].p = 0;
712-
}
713710
}
714711
}
715712

0 commit comments

Comments
 (0)