From 74780b3e706c5414381d472e5c6aa7b62136230d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 9 Jun 2016 00:40:56 +0200 Subject: [PATCH] Minor fixes to #3803 (#3843) --- src/drawing/engines/OpenGLDrawingEngine.cpp | 6 +++--- src/drawing/engines/SoftwareDrawingEngine.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drawing/engines/OpenGLDrawingEngine.cpp b/src/drawing/engines/OpenGLDrawingEngine.cpp index ae480e065a..06781286b6 100644 --- a/src/drawing/engines/OpenGLDrawingEngine.cpp +++ b/src/drawing/engines/OpenGLDrawingEngine.cpp @@ -129,7 +129,7 @@ public: ~OpenGLDrawingEngine() override { delete _drawingContext; - delete _bits; + delete [] _bits; SDL_GL_DeleteContext(_context); } @@ -274,7 +274,7 @@ private: dst += pitch; } } - delete _bits; + delete [] _bits; } _bits = newBits; @@ -560,7 +560,7 @@ GLuint OpenGLDrawingContext::LoadImageTexture(uint32 image) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels32); - delete (uint8 *) pixels32; + delete [] (uint8 *) pixels32; return texture; } diff --git a/src/drawing/engines/SoftwareDrawingEngine.cpp b/src/drawing/engines/SoftwareDrawingEngine.cpp index ed4858b3d0..7efa5b3ceb 100644 --- a/src/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/drawing/engines/SoftwareDrawingEngine.cpp @@ -69,7 +69,7 @@ public: ~RainDrawer() { - delete _rainPixels; + delete [] _rainPixels; } void SetDPI(rct_drawpixelinfo * dpi) @@ -221,8 +221,8 @@ public: ~SoftwareDrawingEngine() override { delete _drawingContext; - delete _dirtyGrid.Blocks; - delete _bits; + delete [] _dirtyGrid.Blocks; + delete [] _bits; SDL_FreeSurface(_surface); SDL_FreeSurface(_RGBASurface); SDL_FreePalette(_palette); @@ -494,7 +494,7 @@ private: dst += pitch; } } - delete _bits; + delete [] _bits; } _bits = newBits; @@ -523,7 +523,7 @@ private: _dirtyGrid.BlockColumns = (_width >> _dirtyGrid.BlockShiftX) + 1; _dirtyGrid.BlockRows = (_height >> _dirtyGrid.BlockShiftY) + 1; - delete _dirtyGrid.Blocks; + delete [] _dirtyGrid.Blocks; _dirtyGrid.Blocks = new uint8[_dirtyGrid.BlockColumns * _dirtyGrid.BlockRows]; }