Commit 4dec19c4 authored by cutealien's avatar cutealien

Remove unnecessary pointer checks before delete calls. Thx @Markus Elfring for reporting.

Feature requests Ticket #149 (https://sourceforge.net/p/irrlicht/feature-requests/149/)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5173 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 1553bef1
...@@ -30,7 +30,6 @@ CDepthBuffer::CDepthBuffer(const core::dimension2d<u32>& size) ...@@ -30,7 +30,6 @@ CDepthBuffer::CDepthBuffer(const core::dimension2d<u32>& size)
//! destructor //! destructor
CDepthBuffer::~CDepthBuffer() CDepthBuffer::~CDepthBuffer()
{ {
if (Buffer)
delete [] Buffer; delete [] Buffer;
} }
......
...@@ -177,8 +177,6 @@ IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const ...@@ -177,8 +177,6 @@ IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const
jpeg_destroy_decompress(&cinfo); jpeg_destroy_decompress(&cinfo);
delete [] input; delete [] input;
// if the row pointer was created, we delete it.
if (rowPtr)
delete [] rowPtr; delete [] rowPtr;
// return null pointer // return null pointer
......
...@@ -133,7 +133,6 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const ...@@ -133,7 +133,6 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const
if (setjmp(png_jmpbuf(png_ptr))) if (setjmp(png_jmpbuf(png_ptr)))
{ {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
if (RowPointers)
delete [] RowPointers; delete [] RowPointers;
return 0; return 0;
} }
......
...@@ -161,7 +161,6 @@ bool CMD2MeshFileLoader::loadFile(io::IReadFile* file, CAnimatedMeshMD2* mesh) ...@@ -161,7 +161,6 @@ bool CMD2MeshFileLoader::loadFile(io::IReadFile* file, CAnimatedMeshMD2* mesh)
mesh->FrameTransforms.set_used(header.numFrames); mesh->FrameTransforms.set_used(header.numFrames);
// create vertex arrays for each keyframe // create vertex arrays for each keyframe
if (mesh->FrameList)
delete [] mesh->FrameList; delete [] mesh->FrameList;
mesh->FrameList = new core::array<CAnimatedMeshMD2::SMD2Vert>[header.numFrames]; mesh->FrameList = new core::array<CAnimatedMeshMD2::SMD2Vert>[header.numFrames];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment