mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-1.4.1' into feature-listbox

Browse Source
This commit is contained in:
Jinhao
2016-12-13 08:58:31 +08:00
parent 8b68633ee0 78c404bf9b
commit 7535db186c
18 changed files with 1688 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/paint/pixel_buffer.cpp
View File

@@ -457,7 +457,8 @@ namespace nana{ namespace paint
HDC context = drawable->context;
HBITMAP pixmap = drawable->pixmap;
HBITMAP orig_bmp = pixmap;
HBITMAP orig_bmp = nullptr;
if(need_dup)
{
context = ::CreateCompatibleDC(drawable->context);
@@ -795,7 +796,8 @@ namespace nana{ namespace paint
std::unique_ptr<unsigned char[]> autoptr;
auto rgb_color = clr.px_color().value;
nana::pixel_color_t rgb_imd = { 0 };
nana::pixel_color_t rgb_imd = {};
if(fade)
{
autoptr = detail::alloc_fade_table(1 - fade_rate);