a little more merge

2 files changed, 28 insertions, 20 deletions

diff --git a/xc/programs/Xserver/fb/fbcompose.c b/xc/programs/Xserver/fb/fbcompose.c
index e267ee8fb..b7733dbb5 100644
--- a/xc/programs/Xserver/fb/fbcompose.c
+++ b/xc/programs/Xserver/fb/fbcompose.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.15 2002/09/26 02:56:48 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.16 2002/11/06 22:45:35 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -2730,7 +2730,7 @@ fbBuildCompositeOperand (PicturePtr	    pPict,
 	op->over = fbStepOver_transform;
 	op->down = fbStepDown_transform;
 	op->set = fbSet_transform;
-        op->indexed = (miIndexedPtr) pPict->pFormat->indexed;
+        op->indexed = (miIndexedPtr) pPict->pFormat->index.devPrivate;
 	op->clip = op[1].clip;
 	
 	return TRUE;
@@ -2754,7 +2754,7 @@ fbBuildCompositeOperand (PicturePtr	    pPict,
 	op->over = fbStepOver_external;
 	op->down = fbStepDown_external;
 	op->set = fbSet_external;
-        op->indexed = (miIndexedPtr) pPict->pFormat->indexed;
+        op->indexed = (miIndexedPtr) pPict->pFormat->index.devPrivate;
 	/* XXX doesn't handle external alpha clips yet */
 	op->clip = op[1].clip;
 	
@@ -2779,7 +2779,7 @@ fbBuildCompositeOperand (PicturePtr	    pPict,
 		op->over = fbStepOver;
 		op->down = fbStepDown;
 		op->set = fbSet;
-		op->indexed = (miIndexedPtr) pPict->pFormat->indexed;
+		op->indexed = (miIndexedPtr) pPict->pFormat->index.devPrivate;
 		op->clip = pPict->pCompositeClip;
 
 		fbGetDrawable (pPict->pDrawable, bits, stride, bpp,
diff --git a/xc/programs/Xserver/fb/fbpict.c b/xc/programs/Xserver/fb/fbpict.c
index 0570f8cab..894d5cd62 100644
--- a/xc/programs/Xserver/fb/fbpict.c
+++ b/xc/programs/Xserver/fb/fbpict.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -671,7 +671,7 @@ fbCompositeSrcAdd_8000x8000 (CARD8	op,
     CARD8	*dstLine, *dst;
     CARD8	*srcLine, *src;
     FbStride	dstStride, srcStride;
-    CARD8	w;
+    CARD16	w;
     CARD8	s, d;
     CARD16	t;
     
@@ -689,13 +689,17 @@ fbCompositeSrcAdd_8000x8000 (CARD8	op,
 	while (w--)
 	{
 	    s = *src++;
-	    if (s != 0xff)
+	    if (s)
 	    {
-		d = *dst;
-		t = d + s;
-		s = t | (0 - (t >> 8));
+		if (s != 0xff)
+		{
+		    d = *dst;
+		    t = d + s;
+		    s = t | (0 - (t >> 8));
+		}
+		*dst = s;
 	    }
-	    *dst++ = s;
+	    dst++;
 	}
     }
 }
@@ -736,19 +740,23 @@ fbCompositeSrcAdd_8888x8888 (CARD8	op,
 	while (w--)
 	{
 	    s = *src++;
-	    if (s != 0xffffffff)
+	    if (s)
 	    {
-		d = *dst;
-		if (d)
+		if (s != 0xffffffff)
 		{
-		    m = FbAdd(s,d,0,t);
-		    n = FbAdd(s,d,8,t);
-		    o = FbAdd(s,d,16,t);
-		    p = FbAdd(s,d,24,t);
-		    s = m|n|o|p;
+		    d = *dst;
+		    if (d)
+		    {
+			m = FbAdd(s,d,0,t);
+			n = FbAdd(s,d,8,t);
+			o = FbAdd(s,d,16,t);
+			p = FbAdd(s,d,24,t);
+			s = m|n|o|p;
+		    }
 		}
+		*dst = s;
 	    }
-	    *dst++ = s;
+	    dst++;
 	}
     }
 }