[Xorg-commit] xc/programs/Xserver/hw/xfree86/xaa xaaPict.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/xaa

Modified Files:
      Tag: XORG-CURRENT
	xaaPict.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xaaPict.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xaaPict.c	26 Nov 2003 22:49:04 -0000	1.1.4.1
+++ b/xaaPict.c	23 Feb 2004 21:37:11 -0000	1.1.4.2
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -219,6 +219,9 @@
     ySrc += pSrc->pDrawable->y;
 
     if(pMask) {
+	if(pMask->componentAlpha)
+	    return FALSE;
+ 
 	/* for now we only do it if there is a 1x1 (solid) source */
 
 	if((pSrc->pDrawable->width == 1) && (pSrc->pDrawable->height == 1)) {