Fixed wallpaper prescaling issues

Image::SDLgetScaledImage was changed so that it tries to find an existing
scaled version of the image first, and generates it when none exists.
When it needs to generate one, this resource is added to the resource
manager, partly to avoid duplicating the work later but mainly to keep
memory management straightforward.

This function also used to leak the scaled SDL_Surface since it wrongly
assumed that Image::load would free it.

To avoid filling up the memory with scaled wallpapers that are waiting
30 seconds until they will be deleted, the Resource::decRef function was
extended with a parameter that allows telling it what to do with orphans.
Calling decRef with Resource::DeleteImmediately will delete the resource
immediately in case the resource is orphaned.

Reviewed-by: Yohann Ferreira

1 files changed, 24 insertions, 4 deletions

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 15d7c8eb..a9e7e565 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -117,9 +117,11 @@ void ResourceManager::cleanOrphans()
     timeval tv;
     gettimeofday(&tv, NULL);
     // Delete orphaned resources after 30 seconds.
-    time_t oldest = tv.tv_sec, threshold = oldest - 30;
+    time_t oldest = tv.tv_sec;
+    time_t threshold = oldest - 30;
 
-    if (mOrphanedResources.empty() || mOldestOrphan >= threshold) return;
+    if (mOrphanedResources.empty() || mOldestOrphan >= threshold)
+        return;
 
     ResourceIterator iter = mOrphanedResources.begin();
     while (iter != mOrphanedResources.end())
@@ -128,7 +130,8 @@ void ResourceManager::cleanOrphans()
         time_t t = res->mTimeStamp;
         if (t >= threshold)
         {
-            if (t < oldest) oldest = t;
+            if (t < oldest)
+                oldest = t;
             ++iter;
         }
         else
@@ -234,6 +237,17 @@ bool ResourceManager::addResource(const std::string &idPath,
     return false;
 }
 
+Resource *ResourceManager::get(const std::string &idPath)
+{
+    ResourceIterator resIter = mResources.find(idPath);
+    if (resIter != mResources.end())
+    {
+        resIter->second->incRef();
+        return resIter->second;
+    }
+    return 0;
+}
+
 Resource *ResourceManager::get(const std::string &idPath, generator fun,
                                void *data)
 {
@@ -392,12 +406,18 @@ void ResourceManager::release(Resource *res)
     time_t timestamp = tv.tv_sec;
 
     res->mTimeStamp = timestamp;
-    if (mOrphanedResources.empty()) mOldestOrphan = timestamp;
+    if (mOrphanedResources.empty())
+        mOldestOrphan = timestamp;
 
     mOrphanedResources.insert(*resIter);
     mResources.erase(resIter);
 }
 
+void ResourceManager::remove(Resource *res)
+{
+    mResources.erase(res->mIdPath);
+}
+
 ResourceManager *ResourceManager::getInstance()
 {
     // Create a new instance if necessary.