i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the overlay I accidently broke with the last commit - sometimes, but only

Browse Source 
sometimes, testing seems like a good idea 8-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21521 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-06-28 20:05:39 +00:00
parent 645b01f225
commit ef636873ad
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/BitmapManager.cpp
+1 -2
View File
@@ -127,7 +127,6 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator,
Overlay* overlay = new (std::nothrow) Overlay(hwInterface, bitmap, Overlay* overlay = new (std::nothrow) Overlay(hwInterface, bitmap,
overlayToken); overlayToken);
const overlay_buffer* overlayBuffer = NULL;
overlay_client_data* clientData = NULL; overlay_client_data* clientData = NULL;
bool newArea = false; bool newArea = false;
@@ -144,7 +143,7 @@ BitmapManager::CreateBitmap(ClientMemoryAllocator* allocator,
bitmap->fAllocator = allocator; bitmap->fAllocator = allocator;
bitmap->fAllocationCookie = cookie; bitmap->fAllocationCookie = cookie;
bitmap->SetOverlay(overlay); bitmap->SetOverlay(overlay);
bitmap->fBytesPerRow = overlayBuffer->bytes_per_row; bitmap->fBytesPerRow = overlay->OverlayBuffer()->bytes_per_row;
buffer = (uint8*)overlay->OverlayBuffer()->buffer; buffer = (uint8*)overlay->OverlayBuffer()->buffer;
if (_allocationFlags) if (_allocationFlags)
src/servers/app/drawing/Overlay.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ Overlay::Overlay(HWInterface& interface, ServerBitmap* bitmap,
fHWInterface(interface), fHWInterface(interface),
fOverlayBuffer(NULL), fOverlayBuffer(NULL),
fClientData(NULL), fClientData(NULL),
fOverlayToken(NULL) fOverlayToken(token)
{ {
fSemaphore = create_sem(1, "overlay lock"); fSemaphore = create_sem(1, "overlay lock");
fColor.SetColor(21, 16, 21, 16); fColor.SetColor(21, 16, 21, 16);