diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/swrast/s_copypix.c | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_copypix.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_copypix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/swrast/s_copypix.c b/mesalib/src/mesa/swrast/s_copypix.c index cf419c328..bbd1f228c 100644 --- a/mesalib/src/mesa/swrast/s_copypix.c +++ b/mesalib/src/mesa/swrast/s_copypix.c @@ -139,7 +139,7 @@ copy_rgba_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, span.arrayAttribs = FRAG_BIT_COL0; /* we'll fill in COL0 attrib values */ if (overlapping) { - tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat) * 4); + tmpImage = malloc(width * height * sizeof(GLfloat) * 4); if (!tmpImage) { _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" ); return; @@ -286,7 +286,7 @@ copy_depth_pixels( struct gl_context *ctx, GLint srcx, GLint srcy, if (overlapping) { GLint ssy = sy; - tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat)); + tmpImage = malloc(width * height * sizeof(GLfloat)); if (!tmpImage) { _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" ); return; @@ -303,7 +303,7 @@ copy_depth_pixels( struct gl_context *ctx, GLint srcx, GLint srcy, p = NULL; } - depth = (GLfloat *) malloc(width * sizeof(GLfloat)); + depth = malloc(width * sizeof(GLfloat)); if (!depth) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels()"); goto end; @@ -383,7 +383,7 @@ copy_stencil_pixels( struct gl_context *ctx, GLint srcx, GLint srcy, if (overlapping) { GLint ssy = sy; - tmpImage = (GLubyte *) malloc(width * height * sizeof(GLubyte)); + tmpImage = malloc(width * height * sizeof(GLubyte)); if (!tmpImage) { _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" ); return; @@ -400,7 +400,7 @@ copy_stencil_pixels( struct gl_context *ctx, GLint srcx, GLint srcy, p = NULL; } - stencil = (GLubyte *) malloc(width * sizeof(GLubyte)); + stencil = malloc(width * sizeof(GLubyte)); if (!stencil) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels()"); goto end; |