summaryrefslogtreecommitdiff
path: root/src/resources/surfaceimagehelper.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-26 16:09:58 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-26 16:52:08 +0300
commit929aeb1591e739588cd8cf629e7d7ac5a95261b1 (patch)
tree2b61b477d0e0ffed31a90ba2d6c019da926282aa /src/resources/surfaceimagehelper.cpp
parentb661524e8b7b41cec237492ecd52fdda7b9be394 (diff)
downloadmv-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.gz
mv-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.bz2
mv-929aeb1591e739588cd8cf629e7d7ac5a95261b1.tar.xz
mv-929aeb1591e739588cd8cf629e7d7ac5a95261b1.zip
add surface allocation debug code.
Diffstat (limited to 'src/resources/surfaceimagehelper.cpp')
-rw-r--r--src/resources/surfaceimagehelper.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index 45a7d95fd..75e311a36 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -33,6 +33,8 @@
#include "resources/image.h"
+#include "utils/sdlcheckutils.h"
+
#include <SDL_image.h>
#include "debug.h"
@@ -65,9 +67,9 @@ Image *SurfaceImageHelper::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();
@@ -97,7 +99,7 @@ Image *SurfaceImageHelper::load(SDL_RWops *const rw, Dye const &dye) const
}
Image *const image = load(surf);
- SDL_FreeSurface(surf);
+ MSDL_FreeSurface(surf);
return image;
}
@@ -130,7 +132,7 @@ SDL_Surface* SurfaceImageHelper::SDLDuplicateSurface(SDL_Surface *const
if (!tmpImage || !tmpImage->format)
return nullptr;
- return SDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE);
+ return MSDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE);
}
Image *SurfaceImageHelper::_SDLload(SDL_Surface *tmpImage) const
@@ -161,7 +163,7 @@ SDL_Surface *SurfaceImageHelper::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);
}