summaryrefslogtreecommitdiff
path: root/src/gui/fonts
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
commit9fe21fcd8883b37bdc30224822e6e42afb35b8f0 (patch)
tree798117abd4dc7e610997d59d530a96ddc1509f53 /src/gui/fonts
parent4429cb14e9e187edef27aba692a4266733f79c17 (diff)
downloadmv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.gz
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.bz2
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.xz
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.zip
Replace most static_cast<Type> to shorter versions from defines.
Diffstat (limited to 'src/gui/fonts')
-rw-r--r--src/gui/fonts/font.cpp6
-rw-r--r--src/gui/fonts/textchunk.cpp12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index b476de976..0f36e5f0e 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -317,7 +317,7 @@ void Font::doClean()
for (unsigned int f = 0; f < CACHES_NUMBER; f ++)
{
TextChunkList *const cache = &mCache[f];
- const size_t size = static_cast<size_t>(cache->size);
+ const size_t size = CAST_SIZE(cache->size);
#ifdef DEBUG_FONT_COUNTERS
logger->log("ptr: %u, size: %ld", f, size);
#endif
@@ -360,10 +360,10 @@ int Font::getStringIndexAt(const std::string& text, const int x) const
for (size_t i = 0; i < sz; ++i)
{
if (getWidth(text.substr(0, i)) > x)
- return static_cast<int>(i);
+ return CAST_S32(i);
}
- return static_cast<int>(sz);
+ return CAST_S32(sz);
}
const TextChunkList *Font::getCache() const noexcept
diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp
index ca22d3ee5..63c70acdb 100644
--- a/src/gui/fonts/textchunk.cpp
+++ b/src/gui/fonts/textchunk.cpp
@@ -97,9 +97,9 @@ void TextChunk::generate(TTF_Font *restrict const font,
{
BLOCK_START("TextChunk::generate")
SDL_Color sdlCol;
- sdlCol.b = static_cast<uint8_t>(color.b);
- sdlCol.r = static_cast<uint8_t>(color.r);
- sdlCol.g = static_cast<uint8_t>(color.g);
+ sdlCol.b = CAST_U8(color.b);
+ sdlCol.r = CAST_U8(color.r);
+ sdlCol.g = CAST_U8(color.g);
#ifdef USE_SDL2
sdlCol.a = 255;
#else
@@ -134,9 +134,9 @@ void TextChunk::generate(TTF_Font *restrict const font,
BLOCK_END("TextChunk::generate")
return;
}
- sdlCol2.b = static_cast<uint8_t>(color2.b);
- sdlCol2.r = static_cast<uint8_t>(color2.r);
- sdlCol2.g = static_cast<uint8_t>(color2.g);
+ sdlCol2.b = CAST_U8(color2.b);
+ sdlCol2.r = CAST_U8(color2.r);
+ sdlCol2.g = CAST_U8(color2.g);
#ifdef USE_SDL2
sdlCol2.a = 255;
#else