commit f214fdca5a4306cf0c01b756d2e95b41874cddc5
author Daniel Stone <daniels@collabora.com> Mon Nov 14 17:43:57 2016 +0000
committer Daniel Stone <daniels@collabora.com> Mon Dec 12 17:15:08 2016 +0000
tree 64855aa946f195edb3d5d7cfc8b07d9410ec4e28
parent 4e5eceb07558a5f35460bcc6ac4602c854a79ff3

compositor-drm: Use signed int for width/height

This makes it sign-compatible with weston_output->{width,height}.

Differential Revision: https://phabricator.freedesktop.org/D1486

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>

libweston/compositor-drm.c

diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index ee152ca..0516178 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -102,8 +102,8 @@
 	 * due to out of bounds dimensions, and then mistakenly set
 	 * sprites_are_broken:
 	 */
-	uint32_t min_width, max_width;
-	uint32_t min_height, max_height;
+	int min_width, max_width;
+	int min_height, max_height;
 	int no_addfb2;
 
 	struct wl_list sprite_list;
@@ -253,7 +253,7 @@
 }
 
 static struct drm_fb *
-drm_fb_create_dumb(struct drm_backend *b, unsigned width, unsigned height,
+drm_fb_create_dumb(struct drm_backend *b, int width, int height,
 		   uint32_t format)
 {
 	struct drm_fb *fb;
@@ -371,7 +371,7 @@
 		   struct drm_backend *backend, uint32_t format)
 {
 	struct drm_fb *fb = gbm_bo_get_user_data(bo);
-	uint32_t width, height;
+	int width, height;
 	uint32_t handles[4] = { 0 }, pitches[4] = { 0 }, offsets[4] = { 0 };
 	int ret;
 
@@ -391,7 +391,8 @@
 	fb->size = fb->stride * height;
 	fb->fd = backend->drm.fd;
 
-	if (backend->min_width > width || width > backend->max_width ||
+	if (backend->min_width > width ||
+	    width > backend->max_width ||
 	    backend->min_height > height ||
 	    height > backend->max_height) {
 		weston_log("bo geometry out of bounds\n");