Author: gschneider Date: Sat Nov 15 16:35:44 2008 New Revision: 37382
URL: http://svn.reactos.org/svn/reactos?rev=37382&view=rev Log: - DIB_1BPP_BitBlt: Increment source coordinates properly, see bug #2372 - Remove old code - Enable dprint for DIB_1BPP_StretchBlt
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sat Nov 15 16:35:44 2008 @@ -351,7 +351,6 @@ BOOLEAN UsesPattern; PULONG DestBits; ULONG RoundedRight; -/* BYTE NoBits;*/
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); @@ -417,7 +416,7 @@ #endif }
- for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX++) + for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX += 32) { Dest = *DestBits;
@@ -450,10 +449,8 @@
if (DestX < BltInfo->DestRect.right) { -// Dest = *DestBits; for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++) { -// Dest = *DestBits; Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
if (UsesSource) @@ -467,7 +464,6 @@ }
DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); -// Dest >>= 1; } }
@@ -627,7 +623,7 @@ break;
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; }