summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Vukicevic <vladimir@pobox.com>2008-01-15 16:51:59 -0800
committerVladimir Vukicevic <vladimir@h-232.office.mozilla.org>2008-01-15 16:51:59 -0800
commite0af5922cdc5caa97cfb822b792d744e28a3bb37 (patch)
treec74d1ddfe028a2b6728281c6b1f907886544c50d
parent9a0639650e276c4c0da5dfe37a8d3ba5a6b81712 (diff)
Remove trailing ; in SETUP_YV12 macro
Causes compilation problems with MSVC.
-rw-r--r--pixman/pixman-compose.c7
1 files changed, 6 insertions, 1 deletions
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)))