From ff11053f5f638749c3564c464dc41ebc474b4897 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 9 Jun 2012 22:46:34 +0300
Subject: Move static methods from Image class to ImageHelper class. Remove SDL
 merge method. It was very slow and unused.

---
 src/resources/resourcemanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/resources/resourcemanager.cpp')

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 12ad310ed..62a604ebe 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -29,6 +29,7 @@
 
 #include "resources/dye.h"
 #include "resources/image.h"
+#include "resources/imagehelper.h"
 #include "resources/imageset.h"
 #include "resources/music.h"
 #include "resources/soundeffect.h"
@@ -456,8 +457,8 @@ struct DyedImageLoader
             delete d;
             return nullptr;
         }
-        Resource *res = d ? Image::load(rw, *d)
-                          : Image::load(rw);
+        Resource *res = d ? ImageHelper::load(rw, *d)
+                          : ImageHelper::load(rw);
         delete d;
         return res;
     }
-- 
cgit v1.2.3-70-g09d2