From e2363f2b387c93e4691c3da945258448ef8d9a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Thu, 9 Mar 2017 21:35:41 -0800
Subject: [PATCH] Cleanup.

---
 examples/common/font/font_manager.cpp |  1 +
 src/image.cpp                         | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp
index 3aaf8483a..fb44cad75 100644
--- a/examples/common/font/font_manager.cpp
+++ b/examples/common/font/font_manager.cpp
@@ -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
diff --git a/src/image.cpp b/src/image.cpp
index ddf43faf8..0f72c37ca 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -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