This commit is contained in:
bkaradzic 2013-05-21 21:58:24 -07:00
Родитель 4ade0981f1
Коммит aeb414d238
3 изменённых файлов: 9 добавлений и 7 удалений

12
3rdparty/freetype/freetype.h поставляемый
Просмотреть файл

@ -1,11 +1,13 @@
#pragma once
#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable: 4100) // DISABLE warning C4100: '' : unreferenced formal parameter
# pragma warning(disable: 4146) // DISABLE warning C4146: unary minus operator applied to unsigned type, result still unsigned
# pragma warning(disable: 4700) // DISABLE warning C4700: uninitialized local variable 'temp' used
# pragma warning(disable: 4701) // DISABLE warning C4701: potentially uninitialized local variable '' used
# pragma warning(push)
# pragma warning(disable: 4100) // DISABLE warning C4100: '' : unreferenced formal parameter
# pragma warning(disable: 4146) // DISABLE warning C4146: unary minus operator applied to unsigned type, result still unsigned
# pragma warning(disable: 4244) // DISABLE warning C4244: '+=' : conversion from '__int64' to 'FT_ULong', possible loss of data
# pragma warning(disable: 4267) // DISABLE warning C4267: 'initializing' : conversion from 'size_t' to 'FT_Long', possible loss of data
# pragma warning(disable: 4700) // DISABLE warning C4700: uninitialized local variable 'temp' used
# pragma warning(disable: 4701) // DISABLE warning C4701: potentially uninitialized local variable '' used
#elif defined(__GNUC__)
# pragma GCC system_header
#endif // defined(__GNUC__)

Просмотреть файл

@ -522,7 +522,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
}
}
if (currLOD!=targetLOD)
if (currLOD != targetLOD)
{
transitionFrame++;
}

Просмотреть файл

@ -267,7 +267,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const wchar_t* _string)
m_lineGap = 0;
}
for (uint32_t ii = 0, end = wcslen(_string); ii < end; ++ii)
for (uint32_t ii = 0, end = (uint32_t)wcslen(_string); ii < end; ++ii)
{
uint32_t _codePoint = _string[ii];
if (m_fontManager->getGlyphInfo(_fontHandle, _codePoint, glyph) )