Merge branch 'hotfix-1.5.6' into feature-listbox

2018-01-29 17:20:55 +08:00
parent 196d0bf351 9bd3dc7e58
commit 49437053b6
9 changed files with 71 additions and 40 deletions
--- a/source/paint/detail/image_jpeg.hpp
+++ b/source/paint/detail/image_jpeg.hpp
@@ -91,7 +91,7 @@ namespace nana
 				{
 					::jpeg_create_decompress(&jdstru);

-					::jpeg_mem_src(&jdstru, const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(data)), bytes);
+					::jpeg_mem_src(&jdstru, const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(data)), static_cast<unsigned long>(bytes));
 					_m_read_jpg(jdstru);

 					jpeg_finish_decompress(&jdstru);