Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 06:16:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed DIB_BltToVGA and other functions calling it to handle situation where SourcePoint->x % 2 != 0.

Browse source 
svn path=/trunk/; revision=6147
This commit is contained in:
Filip Navara 2003-09-26 18:38:47 +00:00
parent 95d5d55bff
commit afd54f8f9c
3 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/dd/vga/display/objects/bitblt.c
View file

@ -38,6 +38,8 @@ static BOOL FASTCALL VGADDI_IntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL
return(FALSE); return(FALSE);
} }
void DIB_BltToVGA_Fixed(int x, int y, int w, int h, void *b, int Source_lDelta, int mod);
BOOL BOOL
DIBtoVGA(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation, DIBtoVGA(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation,
RECTL *DestRect, POINTL *SourcePoint) RECTL *DestRect, POINTL *SourcePoint)
@ -51,7 +53,7 @@ DIBtoVGA(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation,
{ {
DIB_BltToVGA(DestRect->left, DestRect->top, dx, dy, DIB_BltToVGA(DestRect->left, DestRect->top, dx, dy,
Source->pvScan0 + SourcePoint->y * Source->lDelta + (SourcePoint->x >> 1), Source->pvScan0 + SourcePoint->y * Source->lDelta + (SourcePoint->x >> 1),
Source->lDelta); Source->lDelta, SourcePoint->x % 2);
} }
else else
{ {

3
reactos/drivers/dd/vga/display/objects/copybits.c
View file

@ -31,7 +31,8 @@ DrvCopyBits(OUT PSURFOBJ DestObj,
DIB_BltToVGA(DestRectL->left, DestRectL->top, DIB_BltToVGA(DestRectL->left, DestRectL->top,
DestRectL->right - DestRectL->left, DestRectL->right - DestRectL->left,
DestRectL->bottom - DestRectL->top, DestRectL->bottom - DestRectL->top,
SourceObj->pvScan0, SourceObj->lDelta); SourceObj->pvScan0, SourceObj->lDelta,
0);
Done = TRUE; Done = TRUE;
} }

7
reactos/drivers/dd/vga/display/vgavideo/vgavideo.c
View file

@ -528,7 +528,7 @@ void DIB_BltFromVGA(int x, int y, int w, int h, void *b, int Dest_lDelta)
#endif #endif
/* DIB blt to the VGA. */ /* DIB blt to the VGA. */
void DIB_BltToVGA(int x, int y, int w, int h, void *b, int Source_lDelta) void DIB_BltToVGA(int x, int y, int w, int h, void *b, int Source_lDelta, int StartMod)
{ {
PBYTE pb, opb = b; PBYTE pb, opb = b;
ULONG i, j; ULONG i, j;
@ -545,7 +545,7 @@ void DIB_BltToVGA(int x, int y, int w, int h, void *b, int Source_lDelta)
WRITE_PORT_UCHAR((PUCHAR)GRA_I, 0x08); // set the mask WRITE_PORT_UCHAR((PUCHAR)GRA_I, 0x08); // set the mask
WRITE_PORT_UCHAR((PUCHAR)GRA_D, maskbit[i]); WRITE_PORT_UCHAR((PUCHAR)GRA_D, maskbit[i]);
if (0 == ((i - x) % 2)) if (StartMod == ((i - x) % 2))
{ {
for (j = y; j < y2; j++) for (j = y; j < y2; j++)
{ {
@ -566,13 +566,14 @@ void DIB_BltToVGA(int x, int y, int w, int h, void *b, int Source_lDelta)
} }
} }
if (0 != ((i - x) % 2)) if (StartMod != ((i - x) % 2))
{ {
opb++; opb++;
} }
} }
} }
/* DIB blt to the VGA. */ /* DIB blt to the VGA. */
void DIB_BltToVGAWithXlate(int x, int y, int w, int h, void *b, int Source_lDelta, PXLATEOBJ Xlate) void DIB_BltToVGAWithXlate(int x, int y, int w, int h, void *b, int Source_lDelta, PXLATEOBJ Xlate)
{ {