Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Evgeniy Boltik <bstsoft@narod.ru>

Browse source 
- Use bitmap's DIB palette, if it exists. Fixes problems described in bug 4147.
See issue #4147 for more details.

svn path=/trunk/; revision=39975
This commit is contained in:
Aleksey Bragin 2009-03-12 10:48:52 +00:00
parent 044b06829d
commit defbc44f67
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -271,8 +271,17 @@ IntSetDIBits(
return 0; return 0;
} }
// Destination palette obtained from the hDC // Use hDIBPalette if it exists
hDCPalette = PALETTE_LockPalette(((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault); if (bitmap->hDIBPalette)
{
DDB_Palette = bitmap->hDIBPalette;
}
else
{
// Destination palette obtained from the hDC
DDB_Palette = ((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault;
}
hDCPalette = PALETTE_LockPalette(DDB_Palette);
if (NULL == hDCPalette) if (NULL == hDCPalette)
{ {
EngUnlockSurface(SourceSurf); EngUnlockSurface(SourceSurf);
@ -282,7 +291,6 @@ IntSetDIBits(
return 0; return 0;
} }
DDB_Palette_Type = hDCPalette->Mode; DDB_Palette_Type = hDCPalette->Mode;
DDB_Palette = ((GDIDEVICE *)DC->pPDev)->DevInfo.hpalDefault;
PALETTE_UnlockPalette(hDCPalette); PALETTE_UnlockPalette(hDCPalette);
// Source palette obtained from the BITMAPINFO // Source palette obtained from the BITMAPINFO