diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-03-10 15:07:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-03-10 15:07:37 +0300 |
commit | 9105408ba52b7639d8553855e47ec452d2e22e17 (patch) | |
tree | 83581187cb76a946d8726f887e911f9495158974 /src/resources/sdl2imagehelper.cpp | |
parent | 57bdc5445f308a92b416916300f853cb729296e3 (diff) | |
download | mv-9105408ba52b7639d8553855e47ec452d2e22e17.tar.gz mv-9105408ba52b7639d8553855e47ec452d2e22e17.tar.bz2 mv-9105408ba52b7639d8553855e47ec452d2e22e17.tar.xz mv-9105408ba52b7639d8553855e47ec452d2e22e17.zip |
remove duplicate code from imagehelper.
Diffstat (limited to 'src/resources/sdl2imagehelper.cpp')
-rw-r--r-- | src/resources/sdl2imagehelper.cpp | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 80110735f..b31622e51 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -43,68 +43,6 @@ bool SDLImageHelper::mEnableAlphaCache = false; SDL_Renderer *SDLImageHelper::mRenderer = nullptr; #endif -Image *SDLImageHelper::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 *SDLImageHelper::load(SDL_Surface *const tmpImage) const { return _SDLload(tmpImage); @@ -145,24 +83,6 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) const return new Image(texture, tmpImage->w, tmpImage->h); } -SDL_Surface *SDLImageHelper::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 SDLImageHelper::combineSurface(SDL_Surface *restrict const src, SDL_Rect *restrict const srcrect, SDL_Surface *restrict const dst, |