Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-27 13:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

DIB color fix, palette fix

Browse source 
svn path=/trunk/; revision=3626
This commit is contained in:
Jason Filby 2002-10-05 17:13:16 +00:00
parent a686f1e6f4
commit 86d248e99b
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/win32k/eng/palette.c
View file

@ -44,7 +44,6 @@ EngCreatePalette(ULONG Mode,
if(Mode==PAL_INDEXED) if(Mode==PAL_INDEXED)
{ {
PalGDI->NumColors = NumColors; PalGDI->NumColors = NumColors;
PalGDI->IndexedColors = (PULONG)Colors;
} else } else
if(Mode==PAL_BITFIELDS) if(Mode==PAL_BITFIELDS)
{ {

31
reactos/subsys/win32k/objects/dib.c
View file

@ -719,10 +719,26 @@ RGBQUAD *DIB_MapPaletteColors(PDC dc, LPBITMAPINFO lpbmi)
return lpRGB; return lpRGB;
} }
PALETTEENTRY *DIBColorTableToPaletteEntries(PALETTEENTRY *palEntries, const RGBQUAD *DIBColorTable, ULONG ColorCount)
{
ULONG i;
for(i=0; i<ColorCount; i++)
{
palEntries->peRed = DIBColorTable->rgbRed;
palEntries->peGreen = DIBColorTable->rgbGreen;
palEntries->peBlue = DIBColorTable->rgbBlue;
palEntries++;
DIBColorTable++;
}
}
HPALETTE BuildDIBPalette(BITMAPINFO *bmi, PINT paletteType) HPALETTE BuildDIBPalette(BITMAPINFO *bmi, PINT paletteType)
{ {
BYTE bits; BYTE bits;
ULONG ColourCount; ULONG ColorCount;
PALETTEENTRY *palEntries;
HPALETTE hPal;
// Determine Bits Per Pixel // Determine Bits Per Pixel
bits = bmi->bmiHeader.biBitCount; bits = bmi->bmiHeader.biBitCount;
@ -736,18 +752,23 @@ HPALETTE BuildDIBPalette(BITMAPINFO *bmi, PINT paletteType)
{ {
*paletteType = PAL_BITFIELDS; *paletteType = PAL_BITFIELDS;
} else { } else {
*paletteType = PAL_RGB; // FIXME: This could be BGR, must still check *paletteType = PAL_RGB; // Would it be BGR, considering the BGR nature of the DIB color table?
} }
if (bmi->bmiHeader.biClrUsed == 0 && if (bmi->bmiHeader.biClrUsed == 0 &&
bmi->bmiHeader.biBitCount <= 8) bmi->bmiHeader.biBitCount <= 8)
{ {
ColourCount = 1 << bmi->bmiHeader.biBitCount; ColorCount = 1 << bmi->bmiHeader.biBitCount;
} }
else else
{ {
ColourCount = bmi->bmiHeader.biClrUsed; ColorCount = bmi->bmiHeader.biClrUsed;
} }
return EngCreatePalette(*paletteType, ColourCount, bmi->bmiColors, 0, 0, 0); palEntries = ExAllocatePool(NonPagedPool, sizeof(PALETTEENTRY)*ColorCount);
DIBColorTableToPaletteEntries(palEntries, bmi->bmiColors, ColorCount);
hPal = EngCreatePalette(*paletteType, ColorCount, palEntries, 0, 0, 0);
ExFreePool(palEntries);
return hPal;
} }