Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 08:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conversion between bitfield and indexed no longer hardcoded

Browse source 
svn path=/trunk/; revision=4244
This commit is contained in:
Gé van Geldorp 2003-03-06 00:56:40 +00:00
parent cb8b8e6c15
commit 85f75f7691
1 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
reactos/subsys/win32k/eng/xlate.c
View file

@ -32,17 +32,42 @@ ULONG BGRtoULONG(BYTE Blue, BYTE Green, BYTE Red)
return ((Blue & 0xff) << 16) | ((Green & 0xff) << 8) | (Red & 0xff); return ((Blue & 0xff) << 16) | ((Green & 0xff) << 8) | (Red & 0xff);
} }
static ULONG ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
{
ULONG TranslatedColor;
TranslatedColor = 0;
if (XlateGDI->RedShift < 0)
{
TranslatedColor = (Color >> -(XlateGDI->RedShift)) & XlateGDI->RedMask;
} else
TranslatedColor = (Color << XlateGDI->RedShift) & XlateGDI->RedMask;
if (XlateGDI->GreenShift < 0)
{
TranslatedColor |= (Color >> -(XlateGDI->GreenShift)) & XlateGDI->GreenMask;
} else
TranslatedColor |= (Color << XlateGDI->GreenShift) & XlateGDI->GreenMask;
if (XlateGDI->BlueShift < 0)
{
TranslatedColor |= (Color >> -(XlateGDI->BlueShift)) & XlateGDI->BlueMask;
} else
TranslatedColor |= (Color << XlateGDI->BlueShift) & XlateGDI->BlueMask;
return TranslatedColor;
}
// FIXME: If the caller knows that the destinations are indexed and not RGB // FIXME: If the caller knows that the destinations are indexed and not RGB
// then we should cache more than one value. Same with the source. // then we should cache more than one value. Same with the source.
// Takes indexed palette and a // Takes indexed palette and a
ULONG ClosestColorMatch(XLATEOBJ *XlateObj, ULONG SourceColor, ULONG *DestColors, ULONG ClosestColorMatch(XLATEGDI *XlateGDI, ULONG SourceColor, ULONG *DestColors,
ULONG NumColors) ULONG NumColors)
{ {
PVIDEO_CLUTDATA cSourceColor; PVIDEO_CLUTDATA cSourceColor;
PVIDEO_CLUTDATA cDestColors; PVIDEO_CLUTDATA cDestColors;
LONG idx = 0, i, rt; LONG idx = 0, i, rt;
ULONG SourceRGB;
ULONG SourceRed, SourceGreen, SourceBlue; ULONG SourceRed, SourceGreen, SourceBlue;
ULONG cxRed, cxGreen, cxBlue, BestMatch = 16777215; ULONG cxRed, cxGreen, cxBlue, BestMatch = 16777215;
@ -54,20 +79,24 @@ ULONG ClosestColorMatch(XLATEOBJ *XlateObj, ULONG SourceColor, ULONG *DestColors
return CCMLastColorMatch; return CCMLastColorMatch;
} }
if (PAL_BITFIELDS == XlateObj->iSrcType) if (PAL_BITFIELDS == XlateGDI->XlateObj.iSrcType)
{ {
/* FIXME: must use bitfields */ /* FIXME: must use bitfields */
SourceRGB = ShiftAndMask(XlateGDI, SourceColor);
cSourceColor = (PVIDEO_CLUTDATA) &SourceRGB;
/*
SourceRed = (SourceColor >> 7) & 0xff; SourceRed = (SourceColor >> 7) & 0xff;
SourceGreen = (SourceColor >> 2) & 0xff; SourceGreen = (SourceColor >> 2) & 0xff;
SourceBlue = (SourceColor << 3) & 0xff; SourceBlue = (SourceColor << 3) & 0xff;
*/
} }
else else
{ {
cSourceColor = (PVIDEO_CLUTDATA)&SourceColor; cSourceColor = (PVIDEO_CLUTDATA)&SourceColor;
SourceRed = cSourceColor->Red;
SourceGreen = cSourceColor->Green;
SourceBlue = cSourceColor->Blue;
} }
SourceRed = cSourceColor->Red;
SourceGreen = cSourceColor->Green;
SourceBlue = cSourceColor->Blue;
for (i=0; i<NumColors; i++) for (i=0; i<NumColors; i++)
{ {
cDestColors = (PVIDEO_CLUTDATA)&DestColors[i]; cDestColors = (PVIDEO_CLUTDATA)&DestColors[i];
@ -94,14 +123,14 @@ ULONG ClosestColorMatch(XLATEOBJ *XlateObj, ULONG SourceColor, ULONG *DestColors
return idx; return idx;
} }
VOID IndexedToIndexedTranslationTable(XLATEOBJ *XlateObj, ULONG *TranslationTable, VOID IndexedToIndexedTranslationTable(XLATEGDI *XlateGDI, ULONG *TranslationTable,
PALGDI *PalDest, PALGDI *PalSource) PALGDI *PalDest, PALGDI *PalSource)
{ {
ULONG i; ULONG i;
for(i=0; i<PalSource->NumColors; i++) for(i=0; i<PalSource->NumColors; i++)
{ {
TranslationTable[i] = ClosestColorMatch(XlateObj, PalSource->IndexedColors[i], PalDest->IndexedColors, PalDest->NumColors); TranslationTable[i] = ClosestColorMatch(XlateGDI, PalSource->IndexedColors[i], PalDest->IndexedColors, PalDest->NumColors);
} }
} }
@ -146,30 +175,6 @@ static INT CalculateShift(ULONG Mask)
return Shift; return Shift;
} }
static ULONG ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
{
ULONG TranslatedColor;
TranslatedColor = 0;
if (XlateGDI->RedShift < 0)
{
TranslatedColor = (Color >> -(XlateGDI->RedShift)) & XlateGDI->RedMask;
} else
TranslatedColor = (Color << XlateGDI->RedShift) & XlateGDI->RedMask;
if (XlateGDI->GreenShift < 0)
{
TranslatedColor |= (Color >> -(XlateGDI->GreenShift)) & XlateGDI->GreenMask;
} else
TranslatedColor |= (Color << XlateGDI->GreenShift) & XlateGDI->GreenMask;
if (XlateGDI->BlueShift < 0)
{
TranslatedColor |= (Color >> -(XlateGDI->BlueShift)) & XlateGDI->BlueMask;
} else
TranslatedColor |= (Color << XlateGDI->BlueShift) & XlateGDI->BlueMask;
return TranslatedColor;
}
XLATEOBJ *EngCreateXlate(USHORT DestPalType, USHORT SourcePalType, XLATEOBJ *EngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
HPALETTE PaletteDest, HPALETTE PaletteSource) HPALETTE PaletteDest, HPALETTE PaletteSource)
{ {
@ -269,7 +274,7 @@ XLATEOBJ *EngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
if(XlateObj->iDstType == PAL_INDEXED) if(XlateObj->iDstType == PAL_INDEXED)
{ {
// Converting from indexed to indexed // Converting from indexed to indexed
IndexedToIndexedTranslationTable(XlateObj, XlateGDI->translationTable, DestPalGDI, SourcePalGDI); IndexedToIndexedTranslationTable(XlateGDI, XlateGDI->translationTable, DestPalGDI, SourcePalGDI);
} else } else
if (PAL_RGB == XlateObj->iDstType || PAL_BITFIELDS == XlateObj->iDstType ) if (PAL_RGB == XlateObj->iDstType || PAL_BITFIELDS == XlateObj->iDstType )
{ {
@ -363,7 +368,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj,
PalGDI = (PALGDI*)AccessInternalObject((ULONG)XlateGDI->DestPal); PalGDI = (PALGDI*)AccessInternalObject((ULONG)XlateGDI->DestPal);
// Return closest match for the given color // Return closest match for the given color
return ClosestColorMatch(XlateObj, Color, PalGDI->IndexedColors, PalGDI->NumColors); return ClosestColorMatch(XlateGDI, Color, PalGDI->IndexedColors, PalGDI->NumColors);
} else } else
if(XlateObj->iSrcType == PAL_INDEXED) if(XlateObj->iSrcType == PAL_INDEXED)
{ {