Commit in reactos/subsys/win32k/dib on MAIN
dib4bpp.c+2-71.27 -> 1.28
remove obsolete code

reactos/subsys/win32k/dib
dib4bpp.c 1.27 -> 1.28
diff -u -r1.27 -r1.28
--- dib4bpp.c	7 Apr 2004 10:20:23 -0000	1.27
+++ dib4bpp.c	7 Apr 2004 14:43:08 -0000	1.28
@@ -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: dib4bpp.c,v 1.27 2004/04/07 10:20:23 weiden Exp $ */
+/* $Id: dib4bpp.c,v 1.28 2004/04/07 14:43:08 weiden Exp $ */
 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdlib.h>
@@ -311,7 +311,7 @@
       else
       {
          CalcPattern = FALSE;
-         Pattern = Brush->iSolidColor & 0xF;
+         Pattern = ExpandSolidColor[Brush->iSolidColor & 0xF];
       }
    }
    
@@ -376,11 +376,6 @@
                Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + 6) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 24;
                Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + 7) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 28;
             }
-            else
-            {
-               *DestBits = DIB_DoRop(Rop4, Dest, Source, ExpandSolidColor[Brush->iSolidColor & 0xF]);
-               continue;
-            }
          }
          *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);	    
       }
CVSspam 0.2.8