[PATCH] clients: Fix height typo in clamp_view()

Pekka Paalanen ppaalanen at gmail.com
Wed Sep 9 00:11:05 PDT 2015


On Tue,  8 Sep 2015 19:24:12 -0700
Bryce Harrington <bryce at osg.samsung.com> wrote:

> We should be checking our scaled image height against the allocation
> height rather than the allocation width.
> 
> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> ---
>  clients/image.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/clients/image.c b/clients/image.c
> index d28f221..4126305 100644
> --- a/clients/image.c
> +++ b/clients/image.c
> @@ -93,7 +93,7 @@ clamp_view(struct image *image)
>  			image->matrix.x0 = allocation.width - sw;
>  	}
>  
> -	if (sh < allocation.width) {
> +	if (sh < allocation.height) {
>  		image->matrix.y0 =
>  			(allocation.height - image->height * scale) / 2;
>  	} else {

R-b me, tested, and added one paragraph to the commit message
explaining what it actually fixes. I wasn't sure without testing it.
Pushed:
   7628789..ae6f1bb  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20150909/e0602af8/attachment-0001.sig>


More information about the wayland-devel mailing list