summaryrefslogtreecommitdiff
path: root/src/resources/openglimagehelper.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-04 20:45:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-05 00:21:16 +0300
commitaf2f4f8ab50a209502b929082b11a7a07e6c5499 (patch)
tree4ad3e2efb564fd523deb5a0925941bf4abac319a /src/resources/openglimagehelper.cpp
parentb90595ef486f10d4b5e069e9363a2df5270fe717 (diff)
downloadmv-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.gz
mv-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.bz2
mv-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.xz
mv-af2f4f8ab50a209502b929082b11a7a07e6c5499.zip
Fix code style.
Diffstat (limited to 'src/resources/openglimagehelper.cpp')
-rw-r--r--src/resources/openglimagehelper.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 18a220f01..6187764e9 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -169,14 +169,13 @@ SDL_Surface *OpenGLImageHelper::convertSurface(SDL_Surface *tmpImage,
amask = 0xff000000;
#endif
- SDL_Surface *oldImage = nullptr;
if (tmpImage->format->BitsPerPixel != 32
|| realWidth != width || realHeight != height
|| rmask != tmpImage->format->Rmask
|| gmask != tmpImage->format->Gmask
|| amask != tmpImage->format->Amask)
{
- oldImage = tmpImage;
+ SDL_Surface *oldImage = tmpImage;
#ifdef USE_SDL2
SDL_SetSurfaceBlendMode(oldImage, SDL_BLENDMODE_NONE);
#endif