pixman: Branch 'master'

[Aaron Plattner]

 pixman/pixman.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 08530f5bf23386355a19b83db88173302c7a5300
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Dec 17 10:35:03 2008 -0800

    Don't treat PIXMAN_TYPE_YUY2 and PIXMAN_TYPE_YV12 as PIXMAN_FORMAT_COLOR.
    
    Various pieces of code expect PIXMAN_FORMAT_COLOR (and its less cool older
    brother, PICT_FORMAT_COLOR) formats to have ARGB bits, and the YUV formats do
    not.

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 6c523f2..49c39d5 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -648,7 +648,9 @@ struct pixman_indexed
 #define PIXMAN_TYPE_YUY2	6
 #define PIXMAN_TYPE_YV12	7
 
-#define PIXMAN_FORMAT_COLOR(f)	(PIXMAN_FORMAT_TYPE(f) & 2)
+#define PIXMAN_FORMAT_COLOR(f)				\
+	(PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ARGB ||	\
+	 PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ABGR)
 
 /* 32bpp formats */
 typedef enum {