diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/resources/imageloader.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/resources/imageloader.cpp')
| -rw-r--r-- | src/resources/imageloader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index 72a839573..d88e633be 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -36,7 +36,8 @@ #endif ProxyImage::ProxyImage(SDL_Surface *s): - mImage(NULL), mSDLImage(s) + mImage(nullptr), + mSDLImage(s) { } @@ -103,7 +104,7 @@ void ProxyImage::convertToDisplayFormat() SDL_MapRGB(mSDLImage->format, 255, 0, 255)); mImage = ::Image::load(mSDLImage); SDL_FreeSurface(mSDLImage); - mSDLImage = NULL; + mSDLImage = nullptr; } gcn::Image *ImageLoader::load(const std::string &filename, bool convert) |