pixman: Branch 'master'

[Vladimir Vukicevic]

 pixman/pixman-compose.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e0af5922cdc5caa97cfb822b792d744e28a3bb37
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date:   Tue Jan 15 16:51:59 2008 -0800

    Remove trailing ; in SETUP_YV12 macro
    
    Causes compilation problems with MSVC.

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index ef49850..c3f50e2 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -123,7 +123,12 @@ SourcePictureClassify (source_image_t *pict,
 		stride * pict->height; \
 	int offset1 = stride < 0 ? \
 		offset0 + ((-stride) >> 1) * ((pict->height) >> 1) : \
-		offset0 + (offset0 >> 2);
+		offset0 + (offset0 >> 2)
+/* Note n trailing semicolon on the above macro; if it's there, then
+ * the typical usage of YV12_SETUP(pict); will have an extra trailing ;
+ * that some compilers will interpret as a statement -- and then any further
+ * variable declarations will cause an error.
+ */
 
 #define YV12_Y(line)		\
     ((uint8_t *) ((bits) + (stride) * (line)))