diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/resources/imagehelper.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/imagehelper.h')
| -rw-r--r-- | src/resources/imagehelper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index 27cf1df14..2e3b96771 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -82,7 +82,7 @@ class ImageHelper static SDL_Surface *convertTo32Bit(SDL_Surface *const tmpImage) A_WARN_UNUSED; - void dumpSurfaceFormat(const SDL_Surface *const image) const; + static void dumpSurfaceFormat(const SDL_Surface *const image); virtual SDL_Surface *create32BitSurface(int width, int height) const A_WARN_UNUSED = 0; |