Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed few obvious bugs.

Browse source 
svn path=/trunk/; revision=7228
This commit is contained in:
Filip Navara 2003-12-25 10:21:02 +00:00
parent 643255deed
commit 9621b3a131
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/subsys/win32k/eng/bitblt.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: bitblt.c,v 1.33 2003/12/25 00:28:09 weiden Exp $ /* $Id: bitblt.c,v 1.34 2003/12/25 10:21:02 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -816,8 +816,8 @@ AlphaBltMask(SURFOBJ* Dest,
POINTL* BrushPoint) POINTL* BrushPoint)
{ {
LONG i, j, dx, dy; LONG i, j, dx, dy;
int r[2], g[2], b[2]; int r, g, b;
ULONG Background, BrushColor; ULONG Background, BrushColor, NewColor;
BYTE *tMask, *lMask; BYTE *tMask, *lMask;
dx = DestRect->right - DestRect->left; dx = DestRect->right - DestRect->left;
@ -826,11 +826,11 @@ AlphaBltMask(SURFOBJ* Dest,
if (Mask != NULL) if (Mask != NULL)
{ {
BrushColor = XLATEOBJ_iXlate(ColorTranslation, Brush->iSolidColor); BrushColor = XLATEOBJ_iXlate(ColorTranslation, Brush->iSolidColor);
r[0] = (int)GetRValue(BrushColor); r = (int)GetRValue(BrushColor);
g[0] = (int)GetGValue(BrushColor); g = (int)GetGValue(BrushColor);
b[0] = (int)GetBValue(BrushColor); b = (int)GetBValue(BrushColor);
tMask = Mask->pvBits + SourcePoint->y * Mask->lDelta; tMask = Mask->pvBits + MaskPoint->y * Mask->lDelta + MaskPoint->x;
for (j = 0; j < dy; j++) for (j = 0; j < dy; j++)
{ {
lMask = tMask; lMask = tMask;
@ -845,12 +845,13 @@ AlphaBltMask(SURFOBJ* Dest,
else else
{ {
Background = DIB_GetSource(Dest, DestGDI, DestRect->left + i, DestRect->top + j, SrcColorTranslation); Background = DIB_GetSource(Dest, DestGDI, DestRect->left + i, DestRect->top + j, SrcColorTranslation);
NewColor =
RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background),
(*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background),
(*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background));
r[1] = (((int)GetRValue(Background) - r[0]) * (255 - (int)*lMask)) /255 + r[0]; Background = XLATEOBJ_iXlate(ColorTranslation, NewColor);
g[1] = (((int)GetGValue(Background) - g[0]) * (255 - (int)*lMask)) /255 + g[0];
b[1] = (((int)GetBValue(Background) - b[0]) * (255 - (int)*lMask)) /255 + b[0];
Background = XLATEOBJ_iXlate(ColorTranslation, RGB((UCHAR)r[1], (UCHAR)g[1], (UCHAR)b[1]));
DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j, Background); DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j, Background);
} }
} }