diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/font.cpp | |
parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
download | plus-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz plus-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 plus-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz plus-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/font.cpp')
-rw-r--r-- | src/gui/font.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/font.cpp b/src/gui/font.cpp index 8c022f99d..acc27d4ab 100644 --- a/src/gui/font.cpp +++ b/src/gui/font.cpp @@ -76,6 +76,7 @@ #include "resources/resourcemanager.h" #include "resources/surfaceimagehelper.h" +#include "utils/delete2.h" #include "utils/paths.h" #include "utils/sdlcheckutils.h" #include "utils/stringutils.h" @@ -163,8 +164,7 @@ SDLTextChunk::SDLTextChunk(const std::string &text0, const Color &color0, SDLTextChunk::~SDLTextChunk() { - delete img; - img = nullptr; + delete2(img); #ifdef UNITTESTS sdlTextChunkCnt --; #endif @@ -294,7 +294,7 @@ void TextChunkList::insertFirst(SDLTextChunk *const item) searchWidth[item->text] = item; } -void TextChunkList::moveToFirst(SDLTextChunk *item) +void TextChunkList::moveToFirst(SDLTextChunk *const item) { if (item == start) return; |