summaryrefslogtreecommitdiff
path: root/src/resources/imagehelper.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-10 15:07:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-10 15:07:37 +0300
commit9105408ba52b7639d8553855e47ec452d2e22e17 (patch)
tree83581187cb76a946d8726f887e911f9495158974 /src/resources/imagehelper.h
parent57bdc5445f308a92b416916300f853cb729296e3 (diff)
downloadmanaplus-9105408ba52b7639d8553855e47ec452d2e22e17.tar.gz
manaplus-9105408ba52b7639d8553855e47ec452d2e22e17.tar.bz2
manaplus-9105408ba52b7639d8553855e47ec452d2e22e17.tar.xz
manaplus-9105408ba52b7639d8553855e47ec452d2e22e17.zip
remove duplicate code from imagehelper.
Diffstat (limited to 'src/resources/imagehelper.h')
-rw-r--r--src/resources/imagehelper.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index 2e3b96771..e7ec4cfad 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -58,19 +58,16 @@ class ImageHelper
*/
Image *load(SDL_RWops *const rw) const A_WARN_UNUSED;
-#ifdef __GNUC__
virtual Image *load(SDL_RWops *const rw, Dye
- const &dye) const A_WARN_UNUSED = 0;
+ const &dye) const A_WARN_UNUSED;
+#ifdef __GNUC__
virtual Image *load(SDL_Surface *const) const A_WARN_UNUSED = 0;
virtual Image *createTextSurface(SDL_Surface *const tmpImage,
const int width, const int height,
float alpha) const A_WARN_UNUSED = 0;
#else
- virtual Image *load(SDL_RWops *rw, Dye const &dye) const A_WARN_UNUSED
- { return nullptr; }
-
virtual Image *load(SDL_Surface *) const A_WARN_UNUSED
{ return nullptr; }
@@ -85,7 +82,7 @@ class ImageHelper
static void dumpSurfaceFormat(const SDL_Surface *const image);
virtual SDL_Surface *create32BitSurface(int width, int height)
- const A_WARN_UNUSED = 0;
+ const A_WARN_UNUSED;
static void setEnableAlpha(const bool n)
{ mEnableAlpha = n; }