Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-03-09 21:35:41 -08:00
parent 25dd8377d5
commit e2363f2b38
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/common/font/font_manager.cpp
View File

@@ -13,6 +13,7 @@
BX_PRAGMA_DIAGNOSTIC_PUSH();
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4245) // error C4245: '=' : conversion from 'int' to 'FT_UInt', signed/unsigned mismatch
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4611) // warning C4611 : interaction between '_setjmp' and C++ object destruction is non - portable
#if BX_COMPILER_MSVC || BX_COMPILER_GCC >= 40300
#pragma push_macro("interface")
#endif

12
src/image.cpp
View File

@@ -850,9 +850,9 @@ namespace bgfx
{
ImageContainer* output = imageAlloc(_allocator
, _dstFormat
, _input.m_width
, _input.m_height
, _input.m_depth
, uint16_t(_input.m_width)
, uint16_t(_input.m_height)
, uint16_t(_input.m_depth)
, _input.m_numLayers
, _input.m_cubeMap
, 1 < _input.m_numMips
@@ -900,9 +900,9 @@ namespace bgfx
ImageContainer* output = imageAlloc(_allocator
, imageContainer.m_format
, imageContainer.m_width
, imageContainer.m_height
, imageContainer.m_depth
, uint16_t(imageContainer.m_width)
, uint16_t(imageContainer.m_height)
, uint16_t(imageContainer.m_depth)
, imageContainer.m_numLayers
, imageContainer.m_cubeMap
, 1 < imageContainer.m_numMips