From 2a6e97186b553cbf8eac168d283da03a7930ee24 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 6 Mar 2006 00:23:16 +0000 Subject: [PATCH] Actually commit the change to ReadBitmap()... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16594 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/drawing/DrawingEngine.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/servers/app/drawing/DrawingEngine.cpp b/src/servers/app/drawing/DrawingEngine.cpp index f20930b087..15d6e800ca 100644 --- a/src/servers/app/drawing/DrawingEngine.cpp +++ b/src/servers/app/drawing/DrawingEngine.cpp @@ -1148,13 +1148,10 @@ DrawingEngine::ReadBitmap(ServerBitmap *bitmap, bool drawCursor, BRect bounds) bounds = bounds & clip; fGraphicsCard->HideSoftwareCursor(bounds); - int32 bytesPerRow = buffer->BytesPerRow(); - int32 bitsLength = bytesPerRow * (bounds.IntegerHeight() + 1); - uint8 *bits = (uint8 *)buffer->Bits(); - bits += (uint32)bounds.top * bytesPerRow + (uint32)bounds.left * 4; - - status_t result = bitmap->ImportBits(bits, bitsLength, bytesPerRow, - buffer->ColorSpace()); + status_t result = bitmap->ImportBits(buffer->Bits(), + buffer->BitsLength(), buffer->BytesPerRow(), buffer->ColorSpace(), + bounds.LeftTop(), BPoint(0, 0), bounds.IntegerWidth(), + bounds.IntegerHeight()); if (drawCursor) { // ToDo: blend the cursor