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

commit same strechblt code for 8,16,32, it does not using putpixel anylong for 8 and 32, and small cleanup

Browse source 
this code can be makefaster, how remove getpixel that will doing huge incress in speed, split calc to
simple 1x 2x .. zoom in/out now we are using 1.1x 2.2x Zoom and 1x 2x zoom same code. if we split it we will
see a speed incress. 

svn path=/trunk/; revision=25237
This commit is contained in:
Magnus Olsen 2006-12-29 13:16:53 +00:00
parent 2e502d8d23
commit 32b82baa21
3 changed files with 395 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

62
reactos/subsystems/win32/win32k/dib/dib16bpp.c
View file

@ -741,7 +741,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
LONG sy = 0; LONG sy = 0;
LONG DesX; LONG DesX;
LONG DesY; LONG DesY;
LONG color;
PULONG DestBits; PULONG DestBits;
LONG DifflDelta; LONG DifflDelta;
@ -784,6 +783,10 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
sy_max = DesSizeY; sy_max = DesSizeY;
sy = SourceRect->top; sy = SourceRect->top;
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 1);
switch(SourceSurf->iBitmapFormat) switch(SourceSurf->iBitmapFormat)
{ {
@ -792,10 +795,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 1);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
@ -803,17 +802,11 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) *DestBits = XLATEOBJ_iXlate(ColorTranslation,
{ DIB_1BPP_GetPixel(SourceSurf, sx, sy));
*DestBits = XLATEOBJ_iXlate(ColorTranslation, 0);
DestBits = (PULONG)((ULONG_PTR)DestBits + 2); DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
}
else
{
*DestBits = XLATEOBJ_iXlate(ColorTranslation, 1);
DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
}
sx += SrcZoomXHight; sx += SrcZoomXHight;
sx_dec += SrcZoomXLow; sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max) if (sx_dec >= sx_max)
@ -839,11 +832,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 1);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
@ -851,9 +839,9 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = XLATEOBJ_iXlate(ColorTranslation, color); DIB_4BPP_GetPixel(SourceSurf, sx, sy));
*DestBits = color;
DestBits = (PULONG)((ULONG_PTR)DestBits + 2); DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
sx += SrcZoomXHight; sx += SrcZoomXHight;
@ -881,10 +869,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 1);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
@ -892,9 +876,9 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = XLATEOBJ_iXlate(ColorTranslation, color); DIB_8BPP_GetPixel(SourceSurf, sx, sy));
*DestBits = color;
DestBits = (PULONG)((ULONG_PTR)DestBits + 2); DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
sx += SrcZoomXHight; sx += SrcZoomXHight;
@ -935,9 +919,9 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = XLATEOBJ_iXlate(ColorTranslation, color); DIB_24BPP_GetPixel(SourceSurf, sx, sy));
*DestBits = color;
DestBits = (PULONG)((ULONG_PTR)DestBits + 2); DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
sx += SrcZoomXHight; sx += SrcZoomXHight;
@ -965,10 +949,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 1);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
@ -976,9 +956,9 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = XLATEOBJ_iXlate(ColorTranslation, color); DIB_32BPP_GetPixel(SourceSurf, sx, sy));
*DestBits = color;
DestBits = (PULONG)((ULONG_PTR)DestBits + 2); DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
sx += SrcZoomXHight; sx += SrcZoomXHight;

277
reactos/subsystems/win32/win32k/dib/dib32bpp.c
View file

@ -475,160 +475,243 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
ULONG Mode) ULONG Mode)
{ {
LONG SrcSizeY; LONG SrcSizeY;
LONG SrcSizeX; LONG SrcSizeX;
LONG DesSizeY; LONG DesSizeY;
LONG DesSizeX; LONG DesSizeX;
LONG sx; LONG sx = 0;
LONG sy; LONG sy = 0;
LONG DesX; LONG DesX;
LONG DesY; LONG DesY;
LONG color;
PULONG DestBits; PULONG DestBits;
LONG DifflDelta; LONG DifflDelta;
LONG SrcZoomXHight;
LONG SrcZoomXLow;
LONG SrcZoomYHight;
LONG SrcZoomYLow;
LONG sy_dec = 0;
LONG sy_max;
LONG sx_dec = 0;
LONG sx_max;
DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right,
SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
/* Calc the Zoom height of Source */
SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeY = SourceRect->bottom - SourceRect->top;
/* Calc the Zoom Width of Source */
SrcSizeX = SourceRect->right - SourceRect->left; SrcSizeX = SourceRect->right - SourceRect->left;
/* Calc the Zoom height of Destions */
DesSizeY = DestRect->bottom - DestRect->top; DesSizeY = DestRect->bottom - DestRect->top;
DesSizeX = DestRect->right - DestRect->left;
/* Calc the Zoom width of Destions */
DesSizeX = DestRect->right - DestRect->left;
/* Calc the zoom factor of soruce height */
SrcZoomYHight = SrcSizeY / DesSizeY;
SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY);
/* Calc the zoom factor of soruce width */
SrcZoomXHight = SrcSizeX / DesSizeX;
SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX);
sx_max = DesSizeX;
sy_max = DesSizeY;
sy = SourceRect->top;
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
switch(SourceSurf->iBitmapFormat) switch(SourceSurf->iBitmapFormat)
{ {
case BMF_1BPP: case BMF_1BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; *DestBits = XLATEOBJ_iXlate(ColorTranslation,
DIB_1BPP_GetPixel(SourceSurf, sx, sy));
if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
{ DestBits = (PULONG)((ULONG_PTR)DestBits + 4);
*DestBits = XLATEOBJ_iXlate(ColorTranslation, 0);
} sx += SrcZoomXHight;
else sx_dec += SrcZoomXLow;
{ if (sx_dec >= sx_max)
*DestBits = XLATEOBJ_iXlate(ColorTranslation, 1); {
} sx++;
sx_dec -= sx_max;
}
} }
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
}
break; sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_4BPP: case BMF_4BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); DIB_4BPP_GetPixel(SourceSurf, sx, sy));
color = XLATEOBJ_iXlate(ColorTranslation, color);
*DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 4);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break; break;
case BMF_8BPP: case BMF_8BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); DIB_8BPP_GetPixel(SourceSurf, sx, sy));
color = XLATEOBJ_iXlate(ColorTranslation, color);
*DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 4);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break; break;
case BMF_16BPP: case BMF_16BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); DIB_16BPP_GetPixel(SourceSurf, sx, sy));
color = XLATEOBJ_iXlate(ColorTranslation, color);
*DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 4);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
}
break; sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_24BPP: case BMF_24BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - (DesSizeX << 2);
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=0; DesY<DesSizeY; DesY++)
{ {
sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) for (DesX=0; DesX<DesSizeX; DesX++)
{ {
sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; *DestBits = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); DIB_24BPP_GetPixel(SourceSurf, sx, sy));
color = XLATEOBJ_iXlate(ColorTranslation, color);
*DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 4);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
}
break; sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_32BPP: case BMF_32BPP:
return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin,

273
reactos/subsystems/win32/win32k/dib/dib8bpp.c
View file

@ -463,65 +463,128 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
LONG SrcSizeY; LONG SrcSizeY;
LONG SrcSizeX; LONG SrcSizeX;
LONG DesSizeY; LONG DesSizeY;
LONG DesSizeX; LONG DesSizeX;
LONG sx; LONG sx = 0;
LONG sy; LONG sy = 0;
LONG DesX; LONG DesX;
LONG DesY; LONG DesY;
LONG color; PULONG DestBits;
LONG DifflDelta;
LONG SrcZoomXHight;
LONG SrcZoomXLow;
LONG SrcZoomYHight;
LONG SrcZoomYLow;
LONG sy_dec = 0;
LONG sy_max;
LONG sx_dec = 0;
LONG sx_max;
DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
/* Calc the Zoom height of Source */
SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeY = SourceRect->bottom - SourceRect->top;
/* Calc the Zoom Width of Source */
SrcSizeX = SourceRect->right - SourceRect->left; SrcSizeX = SourceRect->right - SourceRect->left;
/* Calc the Zoom height of Destions */
DesSizeY = DestRect->bottom - DestRect->top; DesSizeY = DestRect->bottom - DestRect->top;
/* Calc the Zoom width of Destions */
DesSizeX = DestRect->right - DestRect->left; DesSizeX = DestRect->right - DestRect->left;
/* Calc the zoom factor of soruce height */
SrcZoomYHight = SrcSizeY / DesSizeY;
SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY);
/* Calc the zoom factor of soruce width */
SrcZoomXHight = SrcSizeX / DesSizeX;
SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX);
sx_max = DesSizeX;
sy_max = DesSizeY;
sy = SourceRect->top;
DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left) +
DestRect->top * DestSurf->lDelta);
DifflDelta = DestSurf->lDelta - DesSizeX ;
switch(SourceSurf->iBitmapFormat) switch(SourceSurf->iBitmapFormat)
{ {
case BMF_1BPP: case BMF_1BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left;
if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
{
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0));
}
else
{
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1));
}
}
}
break;
case BMF_4BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++)
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) {
{ sx = SourceRect->left;
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++)
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) {
{ *DestBits = XLATEOBJ_iXlate(ColorTranslation,
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; DIB_1BPP_GetPixel(SourceSurf, sx, sy));
color = DIB_4BPP_GetPixel(SourceSurf, sx, sy);
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
}
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_4BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++)
{
sx = SourceRect->left;
sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++)
{
*DestBits = XLATEOBJ_iXlate(ColorTranslation,
DIB_4BPP_GetPixel(SourceSurf, sx, sy));
DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break; break;
case BMF_8BPP: case BMF_8BPP:
@ -529,56 +592,108 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
ClipRegion, ColorTranslation, Mode); ClipRegion, ColorTranslation, Mode);
break; break;
case BMF_16BPP: case BMF_16BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++)
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) {
{ sx = SourceRect->left;
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++)
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) {
{ *DestBits = XLATEOBJ_iXlate(ColorTranslation,
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; DIB_16BPP_GetPixel(SourceSurf, sx, sy));
color = DIB_16BPP_GetPixel(SourceSurf, sx, sy);
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
}
break; DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_24BPP: case BMF_24BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ for (DesY=0; DesY<DesSizeY; DesY++)
/* This is a reference implementation, it hasn't been optimized for speed */ {
sx = SourceRect->left;
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) sx_dec = 0;
{ for (DesX=0; DesX<DesSizeX; DesX++)
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; {
*DestBits = XLATEOBJ_iXlate(ColorTranslation,
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) DIB_24BPP_GetPixel(SourceSurf, sx, sy));
{
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
color = DIB_24BPP_GetPixel(SourceSurf, sx, sy);
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
}
break; DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;
case BMF_32BPP: case BMF_32BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++)
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) {
{ sx = SourceRect->left;
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++)
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) {
{ *DestBits = XLATEOBJ_iXlate(ColorTranslation,
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; DIB_1BPP_GetPixel(SourceSurf, sx, sy));
color = DIB_32BPP_GetPixel(SourceSurf, sx, sy);
DIB_8BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
} }
}
break; DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta);
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
}
}
break;