mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed 64-bit warnings.

Browse Source
This commit is contained in:
bkaradzic 2013-05-21 21:58:24 -07:00
parent 4ade0981f1
commit aeb414d238
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/freetype/freetype.h vendored
View File

@ -1,11 +1,13 @@
#pragma once #pragma once
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4100) // DISABLE warning C4100: '' : unreferenced formal parameter # 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: 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: 4244) // DISABLE warning C4244: '+=' : conversion from '__int64' to 'FT_ULong', possible loss of data
# pragma warning(disable: 4701) // DISABLE warning C4701: potentially uninitialized local variable '' used # 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__) #elif defined(__GNUC__)
# pragma GCC system_header # pragma GCC system_header
#endif // defined(__GNUC__) #endif // defined(__GNUC__)

2
examples/12-lod/lod.cpp
View File

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

2
examples/common/font/text_buffer_manager.cpp
View File

@ -267,7 +267,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const wchar_t* _string)
m_lineGap = 0; 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]; uint32_t _codePoint = _string[ii];
if (m_fontManager->getGlyphInfo(_fontHandle, _codePoint, glyph) ) if (m_fontManager->getGlyphInfo(_fontHandle, _codePoint, glyph) )