scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-03-01 18:14:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master'

Browse source 
Conflicts:
	examples/common/font/text_buffer_manager.cpp
This commit is contained in:
Jeremie Roy 2013-05-22 17:22:48 +02:00
commit 65b08cc523
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

@ -261,7 +261,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const wchar_t* _string, cons
} }
if( _end == NULL) if( _end == NULL)
{ {
_end = _string + wcslen(_string); _end = _string + (uint32_t) wcslen(_string);
} }
BX_CHECK(_end >= _string); BX_CHECK(_end >= _string);