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/gui/minimap.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/gui/minimap.cpp')

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index e4bf62ec6..30d9f40bb 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -36,6 +36,7 @@
 #include "gui/viewport.h"
 
 #include "resources/image.h"
+#include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
@@ -142,7 +143,7 @@ void Minimap::setMap(Map *map)
 
             SDL_UnlockSurface(surface);
 
-            mMapImage = Image::load(surface);
+            mMapImage = ImageHelper::load(surface);
             mMapImage->setAlpha(Client::getGuiAlpha());
             mCustomMapImage = true;
             SDL_FreeSurface(surface);
-- 
cgit v1.2.3-60-g2f50