diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-06 19:18:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-06 19:18:09 +0300 |
commit | f3d00667c5a1bffa5a04d5e86676caca6979b58d (patch) | |
tree | 8c326bea9dfeee35670ad201f39818fc1a7765bc /src/resources/atlas | |
parent | bbfe142ec3b7879bbd618f36367f95c030d65968 (diff) | |
download | manaplus-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.gz manaplus-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.bz2 manaplus-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.xz manaplus-f3d00667c5a1bffa5a04d5e86676caca6979b58d.zip |
Fix code style.
Diffstat (limited to 'src/resources/atlas')
-rw-r--r-- | src/resources/atlas/atlasitem.h | 4 | ||||
-rw-r--r-- | src/resources/atlas/atlasresource.cpp | 4 | ||||
-rw-r--r-- | src/resources/atlas/textureatlas.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h index 835d7faa8..039000393 100644 --- a/src/resources/atlas/atlasitem.h +++ b/src/resources/atlas/atlasitem.h @@ -45,8 +45,8 @@ struct AtlasItem final : public MemoryCounter int calcMemoryLocal() const override final { - return sizeof(AtlasItem) + - name.capacity(); + return static_cast<int>(sizeof(AtlasItem) + + name.capacity()); // +++ here need print, but not add to sum size of image } diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 9ecc32692..48561bbbc 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -73,9 +73,9 @@ void AtlasResource::decRef() int AtlasResource::calcMemoryLocal() const { - return sizeof(AtlasResource) + + return static_cast<int>(sizeof(AtlasResource)) + Resource::calcMemoryLocal() + - atlases.capacity() * sizeof(TextureAtlas*); + static_cast<int>(atlases.capacity() * sizeof(TextureAtlas*)); } int AtlasResource::calcMemoryChilds(const int level) const diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h index 7208a7bf8..78819fa00 100644 --- a/src/resources/atlas/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -56,8 +56,8 @@ struct TextureAtlas final : public MemoryCounter int calcMemoryLocal() const override final { - return sizeof(TextureAtlas) + - items.capacity() * sizeof(AtlasItem*); + return static_cast<int>(sizeof(TextureAtlas) + + items.capacity() * sizeof(AtlasItem*)); } int calcMemoryChilds(const int level) const override final |