summaryrefslogtreecommitdiff
path: root/src/resources/image.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 11:37:47 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 11:37:47 +0000
commitcd2c4f5861c89f0925a1a706e38535d6c11cc3a0 (patch)
tree232273a1d853305deea6e3101dd7ceef9fb76930 /src/resources/image.cpp
parenta03175439e5abaae8603a85be0db173daa543f6b (diff)
downloadmana-client-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.gz
mana-client-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.bz2
mana-client-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.tar.xz
mana-client-cd2c4f5861c89f0925a1a706e38535d6c11cc3a0.zip
Converted ChatBox into a proper ChatWindow in response to changes by Chetic.
Diffstat (limited to 'src/resources/image.cpp')
-rw-r--r--src/resources/image.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index f985b759..f976466e 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -201,11 +201,8 @@ Image* Image::load(const std::string &filePath, int flags)
Image* Image::load(void* buffer, unsigned int bufferSize)
{
- // Define our RWops structure
- SDL_RWops* rw = NULL;
-
- // Load the raw file data from the buffer
- rw = SDL_RWFromMem(buffer, bufferSize);
+ // Load the raw file data from the buffer in an RWops structure
+ SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize);
// Use SDL_Image to load the raw image data
SDL_Surface* texture = IMG_Load_RW(rw, 1);