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

- DIB_1BPP_BitBlt: Increment source coordinates properly, see bug #2372

Browse source 
- Remove old code
- Enable dprint for DIB_1BPP_StretchBlt

svn path=/trunk/; revision=37382
This commit is contained in:
Gregor Schneider 2008-11-15 22:35:44 +00:00
parent e2eef76cbf
commit 7d34208e7f
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsystems/win32/win32k/dib/dib1bpp.c
View file

@ -351,7 +351,6 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo)
BOOLEAN UsesPattern; BOOLEAN UsesPattern;
PULONG DestBits; PULONG DestBits;
ULONG RoundedRight; ULONG RoundedRight;
/* BYTE NoBits;*/
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
@ -417,7 +416,7 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo)
#endif #endif
} }
for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX++) for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX += 32)
{ {
Dest = *DestBits; Dest = *DestBits;
@ -450,10 +449,8 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo)
if (DestX < BltInfo->DestRect.right) if (DestX < BltInfo->DestRect.right)
{ {
// Dest = *DestBits;
for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++) for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++)
{ {
// Dest = *DestBits;
Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
if (UsesSource) if (UsesSource)
@ -467,7 +464,6 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo)
} }
DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
// Dest >>= 1;
} }
} }
@ -627,7 +623,7 @@ BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
break; break;
default: default:
//DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE; return FALSE;
} }