From cd327e877804a824db51d1e0831ad9e13b0e18b3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 May 2016 22:17:47 +0300
Subject: Move rescaled images load function from resourcemanager into separate
 file.

---
 src/resources/resourcemanager/resourcemanager.cpp | 40 -----------------------
 src/resources/resourcemanager/resourcemanager.h   |  4 ---
 2 files changed, 44 deletions(-)

(limited to 'src/resources/resourcemanager')

diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 2289fcffd..b2d4d483d 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -698,46 +698,6 @@ void ResourceManager::clearScheduled()
     BLOCK_END("ResourceManager::clearScheduled")
 }
 
-struct RescaledLoader final
-{
-    ResourceManager *manager;
-    const Image *image;
-    int width;
-    int height;
-    static Resource *load(const void *const v)
-    {
-        if (!v)
-            return nullptr;
-        const RescaledLoader *const rl
-            = static_cast<const RescaledLoader *const>(v);
-        if (!rl->manager || !rl->image)
-            return nullptr;
-        Image *const rescaled = rl->image->SDLgetScaledImage(
-            rl->width, rl->height);
-        if (!rescaled)
-        {
-            reportAlways("Rescale image failed: %s",
-                rl->image->getIdPath().c_str());
-            return nullptr;
-        }
-        return rescaled;
-    }
-};
-
-Image *ResourceManager::getRescaled(const Image *const image,
-                                    const int width, const int height)
-{
-    if (!image)
-        return nullptr;
-
-    std::string idPath = image->getIdPath() + strprintf(
-        "_rescaled%dx%d", width, height);
-    const RescaledLoader rl = { this, image, width, height };
-    Image *const img = static_cast<Image *const>(
-        get(idPath, RescaledLoader::load, &rl));
-    return img;
-}
-
 void ResourceManager::clearCache()
 {
     cleanProtected();
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index 71643d1ac..caad4bb6e 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -147,10 +147,6 @@ class ResourceManager final : public MemoryCounter
          */
         void moveToDeleted(Resource *const res);
 
-        Image *getRescaled(const Image *const image,
-                           const int width,
-                           const int height) A_WARN_UNUSED;
-
         /**
          * Loads the given filename as an SDL surface. The returned surface is
          * expected to be freed by the caller using SDL_FreeSurface.
-- 
cgit v1.2.3-60-g2f50