[PATCH weston] rpi-renderer: don't pass a box to pixman_region32_contains_point()

Bryce Harrington bryce at osg.samsung.com
Fri Nov 21 13:20:22 PST 2014


On Fri, Nov 21, 2014 at 12:31:04PM -0600, Derek Foreman wrote:
> We don't care which box contained the point, so don't pass one in.
> 
> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> ---
> 
> Had thought I'd already sent this one up a while back, but can't find
> it in patchwork or on the list...
> 
>  src/rpi-renderer.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/src/rpi-renderer.c b/src/rpi-renderer.c
> index c222eb6..9585be6 100644
> --- a/src/rpi-renderer.c
> +++ b/src/rpi-renderer.c
> @@ -337,8 +337,7 @@ apply_opaque_region(struct wl_shm_buffer *buffer,
>  	for (y = 0; y < height; y++) {
>  		for (x = 0; x < width; x++) {
>  			int i = y * stride / 4 + x;
> -			pixman_box32_t box;
> -			if (pixman_region32_contains_point (opaque_region, x, y, &box)) {
> +			if (pixman_region32_contains_point (opaque_region, x, y, NULL)) {
>  				dst[i] = src[i] | 0xff000000;
>  			} else {
>  				dst[i] = src[i];

The &box param to pixman_region32_contains_point() is a return value
from the function, and ignored when set to NULL.  In weston,
apply_opaque_region() doesn't use box at all after retrieving it from
pixman so should be dropped.  Yes, LGTM.

Reviewed-by: Bryce Harrington <b.harrington at samsung.com>

> -- 
> 2.1.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list