mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 06:43:01 +00:00
[FORMATTING]
Fix indentation, no code change svn path=/trunk/; revision=40465
This commit is contained in:
parent
b917e4e926
commit
41c31152db
1 changed files with 319 additions and 303 deletions
|
@ -52,7 +52,7 @@ DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
|
||||||
LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD)
|
LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD)
|
||||||
|
|
||||||
byteaddr = (PBYTE)addr;
|
byteaddr = (PBYTE)addr;
|
||||||
while(y1++ < y2)
|
while (y1++ < y2)
|
||||||
{
|
{
|
||||||
*addr = (DWORD)c;
|
*addr = (DWORD)c;
|
||||||
addr += lDelta;
|
addr += lDelta;
|
||||||
|
@ -68,9 +68,11 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
PBYTE SourceBits_4BPP, SourceLine_4BPP;
|
PBYTE SourceBits_4BPP, SourceLine_4BPP;
|
||||||
PDWORD Source32, Dest32;
|
PDWORD Source32, Dest32;
|
||||||
|
|
||||||
DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
|
DestBits = (PBYTE)BltInfo->DestSurface->pvScan0
|
||||||
|
+ (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta)
|
||||||
|
+ 4 * BltInfo->DestRect.left;
|
||||||
|
|
||||||
switch(BltInfo->SourceSurface->iBitmapFormat)
|
switch (BltInfo->SourceSurface->iBitmapFormat)
|
||||||
{
|
{
|
||||||
case BMF_1BPP:
|
case BMF_1BPP:
|
||||||
|
|
||||||
|
@ -82,7 +84,7 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
sx = BltInfo->SourcePoint.x;
|
sx = BltInfo->SourcePoint.x;
|
||||||
for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
|
for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
|
||||||
{
|
{
|
||||||
if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
|
if (DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
|
||||||
{
|
{
|
||||||
DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
|
DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
|
||||||
} else {
|
} else {
|
||||||
|
@ -95,7 +97,9 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BMF_4BPP:
|
case BMF_4BPP:
|
||||||
SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1);
|
SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0
|
||||||
|
+ (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta)
|
||||||
|
+ (BltInfo->SourcePoint.x >> 1);
|
||||||
|
|
||||||
for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
|
for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
|
||||||
{
|
{
|
||||||
|
@ -108,7 +112,12 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
|
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
|
||||||
(*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
|
(*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
|
||||||
DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor);
|
DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor);
|
||||||
if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
|
if (f1 == 1) {
|
||||||
|
SourceLine_4BPP++;
|
||||||
|
f1 = 0;
|
||||||
|
} else {
|
||||||
|
f1 = 1;
|
||||||
|
}
|
||||||
sx++;
|
sx++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,7 +170,9 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BMF_24BPP:
|
case BMF_24BPP:
|
||||||
SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
|
SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0
|
||||||
|
+ (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta)
|
||||||
|
+ 3 * BltInfo->SourcePoint.x;
|
||||||
DestLine = DestBits;
|
DestLine = DestBits;
|
||||||
|
|
||||||
for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
|
for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
|
||||||
|
@ -185,7 +196,8 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BMF_32BPP:
|
case BMF_32BPP:
|
||||||
if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
|
if (NULL == BltInfo->XlateSourceToDest ||
|
||||||
|
0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
|
||||||
{
|
{
|
||||||
if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
|
if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
|
||||||
{
|
{
|
||||||
|
@ -199,7 +211,11 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
|
SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0
|
||||||
|
+ ((BltInfo->SourcePoint.y
|
||||||
|
+ BltInfo->DestRect.bottom
|
||||||
|
- BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta)
|
||||||
|
+ 4 * BltInfo->SourcePoint.x;
|
||||||
DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
|
DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
|
||||||
for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
|
for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
|
||||||
{
|
{
|
||||||
|
@ -300,17 +316,17 @@ DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
|
||||||
DestRect->top * DestSurf->lDelta);
|
DestRect->top * DestSurf->lDelta);
|
||||||
wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2);
|
wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2);
|
||||||
|
|
||||||
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
|
for (Y = DestRect->top; Y < DestRect->bottom; Y++)
|
||||||
{
|
{
|
||||||
SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight;
|
SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight;
|
||||||
for(X = DestRect->left; X < DestRect->right; X++, DestBits++)
|
for (X = DestRect->left; X < DestRect->right; X++, DestBits++)
|
||||||
{
|
{
|
||||||
SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth;
|
SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth;
|
||||||
if (SourceX >= 0 && SourceY >= 0 &&
|
if (SourceX >= 0 && SourceY >= 0 &&
|
||||||
SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY)
|
SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY)
|
||||||
{
|
{
|
||||||
Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
|
Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
|
||||||
if(Source != iTransColor)
|
if (Source != iTransColor)
|
||||||
{
|
{
|
||||||
*DestBits = XLATEOBJ_iXlate(ColorTranslation, Source);
|
*DestBits = XLATEOBJ_iXlate(ColorTranslation, Source);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue