Commit in reactos/subsys/win32k/eng on MAIN
bitblt.c+3-141.52 -> 1.53
fixed brush origin

reactos/subsys/win32k/eng
bitblt.c 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- bitblt.c	25 Apr 2004 11:34:13 -0000	1.52
+++ bitblt.c	30 Apr 2004 14:22:44 -0000	1.53
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitblt.c,v 1.52 2004/04/25 11:34:13 weiden Exp $
+/* $Id: bitblt.c,v 1.53 2004/04/30 14:22:44 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -371,7 +371,6 @@
   OutputRect.top = DestRect->top + Translate.y;
   OutputRect.bottom = DestRect->bottom + Translate.y;
   
-  #if 0
   if(BrushOrigin)
   {
     AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
@@ -379,9 +378,6 @@
   }
   else
     AdjustedBrushOrigin = Translate;
-  #else
-  AdjustedBrushOrigin = (BrushOrigin ? *BrushOrigin : Translate);
-  #endif
 
   if (NULL != OutputObj)
     {
@@ -742,7 +738,7 @@
   OutputRect.right = prclDest->right + Translate.x;
   OutputRect.top = prclDest->top + Translate.y;
   OutputRect.bottom = prclDest->bottom + Translate.y;
-#if 0
+  
   if(BrushOrigin)
   {
     AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
@@ -750,9 +746,6 @@
   }
   else
     AdjustedBrushOrigin = Translate;
-#else
-  AdjustedBrushOrigin = (BrushOrigin ? *BrushOrigin : Translate);
-#endif
 
   if (NULL != OutputObj)
     {
@@ -1140,8 +1133,7 @@
   OutputRect.right = DestRect->right + Translate.x;
   OutputRect.top = DestRect->top + Translate.y;
   OutputRect.bottom = DestRect->bottom + Translate.y;
-
-#if 0
+  
   if(BrushOrigin)
   {
     AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x;
@@ -1149,9 +1141,6 @@
   }
   else
     AdjustedBrushOrigin = Translate;
-#else
-  AdjustedBrushOrigin = (BrushOrigin ? *BrushOrigin : Translate);
-#endif
 
   if (NULL != OutputObj)
     {
CVSspam 0.2.8