Move static methods from Image class to ImageHelper class.

Remove SDL merge method. It was very slow and unused.

4 files changed, 9 insertions, 8 deletions

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 0976f73b5..6d0895426 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -41,7 +41,7 @@
 #include "gui/widgets/tab.h"
 #include "gui/widgets/tabbedarea.h"
 
-#include "resources/image.h"
+#include "resources/imagehelper.h"
 
 #include "net/packetcounters.h"
 
@@ -158,7 +158,7 @@ MapDebugTab::MapDebugTab() :
     mUpdateTime = 0;
 
 #ifdef USE_OPENGL
-    switch (Image::getLoadAsOpenGL())
+    switch (ImageHelper::getLoadAsOpenGL())
     {
         case 0:
             mFPSText = _("%d FPS (Software)");
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);
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 8713367bc..bafc2c8e2 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -30,6 +30,7 @@
 #include "utils/paths.h"
 
 #include "resources/image.h"
+#include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/stringutils.h"
@@ -84,9 +85,7 @@ class SDLTextChunk
                 return;
             }
 
-            img = Image::createTextSurface(surface, alpha);
-//            img = Image::load(surface);
-
+            img = ImageHelper::createTextSurface(surface, alpha);
             SDL_FreeSurface(surface);
         }
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6352c300f..a0f2eb3fe 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -32,6 +32,7 @@
 #include "gui/widgets/label.h"
 
 #include "resources/image.h"
+#include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 #include "resources/wallpaper.h"
 
@@ -99,7 +100,7 @@ void Desktop::draw(gcn::Graphics *graphics)
 
     if (mWallpaper)
     {
-        if (!mWallpaper->useOpenGL())
+        if (!ImageHelper::useOpenGL())
         {
             g->drawImage(mWallpaper,
                 (getWidth() - mWallpaper->getWidth()) / 2,
@@ -135,7 +136,7 @@ void Desktop::setBestFittingWallpaper()
         if (mWallpaper)
             mWallpaper->decRef();
 
-        if (!nWallPaper->useOpenGL()
+        if (!ImageHelper::useOpenGL()
             && (nWallPaper->getWidth() != getWidth()
             || nWallPaper->getHeight() != getHeight()))
         {