Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[deliverable/linux.git] / drivers / media / platform / vivid / vivid-vid-common.c

diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
index b0d4e3a0acf0e5975301dadf6bb0f95b2f74f3bf..39ea2284789c7590d0cfa9a951b9a8f672c3066e 100644 (file)
--- a/drivers/media/platform/vivid/vivid-vid-common.c
+++ b/drivers/media/platform/vivid/vivid-vid-common.c
@@ -653,103 +653,6 @@ int fmt_sp2mp_func(struct file *file, void *priv,
        return ret;
 }
 
-/* v4l2_rect helper function: copy the width/height values */
-void rect_set_size_to(struct v4l2_rect *r, const struct v4l2_rect *size)
-{
-       r->width = size->width;
-       r->height = size->height;
-}
-
-/* v4l2_rect helper function: width and height of r should be >= min_size */
-void rect_set_min_size(struct v4l2_rect *r, const struct v4l2_rect *min_size)
-{
-       if (r->width < min_size->width)
-               r->width = min_size->width;
-       if (r->height < min_size->height)
-               r->height = min_size->height;
-}
-
-/* v4l2_rect helper function: width and height of r should be <= max_size */
-void rect_set_max_size(struct v4l2_rect *r, const struct v4l2_rect *max_size)
-{
-       if (r->width > max_size->width)
-               r->width = max_size->width;
-       if (r->height > max_size->height)
-               r->height = max_size->height;
-}
-
-/* v4l2_rect helper function: r should be inside boundary */
-void rect_map_inside(struct v4l2_rect *r, const struct v4l2_rect *boundary)
-{
-       rect_set_max_size(r, boundary);
-       if (r->left < boundary->left)
-               r->left = boundary->left;
-       if (r->top < boundary->top)
-               r->top = boundary->top;
-       if (r->left + r->width > boundary->width)
-               r->left = boundary->width - r->width;
-       if (r->top + r->height > boundary->height)
-               r->top = boundary->height - r->height;
-}
-
-/* v4l2_rect helper function: return true if r1 has the same size as r2 */
-bool rect_same_size(const struct v4l2_rect *r1, const struct v4l2_rect *r2)
-{
-       return r1->width == r2->width && r1->height == r2->height;
-}
-
-/* v4l2_rect helper function: calculate the intersection of two rects */
-struct v4l2_rect rect_intersect(const struct v4l2_rect *a, const struct v4l2_rect *b)
-{
-       struct v4l2_rect r;
-       int right, bottom;
-
-       r.top = max(a->top, b->top);
-       r.left = max(a->left, b->left);
-       bottom = min(a->top + a->height, b->top + b->height);
-       right = min(a->left + a->width, b->left + b->width);
-       r.height = max(0, bottom - r.top);
-       r.width = max(0, right - r.left);
-       return r;
-}
-
-/*
- * v4l2_rect helper function: scale rect r by to->width / from->width and
- * to->height / from->height.
- */
-void rect_scale(struct v4l2_rect *r, const struct v4l2_rect *from,
-                                    const struct v4l2_rect *to)
-{
-       if (from->width == 0 || from->height == 0) {
-               r->left = r->top = r->width = r->height = 0;
-               return;
-       }
-       r->left = (((r->left - from->left) * to->width) / from->width) & ~1;
-       r->width = ((r->width * to->width) / from->width) & ~1;
-       r->top = ((r->top - from->top) * to->height) / from->height;
-       r->height = (r->height * to->height) / from->height;
-}
-
-bool rect_overlap(const struct v4l2_rect *r1, const struct v4l2_rect *r2)
-{
-       /*
-        * IF the left side of r1 is to the right of the right side of r2 OR
-        *    the left side of r2 is to the right of the right side of r1 THEN
-        * they do not overlap.
-        */
-       if (r1->left >= r2->left + r2->width ||
-           r2->left >= r1->left + r1->width)
-               return false;
-       /*
-        * IF the top side of r1 is below the bottom of r2 OR
-        *    the top side of r2 is below the bottom of r1 THEN
-        * they do not overlap.
-        */
-       if (r1->top >= r2->top + r2->height ||
-           r2->top >= r1->top + r1->height)
-               return false;
-       return true;
-}
 int vivid_vid_adjust_sel(unsigned flags, struct v4l2_rect *r)
 {
        unsigned w = r->width;