[xserver-commit] xserver/fb fbpict.c,1.26,1.27

[Jaymz Julian]

Committed by: jaymz

Update of /cvs/xserver/xserver/fb
In directory pdx:/tmp/cvs-serv25692/fb

Modified Files:
	fbpict.c 
Log Message:

Clean up own dog shit, aka fix fbCompositeTrans_0565xnx0565 to work 
unaligned



Index: fbpict.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbpict.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fbpict.c	21 Dec 2003 09:21:05 -0000	1.26
+++ fbpict.c	28 Dec 2003 12:42:33 -0000	1.27
@@ -1054,21 +1054,24 @@
 		}
 		else
 		{
+			if(w>1)
+			{
 #if IMAGE_BYTE_ORDER == LSBFirst
-			s_16=s_32&0xffff;
+				s_16=s_32&0xffff;
 #else
-			s_16=s_32>>16;
+				s_16=s_32>>16;
 #endif
-			d_16 = *dst;
-			fastCombine0565(maskAlpha, s_16, d_16, *dst++);
+				d_16 = *dst;
+				fastCombine0565(maskAlpha, s_16, d_16, *dst++);
 #if IMAGE_BYTE_ORDER == LSBFirst
-			s_16=s_32>>16;
+				s_16=s_32>>16;
 #else
-			s_16=s_32&0xffff;
+				s_16=s_32&0xffff;
 #endif
-			d_16 = *dst;
-			fastCombine0565(maskAlpha, s_16, d_16, *dst++);
-			w-=2;
+				d_16 = *dst;
+				fastCombine0565(maskAlpha, s_16, d_16, *dst++);
+				w-=2;
+			}
 		}
 		src=(CARD16 *)isrc;
 		if(w!=0)