diff options
author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/mesa/main/texcompress_cpal.c | |
parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip |
xserver mesa git update 6 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_cpal.c')
-rw-r--r-- | mesalib/src/mesa/main/texcompress_cpal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/texcompress_cpal.c b/mesalib/src/mesa/main/texcompress_cpal.c index 2398ded69..ceeec9403 100644 --- a/mesalib/src/mesa/main/texcompress_cpal.c +++ b/mesalib/src/mesa/main/texcompress_cpal.c @@ -208,14 +208,13 @@ _mesa_cpal_compressed_teximage2d(GLenum target, GLint level, /* allocate and fill dest image buffer */ if (palette) { - image = (GLubyte *) malloc(num_texels * info->size); + image = malloc(num_texels * info->size); paletted_to_color(info, palette, indices, num_texels, image); } _mesa_TexImage2D(target, lvl, info->format, w, h, 0, info->format, info->type, image); - if (image) - free(image); + free(image); /* advance index pointer to point to next src mipmap */ if (info->palette_size == 16) |