Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a 64-bit calculation error.

Browse Source
This commit is contained in:
Alex Smith 2012-08-05 12:59:46 +01:00
parent 284d75bd6a
commit e1be7d07d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/servers/app/drawing/DrawingEngine.cpp
View File

@ -1513,7 +1513,7 @@ DrawingEngine::CopyRect(BRect src, int32 xOffset, int32 yOffset) const
src = src & dst; src = src & dst;
// calc offset in buffer // calc offset in buffer
bits += (int32)src.left * 4 + (int32)src.top * bytesPerRow; bits += (ssize_t)src.left * 4 + (ssize_t)src.top * bytesPerRow;
uint32 width = src.IntegerWidth() + 1; uint32 width = src.IntegerWidth() + 1;
uint32 height = src.IntegerHeight() + 1; uint32 height = src.IntegerHeight() + 1;
@ -1554,7 +1554,7 @@ DrawingEngine::_CopyRect(uint8* src, uint32 width, uint32 height,
yIncrement = bytesPerRow; yIncrement = bytesPerRow;
} }
uint8* dst = src + yOffset * bytesPerRow + xOffset * 4; uint8* dst = src + (ssize_t)yOffset * bytesPerRow + (ssize_t)xOffset * 4;
if (xIncrement == 1) { if (xIncrement == 1) {
uint8 tmpBuffer[width * 4]; uint8 tmpBuffer[width * 4];