diff options
| author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
| commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
| tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/guichan/sdl/sdlimage.cpp | |
| parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
| parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
| download | plus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz plus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 plus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz plus-490862919d79369112c75955a9c36ff8a081efd3.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/guichan/sdl/sdlimage.cpp')
| -rw-r--r-- | src/guichan/sdl/sdlimage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp index e4aadc465..cf8505c4e 100644 --- a/src/guichan/sdl/sdlimage.cpp +++ b/src/guichan/sdl/sdlimage.cpp @@ -130,8 +130,8 @@ namespace gcn for (i = 0; i < mSurface->w * mSurface->h; ++i) { - if (((unsigned int*)mSurface->pixels)[i] == SDL_MapRGB( - mSurface->format, 255, 0, 255)) + if ((static_cast<unsigned int*>(mSurface->pixels))[i] + == SDL_MapRGB(mSurface->format, 255, 0, 255)) { hasPink = true; break; @@ -142,8 +142,8 @@ namespace gcn { Uint8 r, g, b, a; - SDL_GetRGBA(((unsigned int*)mSurface->pixels)[i], mSurface->format, - &r, &g, &b, &a); + SDL_GetRGBA((static_cast<unsigned int*>(mSurface->pixels)[i]), + mSurface->format, &r, &g, &b, &a); if (a != 255) { |