summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-25 21:31:25 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-25 21:31:25 +0300
commit8910645b6941f7295dee704fd47933d9ec6927b6 (patch)
tree4db8d0e3e6f214ed11f8bd26c726a12ed30bb705 /src
parent4e59f92aedaa8f19897a1e70fdaa983730d6ba03 (diff)
downloadmv-8910645b6941f7295dee704fd47933d9ec6927b6.tar.gz
mv-8910645b6941f7295dee704fd47933d9ec6927b6.tar.bz2
mv-8910645b6941f7295dee704fd47933d9ec6927b6.tar.xz
mv-8910645b6941f7295dee704fd47933d9ec6927b6.zip
Fix Image and SubImage memory calculaiton functions.
Diffstat (limited to 'src')
-rw-r--r--src/resources/image.cpp3
-rw-r--r--src/resources/subimage.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index ad5d0d91c..b323f8a16 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -478,7 +478,8 @@ int Image::calcMemoryLocal()
{
// +++ this calculation can be wrong for SDL2
int sz = sizeof(Image) +
- sizeof(std::map<float, SDL_Surface*>);
+ sizeof(std::map<float, SDL_Surface*>) +
+ Resource::calcMemoryLocal();
if (mSDLSurface)
{
sz += CAST_S32(mAlphaCache.size()) *
diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp
index 1eac0d89d..1b8cc9ec8 100644
--- a/src/resources/subimage.cpp
+++ b/src/resources/subimage.cpp
@@ -226,6 +226,7 @@ void SubImage::decRef()
int SubImage::calcMemoryLocal()
{
int sz = sizeof(SubImage) +
- sizeof(std::map<float, SDL_Surface*>);
+ sizeof(std::map<float, SDL_Surface*>) +
+ Resource::calcMemoryLocal();
return sz;
}