From 3a28edfb7ac991ad70a7baf76f48218d9db89bcb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 10 Jun 2012 16:54:18 +0300
Subject: Split ImageHelper to ImageHelper, SDLImageHelper, OpenGLImageHelper.

---
 src/gui/debugwindow.cpp     | 2 +-
 src/gui/minimap.cpp         | 2 +-
 src/gui/sdlfont.cpp         | 2 +-
 src/gui/widgets/desktop.cpp | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 6d0895426..6951d5b4f 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -158,7 +158,7 @@ MapDebugTab::MapDebugTab() :
     mUpdateTime = 0;
 
 #ifdef USE_OPENGL
-    switch (ImageHelper::getLoadAsOpenGL())
+    switch (imageHelper->useOpenGL())
     {
         case 0:
             mFPSText = _("%d FPS (Software)");
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 30d9f40bb..651d9a66c 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -143,7 +143,7 @@ void Minimap::setMap(Map *map)
 
             SDL_UnlockSurface(surface);
 
-            mMapImage = ImageHelper::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 bafc2c8e2..b623337eb 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -85,7 +85,7 @@ class SDLTextChunk
                 return;
             }
 
-            img = ImageHelper::createTextSurface(surface, alpha);
+            img = imageHelper->createTextSurface(surface, alpha);
             SDL_FreeSurface(surface);
         }
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index a0f2eb3fe..d3a2e8c50 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -100,7 +100,7 @@ void Desktop::draw(gcn::Graphics *graphics)
 
     if (mWallpaper)
     {
-        if (!ImageHelper::useOpenGL())
+        if (!imageHelper->useOpenGL())
         {
             g->drawImage(mWallpaper,
                 (getWidth() - mWallpaper->getWidth()) / 2,
@@ -136,7 +136,7 @@ void Desktop::setBestFittingWallpaper()
         if (mWallpaper)
             mWallpaper->decRef();
 
-        if (!ImageHelper::useOpenGL()
+        if (!imageHelper->useOpenGL()
             && (nWallPaper->getWidth() != getWidth()
             || nWallPaper->getHeight() != getHeight()))
         {
-- 
cgit v1.2.3-70-g09d2