summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2016-04-01 13:38:11 +0200
committerAdam Jackson <ajax@redhat.com>2016-04-15 16:22:16 -0400
commite8e5d839968e22cf42a6e1982a07b02c6f4a4562 (patch)
tree4b16954fc38e75b494ae1ccc5fac54efe411ec85
parentf9b5bbaa3a7fce1a4efb2084b8d9d82b98d4ee83 (diff)
xwayland: Fix compiler warning in GLAMOR Xv
XvWindowMask is defined as 0x00020000 and cannot fit in the XvAdaptor type which is defined as an unsigned char, thus causing a compiler warning: xwayland-glamor-xv.c: In function ‘xwl_glamor_xv_add_adaptors’: xwayland-glamor-xv.c:339:16: warning: large integer implicitly truncated to unsigned type [-Woverflow] This XvWindowMask value is actually not used for XvAdaptor itself but by the server in its xf86xv implementation, so we don't even need that mask in our xwayland-glamor-xv implementation. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-rw-r--r--hw/xwayland/xwayland-glamor-xv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwayland/xwayland-glamor-xv.c b/hw/xwayland/xwayland-glamor-xv.c
index c99418d43..65f93c693 100644
--- a/hw/xwayland/xwayland-glamor-xv.c
+++ b/hw/xwayland/xwayland-glamor-xv.c
@@ -336,7 +336,7 @@ xwl_glamor_xv_add_adaptors(ScreenPtr pScreen)
pa = xnfcalloc(1, sizeof(XvAdaptorRec));
pa->pScreen = pScreen;
- pa->type = (unsigned int) (XvWindowMask | XvInputMask | XvImageMask);
+ pa->type = (unsigned char) (XvInputMask | XvImageMask);
pa->ddStopVideo = xwl_glamor_xv_stop_video;
pa->ddPutImage = xwl_glamor_xv_put_image;
pa->ddSetPortAttribute = xwl_glamor_xv_set_port_attribute;