diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-06-29 23:52:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-06-30 00:10:21 +0300 |
commit | 63bed529c78ca05d3e32a0b6ec3bcfd6152e53de (patch) | |
tree | 9d233f3ecf71452123f45b4563fef8be4308769b /src/resources/resourcemanager.cpp | |
parent | 27300ff284bbed3b6bce938071c3982e4a757680 (diff) | |
download | manaplus-63bed529c78ca05d3e32a0b6ec3bcfd6152e53de.tar.gz manaplus-63bed529c78ca05d3e32a0b6ec3bcfd6152e53de.tar.bz2 manaplus-63bed529c78ca05d3e32a0b6ec3bcfd6152e53de.tar.xz manaplus-63bed529c78ca05d3e32a0b6ec3bcfd6152e53de.zip |
Fix memory leak in desktop.cpp
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r-- | src/resources/resourcemanager.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 410611fc3..78ca6a284 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -726,3 +726,34 @@ void ResourceManager::clearScheduled() } deletedSurfaces.clear(); } + +struct RescaledLoader +{ + ResourceManager *manager; + Image *image; + int width; + int height; + static Resource *load(void *v) + { + if (!v) + return NULL; + RescaledLoader *l = static_cast< RescaledLoader * >(v); + if (!l->manager) + return NULL; + Image *rescaled = l->image->SDLgetScaledImage(l->width, l->height); + if (!rescaled) + return NULL; + return rescaled; + } +}; + +Image *ResourceManager::getRescaled(Image *image, int width, int height) +{ + if (!image) + return 0; + + std::string idPath = image->getIdPath() + strprintf("_rescaled%dx%d", width, height); + RescaledLoader l = { this, image, width, height }; + Image *img = static_cast<Image*>(get(idPath, RescaledLoader::load, &l)); + return img; +} |