summaryrefslogtreecommitdiff
path: root/src/resources/imagehelper.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-10 00:49:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-10 03:07:44 +0300
commit45f076bd429c40d81607f43837f1cc571f3f6be0 (patch)
treed6559bb6fb9e87a4953a342cc4af0db8045ba1f4 /src/resources/imagehelper.cpp
parentf75a1e7af1db4be56430765e19a5aee75284dd3e (diff)
downloadmv-45f076bd429c40d81607f43837f1cc571f3f6be0.tar.gz
mv-45f076bd429c40d81607f43837f1cc571f3f6be0.tar.bz2
mv-45f076bd429c40d81607f43837f1cc571f3f6be0.tar.xz
mv-45f076bd429c40d81607f43837f1cc571f3f6be0.zip
Improve a bit image load speed.
Diffstat (limited to 'src/resources/imagehelper.cpp')
-rw-r--r--src/resources/imagehelper.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 5b7797cbb..eea15d29c 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -43,8 +43,7 @@ bool ImageHelper::mEnableAlpha = true;
Image *ImageHelper::load(SDL_RWops *const rw)
{
- SDL_Surface *const tmpImage = IMG_Load_RW(rw, 1);
-
+ SDL_Surface *const tmpImage = loadPng(rw);
if (!tmpImage)
{
logger->log("Error, image load failed: %s", IMG_GetError());
@@ -115,3 +114,15 @@ void ImageHelper::dumpSurfaceFormat(const SDL_Surface *const image) const
format->Gmask, format->Bmask, format->Amask);
}
}
+
+SDL_Surface *ImageHelper::loadPng(SDL_RWops *const rw)
+{
+ if (!rw || !IMG_isPNG(rw))
+ {
+ logger->log("Error, image missing or not png");
+ return nullptr;
+ }
+ SDL_Surface *const tmpImage = IMG_LoadPNG_RW(rw);
+ SDL_RWclose(rw);
+ return tmpImage;
+}