From 9105408ba52b7639d8553855e47ec452d2e22e17 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Mar 2014 15:07:37 +0300 Subject: remove duplicate code from imagehelper. --- src/resources/imagehelper.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/resources/imagehelper.h') 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; } -- cgit v1.2.3-60-g2f50