diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-31 17:01:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-31 17:01:38 +0300 |
| commit | 5a60cfd0ef0c2f8b78397d05a50ab9b939309ea5 (patch) | |
| tree | aeafccf4632262393b23e52afc9facc5ec9f1b3f /src/resources | |
| parent | 84f2cad3897d0dacb60cfef4e1860ffb8ec268e1 (diff) | |
| download | manaplus-5a60cfd0ef0c2f8b78397d05a50ab9b939309ea5.tar.gz manaplus-5a60cfd0ef0c2f8b78397d05a50ab9b939309ea5.tar.bz2 manaplus-5a60cfd0ef0c2f8b78397d05a50ab9b939309ea5.tar.xz manaplus-5a60cfd0ef0c2f8b78397d05a50ab9b939309ea5.zip | |
Fix sign on some vars.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/imagehelper.cpp | 13 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index ad0c98ad1..0092d132b 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -169,12 +169,15 @@ void ImageHelper::dumpSurfaceFormat(const SDL_Surface *const image) logger->log("Alpha: %d", format->alpha); #endif logger->log("Loss: %02x, %02x, %02x, %02x", - static_cast<int>(format->Rloss), static_cast<int>(format->Gloss), - static_cast<int>(format->Bloss), static_cast<int>(format->Aloss)); + static_cast<unsigned int>(format->Rloss), + static_cast<unsigned int>(format->Gloss), + static_cast<unsigned int>(format->Bloss), + static_cast<unsigned int>(format->Aloss)); logger->log("Shift: %02x, %02x, %02x, %02x", - static_cast<int>(format->Rshift), static_cast<int>(format->Gshift), - static_cast<int>(format->Bshift), - static_cast<int>(format->Ashift)); + static_cast<unsigned int>(format->Rshift), + static_cast<unsigned int>(format->Gshift), + static_cast<unsigned int>(format->Bshift), + static_cast<unsigned int>(format->Ashift)); logger->log("Mask: %08x, %08x, %08x, %08x", format->Rmask, format->Gmask, format->Bmask, format->Amask); } diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 7421dc852..292b2fb22 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -277,7 +277,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, if (error) { std::string errmsg = GraphicsManager::errorToString(error); - logger->log("Error: Image GL import failed: %s (%d)", + logger->log("Error: Image GL import failed: %s (%u)", errmsg.c_str(), error); return nullptr; } diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index ff907bb53..ea4698862 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -169,7 +169,7 @@ void ResourceManager::cleanUp(Resource *const res) if (res->mRefCount > 0) { - logger->log("ResourceManager::~ResourceManager() cleaning up %d " + logger->log("ResourceManager::~ResourceManager() cleaning up %u " "reference%s to %s", res->mRefCount, (res->mRefCount == 1) ? "" : "s", |