diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-04 21:48:47 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-06-04 21:48:47 +0000 |
commit | a353543dd4da3c489a84f6f17125fdd0e1be2349 (patch) | |
tree | 5e447a0f9a3fd50f58a48f39bbb77d392d78af36 /src/resources/image.cpp | |
parent | ab072dddb231895ba7b6762eda9fa70af961b0fb (diff) | |
download | mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.gz mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.bz2 mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.xz mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.zip |
Merged 0.0 changes from revision 3234 to 3317 to trunk.
Diffstat (limited to 'src/resources/image.cpp')
-rw-r--r-- | src/resources/image.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index a27783d4..d7d4e64b 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -187,19 +187,22 @@ Image* Image::load(void *buffer, unsigned int bufferSize, bool hasAlpha = false; - // Figure out whether the image uses its alpha layer - for (int i = 0; i < tmpImage->w * tmpImage->h; ++i) + if (tmpImage->format->BitsPerPixel == 32) { - Uint8 r, g, b, a; - SDL_GetRGBA( - ((Uint32*) tmpImage->pixels)[i], - tmpImage->format, - &r, &g, &b, &a); - - if (a != 255) + // Figure out whether the image uses its alpha layer + for (int i = 0; i < tmpImage->w * tmpImage->h; ++i) { - hasAlpha = true; - break; + Uint8 r, g, b, a; + SDL_GetRGBA( + ((Uint32*) tmpImage->pixels)[i], + tmpImage->format, + &r, &g, &b, &a); + + if (a != 255) + { + hasAlpha = true; + break; + } } } |