[xserver-commit] xserver/render picture.c,1.33,1.34

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/render
In directory pdx:/tmp/cvs-serv12781/render

Modified Files:
	picture.c 
Log Message:
	* composite/compext.c: (ProcCompositeCreateRegionFromBorderClip):
	* composite/compinit.c: (compAddArgbVisual), (compScreenInit):
	* composite/compint.h:
	* composite/compwindow.c: (compImplicitRedirect),
	(compReparentWindow), (compCreateWindow),
	(compSetRedirectBorderClip), (compWindowUpdateAutomatic):
	* miext/damage/damage.c: (DamageDamageRegion):
	* render/picture.c: (PictureMatchVisual):
	Add ARGB32 visual type with automatic update as needed.
	Fix a few more issues with damage being saved in window space.
	Damage windows that are moved.
	Fix overflow problem in PicturMatchVisual.


Index: picture.c
===================================================================
RCS file: /cvs/xserver/xserver/render/picture.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- picture.c	5 Nov 2003 05:45:31 -0000	1.33
+++ picture.c	11 Nov 2003 09:02:22 -0000	1.34
@@ -488,11 +488,11 @@
 	    }
 	    else
 	    {
-		if (format->direct.redMask << format->direct.red == 
+		if ((unsigned long) format->direct.redMask << format->direct.red == 
 		    pVisual->redMask &&
-		    format->direct.greenMask << format->direct.green == 
+		    (unsigned long) format->direct.greenMask << format->direct.green == 
 		    pVisual->greenMask &&
-		    format->direct.blueMask << format->direct.blue == 
+		    (unsigned long) format->direct.blueMask << format->direct.blue == 
 		    pVisual->blueMask)
 		{
 		    return format;