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

* hopefully fixed the weird color inversion of

Browse Source 
colors with full saturation in the part where
  the cursor is transparent
* fixed leakage of cursor data (placed making the
  copy it in the wrong bracket)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16523 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-02-27 11:43:10 +00:00
parent 640b841d5a
commit 9a0c473378
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/servers/app/ServerCursor.cpp
View File

@ -106,14 +106,16 @@ ServerCursor::ServerCursor(const uint8* data)
powval = 1 << (15 - i); powval = 1 << (15 - i);
cursorval = cursorflip & powval; cursorval = cursorflip & powval;
maskval = maskflip & powval; maskval = maskflip & powval;
bmppos[i] = ((cursorval != 0) ? black : white) & bmppos[i] = maskval > 0 ? (cursorval != 0 ? black : white)
((maskval > 0) ? 0xFFFFFFFF : 0x00FFFFFF); : 0x00000000;
}
} }
// remember cursor data for later
fCursorData = new (nothrow) uint8[68]; fCursorData = new (nothrow) uint8[68];
if (fCursorData) if (fCursorData)
memcpy(fCursorData, data, 68); memcpy(fCursorData, data, 68);
}
} else { } else {
fWidth = 0; fWidth = 0;
fHeight = 0; fHeight = 0;
@ -125,7 +127,8 @@ ServerCursor::ServerCursor(const uint8* data)
/*! /*!
\brief Constructor \brief Constructor
\param data Pointer to bitmap data in memory, the padding bytes should be contained when format less than 32 bpp. \param data Pointer to bitmap data in memory,
the padding bytes should be contained when format less than 32 bpp.
*/ */
ServerCursor::ServerCursor(const uint8* alreadyPaddedData, ServerCursor::ServerCursor(const uint8* alreadyPaddedData,
uint32 width, uint32 height, uint32 width, uint32 height,