diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-21 14:37:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-24 21:08:14 +0300 |
| commit | ec1beaa2ee07368368e9bd45fe400eedc57419eb (patch) | |
| tree | c8f4792dc2316c7cc852bcf6738dff7557d9b872 /src/resources/imagehelper.cpp | |
| parent | 8d4af08b165e10d7e82380074ce733ee9d068c6a (diff) | |
| download | manaplus-ec1beaa2ee07368368e9bd45fe400eedc57419eb.tar.gz manaplus-ec1beaa2ee07368368e9bd45fe400eedc57419eb.tar.bz2 manaplus-ec1beaa2ee07368368e9bd45fe400eedc57419eb.tar.xz manaplus-ec1beaa2ee07368368e9bd45fe400eedc57419eb.zip | |
first part of fixes for compilation with SDL2
Diffstat (limited to 'src/resources/imagehelper.cpp')
| -rw-r--r-- | src/resources/imagehelper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index 6a4a47505..cdd1672f6 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -62,8 +62,10 @@ SDL_Surface* ImageHelper::convertTo32Bit(SDL_Surface *const tmpImage) return nullptr; SDL_PixelFormat RGBAFormat; RGBAFormat.palette = nullptr; +#ifndef USE_SDL2 RGBAFormat.colorkey = 0; RGBAFormat.alpha = 0; +#endif RGBAFormat.BitsPerPixel = 32; RGBAFormat.BytesPerPixel = 4; #if SDL_BYTEORDER == SDL_BIG_ENDIAN @@ -102,7 +104,9 @@ void ImageHelper::dumpSurfaceFormat(const SDL_Surface *const image) const { const SDL_PixelFormat * const format = image->format; logger->log("Bytes per pixel: %d", format->BytesPerPixel); +#ifndef USE_SDL2 logger->log("Alpha: %d", format->alpha); +#endif logger->log("Loss: %02x, %02x, %02x, %02x", static_cast<int>(format->Rloss), static_cast<int>(format->Gloss), static_cast<int>(format->Bloss), static_cast<int>(format->Aloss)); |