diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-18 14:53:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-19 15:12:20 +0300 |
| commit | 6205783e6ac38a17ab6a06ba8d2a480a0d8de98a (patch) | |
| tree | 2e939ab68a1c96fbf7eda58a24abc92c305bbdb0 | |
| parent | a3c0ce64ff095031b7defd51e06749328ca180be (diff) | |
| download | manaplus-6205783e6ac38a17ab6a06ba8d2a480a0d8de98a.tar.gz manaplus-6205783e6ac38a17ab6a06ba8d2a480a0d8de98a.tar.bz2 manaplus-6205783e6ac38a17ab6a06ba8d2a480a0d8de98a.tar.xz manaplus-6205783e6ac38a17ab6a06ba8d2a480a0d8de98a.zip | |
remove default parameter from Image constructor.
| -rw-r--r-- | src/resources/image.h | 2 | ||||
| -rw-r--r-- | src/resources/subimage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index f10734ba4..e4e41b914 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -200,7 +200,7 @@ class Image : public Resource // ----------------------- /** SDL Constructor */ - Image(SDL_Surface *const image, const bool hasAlphaChannel = false, + Image(SDL_Surface *const image, const bool hasAlphaChannel, uint8_t *const alphaChannel = nullptr); #ifdef USE_SDL2 diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index ee13777b1..520a37fe9 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -84,7 +84,7 @@ SubImage::SubImage(Image *const parent, SDL_Texture *const image, SubImage::SubImage(Image *const parent, SDL_Surface *const image, const int x, const int y, const int width, const int height) : - Image(image), + Image(image, false), mInternalBounds(), mParent(parent) { |