From 4f8a04b1c93630c2556db5e3a0657076167e1ea3 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 8 Apr 2007 21:55:45 -0400 Subject: [PATCH] [pixman-image] Simply initialization given that there is no clip --- pixman/src/icimage.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c index dc2ba3ba2..0ef1eb350 100644 --- a/pixman/src/icimage.c +++ b/pixman/src/icimage.c @@ -328,29 +328,15 @@ pixman_image_init (pixman_image_t *image) */ if (image->pixels) { - if (!image->hasCompositeClip) { - pixman_region_init_rect (&image->compositeClip, - 0, 0, image->pixels->width, - image->pixels->height); - image->hasCompositeClip = 1; - } + pixman_region_init_rect (&image->compositeClip, + 0, 0, image->pixels->width, + image->pixels->height); + image->hasCompositeClip = 1; - if (!image->hasSourceClip) { - pixman_region_init_rect (&image->sourceClip, - 0, 0, image->pixels->width, - image->pixels->height); - image->hasSourceClip = 1; - } - } else { - if (image->hasCompositeClip) { - pixman_region_uninit (&image->compositeClip); - image->hasCompositeClip = FALSE; - } - - if (image->hasSourceClip) { - pixman_region_uninit (&image->sourceClip); - image->hasSourceClip = FALSE; - } + pixman_region_init_rect (&image->sourceClip, + 0, 0, image->pixels->width, + image->pixels->height); + image->hasSourceClip = 1; } image->transform = NULL;