Fix memory leak in desktop.cpp

3 files changed, 36 insertions, 0 deletions

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index e9260071f..ec74630ff 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -479,7 +479,10 @@ Image* Image::SDLgetScaledImage(int width, int height)
         // The load function takes care of the SDL<->OpenGL implementation
         // and about freeing the given SDL_surface*.
         if (scaledSurface)
+        {
             scaledImage = load(scaledSurface);
+            SDL_FreeSurface(scaledSurface);
+        }
     }
     return scaledImage;
 }
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;
+}
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 0b73a796e..f70fbece4 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -228,6 +228,8 @@ class ResourceManager
         void saveTextFile(std::string path, std::string name,
                           std::string text);
 
+        Image *getRescaled(Image *image, int width, int height);
+
         /**
          * Loads the given filename as an SDL surface. The returned surface is
          * expected to be freed by the caller using SDL_FreeSurface.