Merge branch 'master' into lpc2012lpc2012

1 files changed, 3 insertions, 21 deletions

diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index ec76f861..c9974fec 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -94,14 +94,9 @@ void Desktop::draw(gcn::Graphics *graphics)
 
     if (mWallpaper)
     {
-        if (!Image::useOpenGL())
-            g->drawImage(mWallpaper,
-                (getWidth() - mWallpaper->getWidth()) / 2,
-                (getHeight() - mWallpaper->getHeight()) / 2);
-        else
-            g->drawRescaledImage(mWallpaper, 0, 0, 0, 0,
-                mWallpaper->getWidth(), mWallpaper->getHeight(),
-                getWidth(), getHeight(), false);
+        g->drawRescaledImage(mWallpaper, 0, 0, 0, 0,
+            mWallpaper->getWidth(), mWallpaper->getHeight(),
+            getWidth(), getHeight(), false);
     }
 
     mBgSkin->setAlpha(1.0f);
@@ -168,19 +163,6 @@ void Desktop::setBestFittingWallpaper()
             mWallpaper->decRef(Resource::DeleteImmediately);
 
         mWallpaper = wallpaper;
-
-        // In software mode we try to prescale the image for performance
-        if (!wallpaper->useOpenGL() &&
-                (wallpaper->getWidth() != width ||
-                 wallpaper->getHeight() != height))
-        {
-            if (Image *prescaled = wallpaper->SDLgetScaledImage(width, height))
-            {
-                // Make sure the original can be freed
-                wallpaper->decRef();
-                mWallpaper = prescaled;
-            }
-        }
     }
     else
     {