diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-22 18:31:25 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-24 19:05:14 +0100 |
commit | dd1386684b6430337d3b270bec1ca53fa69f9593 (patch) | |
tree | 68ec0caa9e81af7ebd38f45e4a9fcbf8ed35625c /src/resources/image.h | |
parent | 8a4b82e3ed75e426d44b69640f009e1e731c75c4 (diff) | |
download | mana-dd1386684b6430337d3b270bec1ca53fa69f9593.tar.gz mana-dd1386684b6430337d3b270bec1ca53fa69f9593.tar.bz2 mana-dd1386684b6430337d3b270bec1ca53fa69f9593.tar.xz mana-dd1386684b6430337d3b270bec1ca53fa69f9593.zip |
Use SDL_RWops directly on top of PhysFS
This avoids the creation of a temporary buffer containing a complete
file for the sole purpose of wrapping it up in an SDL_RWops.
The necessary wrapper is by Ryan C. Gordon and is included in the
PhysFS repository under 'extras'.
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/resources/image.h')
-rw-r--r-- | src/resources/image.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index 5b361e1a..85db0c17 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -56,28 +56,25 @@ class Image : public Resource virtual ~Image(); /** - * Loads an image from a buffer in memory. + * Loads an image from an SDL_RWops structure. * - * @param buffer The memory buffer containing the image data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the image from. * * @return <code>NULL</code> if an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize); + static Resource *load(SDL_RWops *rw); /** - * Loads an image from a buffer in memory and recolors it. + * Loads an image from an SDL_RWops structure and recolors it. * - * @param buffer The memory buffer containing the image data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the image from. * @param dye The dye used to recolor the image. * * @return <code>NULL</code> if an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize, - Dye const &dye); + static Resource *load(SDL_RWops *rw, Dye const &dye); /** * Loads an image from an SDL surface. |