diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /pixman | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-region.c | 10 | ||||
| -rw-r--r-- | pixman/pixman/pixman.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pixman/pixman/pixman-region.c b/pixman/pixman/pixman-region.c index 80219c6ec..70c282d40 100644 --- a/pixman/pixman/pixman-region.c +++ b/pixman/pixman/pixman-region.c @@ -2356,6 +2356,16 @@ PREFIX (_reset) (region_type_t *region, box_type_t *box) region->data = NULL; } +PIXMAN_EXPORT void +PREFIX (_clear) (region_type_t *region) +{ + GOOD (region); + FREE_DATA (region); + + region->extents = *pixman_region_empty_box; + region->data = pixman_region_empty_data; +} + /* box is "return" value */ PIXMAN_EXPORT int PREFIX (_contains_point) (region_type_t * region, diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index c57092a4c..18d951312 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -466,6 +466,7 @@ pixman_bool_t pixman_region_equal (pixman_region16_t *reg pixman_bool_t pixman_region_selfcheck (pixman_region16_t *region); void pixman_region_reset (pixman_region16_t *region, pixman_box16_t *box); +void pixman_region_clear (pixman_region16_t *region); /* * 32 bit regions */ @@ -560,6 +561,7 @@ pixman_bool_t pixman_region32_equal (pixman_region32_t *r pixman_bool_t pixman_region32_selfcheck (pixman_region32_t *region); void pixman_region32_reset (pixman_region32_t *region, pixman_box32_t *box); +void pixman_region32_clear (pixman_region32_t *region); /* Copy / Fill / Misc */ |