diff options
author | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
commit | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (patch) | |
tree | b18cd9881bc5a6d317edca6c38fa912bade00802 /pixman/pixman | |
parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
download | vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.gz vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.bz2 vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.zip |
libX11 mesa pixman git update 9 nov 2011
Diffstat (limited to 'pixman/pixman')
-rw-r--r-- | pixman/pixman/pixman-image.c | 7 | ||||
-rw-r--r-- | pixman/pixman/pixman-region.c | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pixman/pixman/pixman-image.c b/pixman/pixman/pixman-image.c index 09d7cbc4e..913853ceb 100644 --- a/pixman/pixman/pixman-image.c +++ b/pixman/pixman/pixman-image.c @@ -145,11 +145,8 @@ _pixman_image_fini (pixman_image_t *image) pixman_region32_fini (&common->clip_region); - if (common->transform) - free (common->transform); - - if (common->filter_params) - free (common->filter_params); + free (common->transform); + free (common->filter_params); if (common->alpha_map) pixman_image_unref ((pixman_image_t *)common->alpha_map); diff --git a/pixman/pixman/pixman-region.c b/pixman/pixman/pixman-region.c index 47beb5238..80219c6ec 100644 --- a/pixman/pixman/pixman-region.c +++ b/pixman/pixman/pixman-region.c @@ -828,8 +828,7 @@ pixman_op (region_type_t * new_reg, /* Place to store result { if (!pixman_rect_alloc (new_reg, new_size)) { - if (old_data) - free (old_data); + free (old_data); return FALSE; } } @@ -1005,8 +1004,7 @@ pixman_op (region_type_t * new_reg, /* Place to store result APPEND_REGIONS (new_reg, r2_band_end, r2_end); } - if (old_data) - free (old_data); + free (old_data); if (!(numRects = new_reg->data->numRects)) { @@ -1027,8 +1025,7 @@ pixman_op (region_type_t * new_reg, /* Place to store result return TRUE; bail: - if (old_data) - free (old_data); + free (old_data); return pixman_break (new_reg); } |