From 9105408ba52b7639d8553855e47ec452d2e22e17 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 10 Mar 2014 15:07:37 +0300
Subject: remove duplicate code from imagehelper.

---
 src/resources/sdl2softwareimagehelper.cpp | 81 -------------------------------
 1 file changed, 81 deletions(-)

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

diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp
index 3e8802f41..fa0a51606 100644
--- a/src/resources/sdl2softwareimagehelper.cpp
+++ b/src/resources/sdl2softwareimagehelper.cpp
@@ -41,68 +41,6 @@
 bool SDL2SoftwareImageHelper::mEnableAlphaCache = false;
 SDL_PixelFormat *SDL2SoftwareImageHelper::mFormat = nullptr;
 
-Image *SDL2SoftwareImageHelper::load(SDL_RWops *const rw, Dye const &dye) const
-{
-    SDL_Surface *const tmpImage = loadPng(rw);
-    if (!tmpImage)
-    {
-        logger->log("Error, image load failed: %s", IMG_GetError());
-        return nullptr;
-    }
-
-    SDL_PixelFormat rgba;
-    rgba.palette = nullptr;
-    rgba.BitsPerPixel = 32;
-    rgba.BytesPerPixel = 4;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    rgba.Rmask = 0x000000FF;
-    rgba.Gmask = 0x0000FF00;
-    rgba.Bmask = 0x00FF0000;
-    rgba.Amask = 0xFF000000;
-#else
-    rgba.Rmask = 0xFF000000;
-    rgba.Gmask = 0x00FF0000;
-    rgba.Bmask = 0x0000FF00;
-    rgba.Amask = 0x000000FF;
-#endif
-
-    SDL_Surface *const surf = MSDL_ConvertSurface(
-        tmpImage, &rgba, SDL_SWSURFACE);
-    MSDL_FreeSurface(tmpImage);
-
-    uint32_t *pixels = static_cast<uint32_t *>(surf->pixels);
-    const int type = dye.getType();
-
-    switch (type)
-    {
-        case 1:
-        {
-            const DyePalette *const pal = dye.getSPalete();
-            if (pal)
-                pal->replaceSColor(pixels, surf->w * surf->h);
-            break;
-        }
-        case 2:
-        {
-            const DyePalette *const pal = dye.getAPalete();
-            if (pal)
-                pal->replaceAColor(pixels, surf->w * surf->h);
-            break;
-        }
-        case 0:
-        default:
-        {
-            dye.normalDye(pixels, surf->w * surf->h);
-            break;
-        }
-    }
-
-    Image *const image = load(surf);
-    MSDL_FreeSurface(surf);
-    return image;
-}
-
 Image *SDL2SoftwareImageHelper::load(SDL_Surface *const tmpImage) const
 {
     return _SDLload(tmpImage);
@@ -140,25 +78,6 @@ Image *SDL2SoftwareImageHelper::_SDLload(SDL_Surface *tmpImage) const
     return new Image(image, false, nullptr);
 }
 
-SDL_Surface *SDL2SoftwareImageHelper::create32BitSurface(int width,
-                                                         int height) const
-{
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    const int rmask = 0xff000000;
-    const int gmask = 0x00ff0000;
-    const int bmask = 0x0000ff00;
-    const int amask = 0x000000ff;
-#else
-    const int rmask = 0x000000ff;
-    const int gmask = 0x0000ff00;
-    const int bmask = 0x00ff0000;
-    const int amask = 0xff000000;
-#endif
-
-    return MSDL_CreateRGBSurface(SDL_SWSURFACE,
-        width, height, 32, rmask, gmask, bmask, amask);
-}
-
 int SDL2SoftwareImageHelper::combineSurface(SDL_Surface *restrict const src,
                                             SDL_Rect *restrict const srcrect,
                                             SDL_Surface *restrict const dst,
-- 
cgit v1.2.3-60-g2f50