diff options
author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 03:59:36 +0000 |
---|---|---|
committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 03:59:36 +0000 |
commit | 9d9a15d18572d1450fd8fef495be3629bf85c995 (patch) | |
tree | bfbc498db3d3ada10c8cfe64c9381bce66533419 /libvo/gl_common.c | |
parent | 1ad9af38b5120af85129d3b74834c7ed9690e7f3 (diff) | |
download | mpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.bz2 mpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.xz |
rm unnecesary casts from void* - part 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r-- | libvo/gl_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index e780a72e89..360cad5e49 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -298,7 +298,7 @@ static void getFunctions(void *(*getProcAddress)(const GLubyte *), char *allexts; if (!extensions) extensions = ""; if (!ext2) ext2 = ""; - allexts = (char *)malloc(strlen(extensions) + strlen(ext2) + 2); + allexts = malloc(strlen(extensions) + strlen(ext2) + 2); strcpy(allexts, extensions); strcat(allexts, " "); strcat(allexts, ext2); @@ -332,7 +332,7 @@ void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, GLfloat fval = (GLfloat)val / 255.0; GLfloat border[4] = {fval, fval, fval, fval}; GLenum clrfmt = (fmt == GL_ALPHA) ? GL_ALPHA : GL_LUMINANCE; - char *init = (char *)malloc(w * h); + char *init = malloc(w * h); memset(init, val, w * h); glAdjustAlignment(w); glPixelStorei(GL_UNPACK_ROW_LENGTH, w); @@ -400,7 +400,7 @@ int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, return 0; if (w > MAXDIM || h > MAXDIM) return 0; - data = (char *)malloc(w * h * 3); + data = malloc(w * h * 3); if (fread(data, w * 3, h, f) != h) return 0; glCreateClearTex(target, fmt, filter, w, h, 0); |