From d975f35bba6e128218de2696d5bce26656e3fd5f Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Thu, 1 Jul 2021 15:59:17 -0400 Subject: [PATCH] types/wlr_box: remove unused wlr_box_from_pixman_box32 and wlr_box_rotated_bounds functions --- include/wlr/types/wlr_box.h | 7 ------- types/wlr_box.c | 38 ------------------------------------- 2 files changed, 45 deletions(-) diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h index 73e51b343..2a407c4df 100644 --- a/include/wlr/types/wlr_box.h +++ b/include/wlr/types/wlr_box.h @@ -39,11 +39,4 @@ bool wlr_box_empty(const struct wlr_box *box); void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box, enum wl_output_transform transform, int width, int height); -/** - * Creates the smallest box that contains the box rotated about its center. - */ -void wlr_box_rotated_bounds(struct wlr_box *dest, const struct wlr_box *box, float rotation); - -void wlr_box_from_pixman_box32(struct wlr_box *dest, const pixman_box32_t box); - #endif diff --git a/types/wlr_box.c b/types/wlr_box.c index 769eb4fb5..3e33ba972 100644 --- a/types/wlr_box.c +++ b/types/wlr_box.c @@ -120,41 +120,3 @@ void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box, break; } } - -void wlr_box_rotated_bounds(struct wlr_box *dest, const struct wlr_box *box, - float rotation) { - if (rotation == 0) { - *dest = *box; - return; - } - - double ox = box->x + (double)box->width/2; - double oy = box->y + (double)box->height/2; - - double c = fabs(cos(rotation)); - double s = fabs(sin(rotation)); - - double x1 = ox + (box->x - ox) * c + (box->y - oy) * s; - double x2 = ox + - (box->x + box->width - ox) * c + - (box->y + box->height - oy) * s; - - double y1 = oy + (box->x - ox) * s + (box->y - oy) * c; - double y2 = oy + - (box->x + box->width - ox) * s + - (box->y + box->height - oy) * c; - - dest->x = floor(fmin(x1, x2)); - dest->width = ceil(fmax(x1, x2) - fmin(x1, x2)); - dest->y = floor(fmin(y1, y2)); - dest->height = ceil(fmax(y1, y2) - fmin(y1, y2)); -} - -void wlr_box_from_pixman_box32(struct wlr_box *dest, const pixman_box32_t box) { - *dest = (struct wlr_box){ - .x = box.x1, - .y = box.y1, - .width = box.x2 - box.x1, - .height = box.y2 - box.y1, - }; -}