diff options
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/image/subimage.cpp | 3 | ||||
-rw-r--r-- | src/resources/loaders/rescaledloader.cpp | 3 | ||||
-rw-r--r-- | src/resources/loaders/xmlloader.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp index 9eda05164..0b14b788e 100644 --- a/src/resources/image/subimage.cpp +++ b/src/resources/image/subimage.cpp @@ -227,8 +227,7 @@ void SubImage::decRef() int SubImage::calcMemoryLocal() const { - int sz = static_cast<int>(sizeof(SubImage) + + return static_cast<int>(sizeof(SubImage) + sizeof(std::map<float, SDL_Surface*>)) + Resource::calcMemoryLocal(); - return sz; } diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index cea73b382..e69814d27 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -71,7 +71,6 @@ Image *Loader::getRescaled(const Image *const image, const std::string idPath = image->mIdPath + strprintf( "_rescaled%dx%d", width, height); const RescaledLoader rl = { image, width, height }; - Image *const img = static_cast<Image *>( + return static_cast<Image *>( ResourceManager::get(idPath, RescaledLoader::load, &rl)); - return img; } diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp index 2374e44d1..2d06d8128 100644 --- a/src/resources/loaders/xmlloader.cpp +++ b/src/resources/loaders/xmlloader.cpp @@ -44,10 +44,9 @@ namespace return nullptr; const ResourceLoader *const rl = static_cast<const ResourceLoader *>(v); - Resource *const res = new XML::Document(rl->path, + return new XML::Document(rl->path, rl->useResman, rl->skipError); - return res; } }; |