Remove unnecessary checks before deleting a pointer

This commit is contained in:
Sour 2019-04-12 19:03:54 -04:00
parent dbafe258b2
commit 9a60878751
7 changed files with 21 additions and 76 deletions

View file

@ -20,10 +20,7 @@ AviRecorder::~AviRecorder()
StopRecording();
}
if(_frameBuffer) {
delete[] _frameBuffer;
_frameBuffer = nullptr;
}
delete[] _frameBuffer;
}
uint32_t AviRecorder::GetFps()

View file

@ -16,10 +16,7 @@ BaseVideoFilter::BaseVideoFilter(shared_ptr<Console> console)
BaseVideoFilter::~BaseVideoFilter()
{
auto lock = _frameLock.AcquireSafe();
if(_outputBuffer) {
delete[] _outputBuffer;
_outputBuffer = nullptr;
}
delete[] _outputBuffer;
}
void BaseVideoFilter::SetBaseFrameInfo(FrameInfo frameInfo)
@ -41,10 +38,7 @@ void BaseVideoFilter::UpdateBufferSize()
uint32_t newBufferSize = GetFrameInfo().Width*GetFrameInfo().Height;
if(_bufferSize != newBufferSize) {
_frameLock.Acquire();
if(_outputBuffer) {
delete[] _outputBuffer;
}
delete[] _outputBuffer;
_bufferSize = newBufferSize;
_outputBuffer = new uint32_t[newBufferSize];
_frameLock.Release();

View file

@ -20,9 +20,7 @@ ScaleFilter::ScaleFilter(ScaleFilterType scaleFilterType, uint32_t scale)
ScaleFilter::~ScaleFilter()
{
if(_outputBuffer) {
delete[] _outputBuffer;
}
delete[] _outputBuffer;
}
uint32_t ScaleFilter::GetScale()
@ -51,10 +49,7 @@ void ScaleFilter::ApplyPrescaleFilter(uint32_t *inputArgbBuffer)
void ScaleFilter::UpdateOutputBuffer(uint32_t width, uint32_t height)
{
if(!_outputBuffer || width != _width || height != _height) {
if(_outputBuffer) {
delete[] _outputBuffer;
}
delete[] _outputBuffer;
_width = width;
_height = height;
_outputBuffer = new uint32_t[_width*_height*_filterScale*_filterScale];

View file

@ -9,10 +9,7 @@
ArchiveReader::~ArchiveReader()
{
if(_buffer) {
delete[] _buffer;
_buffer = nullptr;
}
delete[] _buffer;
}
bool ArchiveReader::GetStream(string filename, std::stringstream &stream)
@ -61,11 +58,7 @@ bool ArchiveReader::LoadArchive(std::istream &in)
std::streampos filesize = in.tellg();
in.seekg(0, std::ios::beg);
if(_buffer) {
delete[] _buffer;
_buffer = nullptr;
}
delete[] _buffer;
_buffer = new uint8_t[(uint32_t)filesize];
in.read((char*)_buffer, filesize);
in.seekg(0, std::ios::beg);

View file

@ -7,26 +7,10 @@
CamstudioCodec::~CamstudioCodec()
{
if(_prevFrame) {
delete[] _prevFrame;
_prevFrame = nullptr;
}
if(_currentFrame) {
delete[] _currentFrame;
_currentFrame = nullptr;
}
if(_buffer) {
delete[] _buffer;
_buffer = nullptr;
}
if(_compressBuffer) {
delete[] _compressBuffer;
_compressBuffer = nullptr;
}
delete[] _prevFrame;
delete[] _currentFrame;
delete[] _buffer;
delete[] _compressBuffer;
deflateEnd(&_compressor);
}

View file

@ -356,26 +356,11 @@ int ZmbvCodec::FinishCompressFrame(uint8_t** compressedData)
void ZmbvCodec::FreeBuffers()
{
if (blocks) {
delete[] blocks;
blocks= nullptr;
}
if (buf1) {
delete[] buf1;
buf1= nullptr;
}
if (buf2) {
delete[] buf2;
buf2= nullptr;
}
if (work) {
delete[] work;
work= nullptr;
}
if(_buf) {
delete[] _buf;
_buf = nullptr;
}
delete[] blocks;
delete[] buf1;
delete[] buf2;
delete[] work;
delete[] _buf;
}
ZmbvCodec::ZmbvCodec()

View file

@ -158,14 +158,11 @@ void Renderer::ResetNesBuffers()
_pOverlaySrv->Release();
_pOverlaySrv = nullptr;
}
if(_textureBuffer[0]) {
delete[] _textureBuffer[0];
_textureBuffer[0] = nullptr;
}
if(_textureBuffer[1]) {
delete[] _textureBuffer[1];
_textureBuffer[1] = nullptr;
}
delete[] _textureBuffer[0];
_textureBuffer[0] = nullptr;
delete[] _textureBuffer[1];
_textureBuffer[1] = nullptr;
}
void Renderer::ReleaseRenderTargetView()