From ca0e5ffb08fa7c729b6387087e209aebba195ab8 Mon Sep 17 00:00:00 2001
From: Branimir Karadzic <branimirkaradzic@gmail.com>
Date: Mon, 1 Dec 2014 08:20:38 -0800
Subject: [PATCH] Fixed issue#197.

---
 examples/common/imgui/imgui.cpp |  1 -
 src/bgfx.cpp                    | 17 +++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
index fb144a89..b675b3f5 100644
--- a/examples/common/imgui/imgui.cpp
+++ b/examples/common/imgui/imgui.cpp
@@ -58,7 +58,6 @@ static const int32_t DEFAULT_SPACING = 4;
 static const int32_t TEXT_HEIGHT = 8;
 static const int32_t SCROLL_AREA_PADDING = 6;
 static const int32_t AREA_HEADER = 20;
-static const int32_t COLOR_WHEEL_PADDING = 60;
 static const float s_tabStops[4] = {150, 210, 270, 330};
 
 static void* imguiMalloc(size_t size, void* /*_userptr*/)
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index fdd725f4..7af271bd 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -507,7 +507,7 @@ namespace bgfx
 				.end();
 
 			ShaderHandle vsh = BGFX_INVALID_HANDLE;
-			
+
 			struct Mem
 			{
 				Mem(const void* _data, size_t _size)
@@ -2245,6 +2245,7 @@ again:
 		_width   = bx::uint32_max(1, _width);
 		_height  = bx::uint32_max(1, _height);
 		_depth   = bx::uint32_max(1, _depth);
+		_numMips = bx::uint32_max(1, _numMips);
 
 		uint32_t width  = _width;
 		uint32_t height = _height;
@@ -2261,17 +2262,17 @@ again:
 
 			size += width*height*depth*bpp/8;
 
-			width >>= 1;
+			width  >>= 1;
 			height >>= 1;
-			depth >>= 1;
+			depth  >>= 1;
 		}
 
-		_info.format = _format;
-		_info.storageSize = size;
-		_info.width = _width;
-		_info.height = _height;
-		_info.depth = _depth;
+		_info.format  = _format;
+		_info.width   = _width;
+		_info.height  = _height;
+		_info.depth   = _depth;
 		_info.numMips = _numMips;
+		_info.storageSize  = size;
 		_info.bitsPerPixel = bpp;
 	}