diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-27 20:22:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-27 21:52:59 +0300 |
| commit | 53ae7cee19c269a6ebf53e468825305d448ff006 (patch) | |
| tree | fb43a66adaacc3bb2e42a8d346b5d267f2b807c8 /src/resources | |
| parent | eb9841897bbe93da6aa4ca2537a3e22b3a868d98 (diff) | |
| download | manaplus-53ae7cee19c269a6ebf53e468825305d448ff006.tar.gz manaplus-53ae7cee19c269a6ebf53e468825305d448ff006.tar.bz2 manaplus-53ae7cee19c269a6ebf53e468825305d448ff006.tar.xz manaplus-53ae7cee19c269a6ebf53e468825305d448ff006.zip | |
fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlasmanager.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye_unittest.cc | 1 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sdl2imagehelper.cpp | 2 | ||||
| -rw-r--r-- | src/resources/surfaceimagehelper.cpp | 5 |
5 files changed, 7 insertions, 6 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index 80b0ad253..3b8f6a326 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -248,7 +248,8 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) { #ifdef USE_SDL2 SDL_SetSurfaceAlphaMod(image->mSDLSurface, SDL_ALPHA_OPAQUE); - SDL_SetSurfaceBlendMode (image->mSDLSurface, SDL_BLENDMODE_NONE); + SDL_SetSurfaceBlendMode(image->mSDLSurface, + SDL_BLENDMODE_NONE); #else SDL_SetAlpha(image->mSDLSurface, 0, SDL_ALPHA_OPAQUE); #endif diff --git a/src/resources/dye_unittest.cc b/src/resources/dye_unittest.cc index 05e3401a6..6581298d3 100644 --- a/src/resources/dye_unittest.cc +++ b/src/resources/dye_unittest.cc @@ -251,4 +251,3 @@ TEST(Dye, normalOGLDye1) EXPECT_EQ(0x2a, data[2]); EXPECT_EQ(0x50, data[3]); } - diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 6e60cc647..abf05e800 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -181,7 +181,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, { oldImage = tmpImage; #ifdef USE_SDL2 - SDL_SetSurfaceBlendMode (oldImage, SDL_BLENDMODE_NONE); + SDL_SetSurfaceBlendMode(oldImage, SDL_BLENDMODE_NONE); #endif tmpImage = MSDL_CreateRGBSurface(SDL_SWSURFACE, realWidth, realHeight, 32, rmask, gmask, bmask, amask); diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 66e280c59..65ce5fb8d 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -174,7 +174,7 @@ int SDLImageHelper::combineSurface(SDL_Surface *const src, SDL_Surface *const dst, SDL_Rect *const dstrect) { - SDL_SetSurfaceBlendMode (src, SDL_BLENDMODE_BLEND); + SDL_SetSurfaceBlendMode(src, SDL_BLENDMODE_BLEND); SDL_BlitSurface(src, srcrect, dst, dstrect); return 1; } diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp index 75e311a36..44cee32d9 100644 --- a/src/resources/surfaceimagehelper.cpp +++ b/src/resources/surfaceimagehelper.cpp @@ -149,7 +149,8 @@ int SurfaceImageHelper::useOpenGL() const return 0; } -SDL_Surface *SurfaceImageHelper::create32BitSurface(int width, int height) const +SDL_Surface *SurfaceImageHelper::create32BitSurface(int width, + int height) const { #if SDL_BYTEORDER == SDL_BIG_ENDIAN const int rmask = 0xff000000; @@ -172,7 +173,7 @@ int SurfaceImageHelper::combineSurface(SDL_Surface *const src, SDL_Surface *const dst, SDL_Rect *const dstrect) { - SDL_SetSurfaceBlendMode (src, SDL_BLENDMODE_BLEND); + SDL_SetSurfaceBlendMode(src, SDL_BLENDMODE_BLEND); SDL_BlitSurface(src, srcrect, dst, dstrect); return 1; } |