summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-17 22:11:45 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-17 22:11:45 +0300
commit089757c176159291d99d902955ef27312a8471a7 (patch)
tree0ad3f0b014a35ce4f18a1209ea680fd833222e0b /src/resources
parenta6739b53c776771e0f78be3bfa3f8ccbf850f7cb (diff)
downloadmanaplus-089757c176159291d99d902955ef27312a8471a7.tar.gz
manaplus-089757c176159291d99d902955ef27312a8471a7.tar.bz2
manaplus-089757c176159291d99d902955ef27312a8471a7.tar.xz
manaplus-089757c176159291d99d902955ef27312a8471a7.zip
Remove default parameter from image.h
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image/image.h5
-rw-r--r--src/resources/image/subimage.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/image/image.h b/src/resources/image/image.h
index 1da834bb1..d3a6d5aac 100644
--- a/src/resources/image/image.h
+++ b/src/resources/image/image.h
@@ -217,8 +217,9 @@ class Image notfinal : public Resource
// -----------------------
/** SDL Constructor */
- Image(SDL_Surface *restrict const image, const bool hasAlphaChannel,
- uint8_t *restrict const alphaChannel = nullptr);
+ Image(SDL_Surface *restrict const image,
+ const bool hasAlphaChannel,
+ uint8_t *restrict const alphaChannel);
#ifdef USE_SDL2
Image(SDL_Texture *restrict const image,
diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp
index 0b14b788e..3060dfd51 100644
--- a/src/resources/image/subimage.cpp
+++ b/src/resources/image/subimage.cpp
@@ -88,7 +88,7 @@ SubImage::SubImage(Image *const parent,
SDL_Surface *const image,
const int x, const int y,
const int width, const int height) :
- Image(image, false),
+ Image(image, false, nullptr),
mInternalBounds(),
mParent(parent)
{