From bca444ea4a84c39e9989681f892f6e4cb2033cf9 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Fri, 28 Aug 2015 15:21:11 +0100 Subject: [PATCH] compositor: remove check for below zero for unsigned value CLAMP checks both if value is '< 0' and '> max'. Value will never be a negative number since it is an unsigned integer. Removing that check and only checking if it is bigger than max by using MIN(). CID 1320707 --- gst/compositor/compositor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c index 9aa651f95c..66927ba3a9 100644 --- a/gst/compositor/compositor.c +++ b/gst/compositor/compositor.c @@ -362,10 +362,10 @@ clamp_rectangle (guint x, guint y, guint w, guint h, guint outer_width, * the case where (say, with negative xpos/ypos or w/h greater than the output * size) the non-obscured portion of the frame could be outside the bounds of * the video itself and hence not visible at all */ - clamped.x = CLAMP (x, 0, outer_width); - clamped.y = CLAMP (y, 0, outer_height); - clamped.w = CLAMP (x2, 0, outer_width) - clamped.x; - clamped.h = CLAMP (y2, 0, outer_height) - clamped.y; + clamped.x = MIN (x, outer_width); + clamped.y = MIN (y, outer_height); + clamped.w = MIN (x2, outer_width) - clamped.x; + clamped.h = MIN (y2, outer_height) - clamped.y; return clamped; }