merge beru's changes

2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions
--- a/source/paint/detail/image_bmp.hpp
+++ b/source/paint/detail/image_bmp.hpp
@@ -75,7 +75,7 @@ namespace nana{	namespace paint
 				this->close();
 			}

-			bool open(const void* data, std::size_t bytes)
+			bool open(const void* data, std::size_t bytes) override
 			{
 				// TODO: read a BMP file from memory
 				return false;