diff options
| author | Eric Scrivner <zenogais@gmail.com> | 2005-03-12 18:04:55 +0000 |
|---|---|---|
| committer | Eric Scrivner <zenogais@gmail.com> | 2005-03-12 18:04:55 +0000 |
| commit | 3a0e16802b9838ad77d96276bfaa213d8285b76e (patch) | |
| tree | 29bc8ad9e4c1c2d602ce1cf9cdf3bb72de790009 | |
| parent | 338dcba8a98853ad1f4d51f902602a0166f0b144 (diff) | |
| download | mana-client-3a0e16802b9838ad77d96276bfaa213d8285b76e.tar.gz mana-client-3a0e16802b9838ad77d96276bfaa213d8285b76e.tar.bz2 mana-client-3a0e16802b9838ad77d96276bfaa213d8285b76e.tar.xz mana-client-3a0e16802b9838ad77d96276bfaa213d8285b76e.zip | |
Changed RWops constructor a bit.
| -rw-r--r-- | src/resources/image.cpp | 4 | ||||
| -rw-r--r-- | src/resources/image.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 989666f2..f985b759 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -199,13 +199,13 @@ Image* Image::load(const std::string &filePath, int flags) #endif } -Image* Image::load(const char* buffer, unsigned int bufferSize) +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((void*)buffer, bufferSize); + rw = SDL_RWFromMem(buffer, bufferSize); // Use SDL_Image to load the raw image data SDL_Surface* texture = IMG_Load_RW(rw, 1); diff --git a/src/resources/image.h b/src/resources/image.h index f5869167..ebee50d3 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -73,7 +73,7 @@ class Image : public Resource * @return <code>NULL</code> if the an error occurred, a valid pointer * otherwise. */ - static Image *load(const char* buffer, unsigned int bufferSize); + static Image *load(void* buffer, unsigned int bufferSize); /** * Creates a new empty image with given height and width. |