From 1ff17739796e327e30a78b544be9865420d4c807 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 22 Dec 2017 02:10:59 +0300 Subject: Remove default parameters from imageset. --- src/resources/imageset.h | 7 +++++-- src/resources/loaders/imagesetloader.cpp | 2 +- src/resources/loaders/subimagesetloader.cpp | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 78907fbba..e31317731 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -40,8 +40,11 @@ class ImageSet notfinal : public Resource /** * Cuts the passed image in a grid of sub images. */ - ImageSet(Image *const img, const int w, const int h, - const int margin = 0, const int spacing = 0); + ImageSet(Image *const img, + const int w, + const int h, + const int margin, + const int spacing); A_DELETE_COPY(ImageSet) diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 63b56d1fe..4afb4c40d 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -56,7 +56,7 @@ struct ImageSetLoader final reportAlways("Image loading error: %s", rl->path.c_str()); return nullptr; } - ImageSet *const res = new ImageSet(img, rl->w, rl->h); + ImageSet *const res = new ImageSet(img, rl->w, rl->h, 0, 0); img->decRef(); return res; } diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index ef47b164d..bef66e081 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -52,7 +52,10 @@ namespace if (rl->parent == nullptr) return nullptr; ImageSet *const res = new ImageSet(rl->parent, - rl->width, rl->height); + rl->width, + rl->height, + 0, + 0); return res; } }; -- cgit v1.2.3-60-g2f50