Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 17:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[win32k]

Browse source 
- IntGetDIBColorTable: return the number of actually copied color table entries
- DIB_CreateDIBSection: simplify calculation of palette entry count
- IntHandleSpecialColorType: remove leftover debug print

svn path=/trunk/; revision=44761
This commit is contained in:
Gregor Schneider 2009-12-25 17:54:41 +00:00
parent 185c716bb3
commit ade1987d18
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -682,10 +682,6 @@ VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color)
{
*Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue);
}
else
{
DPRINT1("no wai!\n");
}
DC_UnlockDc(pdc);
break;
case 0x01: /* PALETTEINDEX */

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

@ -149,7 +149,7 @@ IntGetDIBColorTable(
PDC dc;
PSURFACE psurf;
PPALETTE PalGDI;
UINT Index;
UINT Index, Count = 0;
ULONG biBitCount;
if (!(dc = DC_LockDc(hDC))) return 0;
@ -197,15 +197,14 @@ IntGetDIBColorTable(
Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen;
Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue;
Colors[Index - StartIndex].rgbReserved = 0;
Count++;
}
PALETTE_UnlockPalette(PalGDI);
}
else
Entries = 0;
DC_UnlockDc(dc);
return Entries;
return Count;
}
// Converts a DIB to a device-dependent bitmap
@ -1509,17 +1508,14 @@ DIB_CreateDIBSection(
table between the DIB and the X physical device. Obviously,
this is left out of the ReactOS implementation. Instead,
we call NtGdiSetDIBColorTable. */
bi->biClrUsed = 0;
/* set number of entries in bmi.bmiColors table */
if (bi->biBitCount == 1) {
bi->biClrUsed = 2;
} else
if (bi->biBitCount == 4) {
bi->biClrUsed = 16;
} else
if (bi->biBitCount == 8) {
bi->biClrUsed = 256;
}
if (bi->biBitCount <= 8)
{
bi->biClrUsed = 1 << bi->biBitCount;
}
else
{
bi->biClrUsed = 0;
}
bmp->hDIBSection = section;
bmp->hSecure = hSecure;