diff options
| author | emersion <contact@emersion.fr> | 2018-06-30 12:57:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 12:57:48 +0100 |
| commit | 167105e6069d2dd66cd2d472c2a6b67703838125 (patch) | |
| tree | e6626f03fdd94c7832c4b5cb3b97e2a61cf6602e /backend/drm | |
| parent | 63eb720871004219826f16e0a79a0014ac5516e4 (diff) | |
| parent | 0c2a64df18f8740ab795fb2970d1954a8aac34b1 (diff) | |
Merge pull request #1101 from martinetd/static-analysis
Static analysis fixes
Diffstat (limited to 'backend/drm')
| -rw-r--r-- | backend/drm/atomic.c | 4 | ||||
| -rw-r--r-- | backend/drm/drm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index acc56e65..41b6424c 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -83,8 +83,8 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_plane *plane, // The src_* properties are in 16.16 fixed point atomic_add(atom, id, props->src_x, 0); atomic_add(atom, id, props->src_y, 0); - atomic_add(atom, id, props->src_w, plane->surf.width << 16); - atomic_add(atom, id, props->src_h, plane->surf.height << 16); + atomic_add(atom, id, props->src_w, (uint64_t)plane->surf.width << 16); + atomic_add(atom, id, props->src_h, (uint64_t)plane->surf.height << 16); atomic_add(atom, id, props->crtc_w, plane->surf.width); atomic_add(atom, id, props->crtc_h, plane->surf.height); atomic_add(atom, id, props->fb_id, fb_id); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index c5db480e..f4a971a2 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -973,7 +973,7 @@ int handle_drm_event(int fd, uint32_t mask, void *data) { } void restore_drm_outputs(struct wlr_drm_backend *drm) { - uint64_t to_close = (1 << wl_list_length(&drm->outputs)) - 1; + uint64_t to_close = (1L << wl_list_length(&drm->outputs)) - 1; struct wlr_drm_connector *conn; wl_list_for_each(conn, &drm->outputs, link) { |