From ba802c2e4aa35d2589b466bd7e0e5f4a2172ce95 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Thu, 2 Apr 2009 16:34:11 +0000
Subject: [PATCH] - Simplify code. Inspired by Evgeniy Boltik's patch. See
 issue #4326 for more details.

svn path=/trunk/; revision=40329
---
 reactos/subsystems/win32/win32k/dib/dib1bpp.c | 41 +++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/dib/dib1bpp.c b/reactos/subsystems/win32/win32k/dib/dib1bpp.c
index 11316b4d784..86ebf6822fd 100644
--- a/reactos/subsystems/win32/win32k/dib/dib1bpp.c
+++ b/reactos/subsystems/win32/win32k/dib/dib1bpp.c
@@ -233,6 +233,7 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
 BOOLEAN
 DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
+	ULONG Color;
 	LONG i, j, sx, sy = BltInfo->SourcePoint.y;
 
 	switch ( BltInfo->SourceSurface->iBitmapFormat )
@@ -247,12 +248,8 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 			sx = BltInfo->SourcePoint.x;
 			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
-				{
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
-				} else {
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
-				}
+				Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+				DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color);
 				sx++;
 			}
 			sy++;
@@ -265,12 +262,8 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 			sx = BltInfo->SourcePoint.x;
 			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
-				{
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
-				} else {
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
-				}
+				Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+				DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color);
 				sx++;
 			}
 			sy++;
@@ -283,12 +276,8 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 			sx = BltInfo->SourcePoint.x;
 			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
-				{
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
-				} else {
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
-				}
+				Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+				DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color);
 				sx++;
 			}
 			sy++;
@@ -301,12 +290,8 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 			sx = BltInfo->SourcePoint.x;
 			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
-				{
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
-				} else {
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
-				}
+				Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+				DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color);
 				sx++;
 			}
 			sy++;
@@ -319,12 +304,8 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 			sx = BltInfo->SourcePoint.x;
 			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
-				{
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
-				} else {
-					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
-				}
+				Color = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
+				DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, Color);
 				sx++;
 			}
 			sy++;