Use calloc rather than malloc+memset

2 files changed, 2 insertions, 7 deletions

diff --git a/pixman/src/icpixels.c b/pixman/src/icpixels.c
index 2ad34f47..c5efae95 100644
--- a/pixman/src/icpixels.c
+++ b/pixman/src/icpixels.c
@@ -65,12 +65,11 @@ FbPixelsCreate (int width, int height, int depth)
 	adjust = 8 - (base & 7);
     buf_size += adjust;
 
-    pixels = malloc(base + buf_size);
+    pixels = calloc(base + buf_size, 1);
     if (!pixels)
 	return NULL;
 
     buf = (pixman_bits_t *) ((char *)pixels + base + adjust);
-    memset (buf, 0, height * stride);
 
     FbPixelsInit (pixels, buf, width, height, depth, bpp, stride);
 
diff --git a/pixman/src/ictrap.c b/pixman/src/ictrap.c
index 08bd0247..72616f31 100644
--- a/pixman/src/ictrap.c
+++ b/pixman/src/ictrap.c
@@ -45,16 +45,12 @@ FbCreateAlphaPicture (pixman_image_t	*dst,
 	    return NULL;
     }
 
+    /* pixman_image_create zeroes out the pixels, so we don't have to */
     image = pixman_image_create (format, width, height); 
 
     if (own_format)
 	pixman_format_destroy (format);
 
-    /* XXX: Is this a reasonable way to clear the image? Would
-       probably be preferable to use pixman_image_fill_rectangle once such a
-       beast exists. */
-    memset (image->pixels->data, 0, height * image->pixels->stride);
-
     return image;
 }