From 7520c690496aea044f33d984875d2124d6c048d5 Mon Sep 17 00:00:00 2001 From: Nexarian Date: Sat, 4 Feb 2023 15:07:13 -0500 Subject: [PATCH] Add functions and reformat pixman-region.h - Update pixman-region.h header -- Reformat so all lines fit within 80 characters. -- Update define guard to use convention for the rest of XRDP. Add pixman_region_not_empty and pixman_region_extents in anticipation of using it for EGFX in the future. --- common/pixman-region.h | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/common/pixman-region.h b/common/pixman-region.h index bcc09cb6..22af77a0 100644 --- a/common/pixman-region.h +++ b/common/pixman-region.h @@ -18,7 +18,7 @@ * region, from pixman.h */ -#if !defined(PIXMAN_PIXMAN_H__) +#ifndef PIXMAN_PIXMAN_H__ #define PIXMAN_PIXMAN_H__ typedef int pixman_bool_t; @@ -54,23 +54,22 @@ typedef struct pixman_box16 pixman_box16_t; typedef struct pixman_region16 pixman_region16_t; /* creation/destruction */ -void pixman_region_init (pixman_region16_t *region); -void pixman_region_init_rect (pixman_region16_t *region, - /**/ int x, - /**/ int y, - /**/ unsigned int width, - /**/ unsigned int height); -void pixman_region_fini (pixman_region16_t *region); -pixman_bool_t pixman_region_union (pixman_region16_t *new_reg, - /**/ pixman_region16_t *reg1, - /**/ pixman_region16_t *reg2); -pixman_bool_t pixman_region_subtract (pixman_region16_t *reg_d, - /**/ pixman_region16_t *reg_m, - /**/ pixman_region16_t *reg_s); -pixman_bool_t pixman_region_intersect (pixman_region16_t *new_reg, - /**/ pixman_region16_t *reg1, - /**/ pixman_region16_t *reg2); -pixman_box16_t *pixman_region_rectangles (pixman_region16_t *region, - /**/ int *n_rects); +void pixman_region_init (pixman_region16_t *region); +void pixman_region_init_rect (pixman_region16_t *region, int x, int y, + unsigned int width, unsigned int height); +void pixman_region_fini (pixman_region16_t *region); +pixman_bool_t pixman_region_union (pixman_region16_t *new_reg, + pixman_region16_t *reg1, + pixman_region16_t *reg2); +pixman_bool_t pixman_region_subtract (pixman_region16_t *reg_d, + pixman_region16_t *reg_m, + pixman_region16_t *reg_s); +pixman_bool_t pixman_region_intersect (pixman_region16_t *new_reg, + pixman_region16_t *reg1, + pixman_region16_t *reg2); +pixman_box16_t *pixman_region_rectangles (pixman_region16_t *region, + int *n_rects); +pixman_bool_t pixman_region_not_empty (pixman_region16_t *region); +pixman_box16_t *pixman_region_extents (pixman_region16_t *region); #endif