diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-26 16:09:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-26 16:52:08 +0300 |
| commit | 929aeb1591e739588cd8cf629e7d7ac5a95261b1 (patch) | |
| tree | 2b61b477d0e0ffed31a90ba2d6c019da926282aa /src/resources/sdl2imagehelper.cpp | |
| parent | b661524e8b7b41cec237492ecd52fdda7b9be394 (diff) | |
| download | manaverse-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.gz manaverse-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.bz2 manaverse-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.xz manaverse-929aeb1591e739588cd8cf629e7d7ac5a95261b1.zip | |
add surface allocation debug code.
Diffstat (limited to 'src/resources/sdl2imagehelper.cpp')
| -rw-r--r-- | src/resources/sdl2imagehelper.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index ee342ee26..66e280c59 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -33,6 +33,8 @@ #include "resources/image.h" +#include "utils/sdlcheckutils.h" + #include <SDL_image.h> #include "debug.h" @@ -68,9 +70,9 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const rgba.Amask = 0x000000FF; #endif - SDL_Surface *const surf = SDL_ConvertSurface( + SDL_Surface *const surf = MSDL_ConvertSurface( tmpImage, &rgba, SDL_SWSURFACE); - SDL_FreeSurface(tmpImage); + MSDL_FreeSurface(tmpImage); uint32_t *pixels = static_cast<uint32_t *>(surf->pixels); const int type = dye.getType(); @@ -100,7 +102,7 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const } Image *const image = load(surf); - SDL_FreeSurface(surf); + MSDL_FreeSurface(surf); return image; } @@ -128,7 +130,7 @@ SDL_Surface* SDLImageHelper::SDLDuplicateSurface(SDL_Surface *const tmpImage) if (!tmpImage || !tmpImage->format) return nullptr; - return SDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE); + return MSDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE); } Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) const @@ -163,7 +165,7 @@ SDL_Surface *SDLImageHelper::create32BitSurface(int width, int height) const const int amask = 0xff000000; #endif - return SDL_CreateRGBSurface(SDL_SWSURFACE, + return MSDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, rmask, gmask, bmask, amask); } |