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

Merge branch 'hotfix-1.7.2' into develop

Browse Source
This commit is contained in:
Jinhao 2019-09-27 08:05:23 +08:00
commit 45ff4634ad
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/paint/graphics.cpp
View File

@ -1473,7 +1473,7 @@ namespace paint
{ {
if (vertical) if (vertical)
{ {
int x1 = good_rct.x, x2 = good_rct.right(); int x1 = good_rct.x, x2 = good_rct.right() - 1;
auto y = good_rct.y; auto y = good_rct.y;
for (; y < endpos; ++y) for (; y < endpos; ++y)
{ {
@ -1489,7 +1489,7 @@ namespace paint
} }
else else
{ {
int y1 = good_rct.y, y2 = good_rct.bottom(); int y1 = good_rct.y, y2 = good_rct.bottom() - 1;
auto x = good_rct.x; auto x = good_rct.x;
for (; x < endpos; ++x) for (; x < endpos; ++x)
{ {

10
source/paint/pixel_buffer.cpp
View File

@ -238,10 +238,18 @@ namespace nana{ namespace paint
auto d = rawptr; auto d = rawptr;
const unsigned char* s; const unsigned char* s;
int src_line_bytes;
if (is_negative) if (is_negative)
{
s = rawbits; s = rawbits;
src_line_bytes = -static_cast<int>(bytes_per_line);
}
else else
{
s = rawbits + bytes_per_line * (height - 1); s = rawbits + bytes_per_line * (height - 1);
src_line_bytes = static_cast<int>(bytes_per_line);
}
for(std::size_t i = 0; i < height; ++i) for(std::size_t i = 0; i < height; ++i)
{ {
@ -256,7 +264,7 @@ namespace nana{ namespace paint
s_p += 3; s_p += 3;
} }
d += pixel_size.width; d += pixel_size.width;
s -= bytes_per_line; s -= src_line_bytes;
} }
} }
else if(16 == bits_per_pixel) else if(16 == bits_per_pixel)