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

Merge branch 'kirbyfan64-develop' into develop

Browse Source
This commit is contained in:
Jinhao 2015-02-28 00:40:28 +08:00
commit 22a75669c3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/paint/detail/image_bmp.hpp
View File

@ -94,7 +94,7 @@ namespace nana{ namespace paint
//Bitmap file is 4byte-aligned for each line. //Bitmap file is 4byte-aligned for each line.
std::size_t bytes_per_line; std::size_t bytes_per_line;
const std::size_t height_pixels = abs(info->bmiHeader.biHeight); const std::size_t height_pixels = std::abs(info->bmiHeader.biHeight);
if(0 == info->bmiHeader.biSizeImage) if(0 == info->bmiHeader.biSizeImage)
bytes_per_line = (((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) & ~31) >> 3); bytes_per_line = (((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) & ~31) >> 3);
else else

8
source/gui/layout_utility.cpp
View File

@ -18,11 +18,11 @@ namespace nana
//overlap test if overlaped between r1 and r2 //overlap test if overlaped between r1 and r2
bool overlap(const rectangle& r1, const rectangle& r2) bool overlap(const rectangle& r1, const rectangle& r2)
{ {
if (r1.y + long long(r1.height) <= r2.y) return false; if (r1.y + (long long)(r1.height) <= r2.y) return false;
if(r1.y >= r2.y + long long(r2.height)) return false; if(r1.y >= r2.y + (long long)(r2.height)) return false;
if(r1.x + long long(r1.width) <= r2.x) return false; if(r1.x + (long long)(r1.width) <= r2.x) return false;
if(r1.x >= r2.x + long long(r2.width)) return false; if(r1.x >= r2.x + (long long)(r2.width)) return false;
return true; return true;
} }