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/main/readpix.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/main/readpix.c')
-rw-r--r-- | mesalib/src/mesa/main/readpix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index 7dc758152..e10f921d2 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -143,7 +143,7 @@ read_depth_pixels( struct gl_context *ctx, return; } - depthValues = (GLfloat *) malloc(width * sizeof(GLfloat)); + depthValues = malloc(width * sizeof(GLfloat)); if (depthValues) { /* General case (slower) */ @@ -191,7 +191,7 @@ read_stencil_pixels( struct gl_context *ctx, return; } - stencil = (GLubyte *) malloc(width * sizeof(GLubyte)); + stencil = malloc(width * sizeof(GLubyte)); if (stencil) { /* process image row by row */ @@ -486,7 +486,7 @@ fast_read_depth_stencil_pixels_separate(struct gl_context *ctx, return GL_TRUE; /* don't bother trying the slow path */ } - stencilVals = (GLubyte *) malloc(width * sizeof(GLubyte)); + stencilVals = malloc(width * sizeof(GLubyte)); if (stencilVals) { for (j = 0; j < height; j++) { @@ -557,8 +557,8 @@ slow_read_depth_stencil_pixels_separate(struct gl_context *ctx, stencilStride = depthStride; } - stencilVals = (GLubyte *) malloc(width * sizeof(GLubyte)); - depthVals = (GLfloat *) malloc(width * sizeof(GLfloat)); + stencilVals = malloc(width * sizeof(GLubyte)); + depthVals = malloc(width * sizeof(GLfloat)); if (stencilVals && depthVals) { for (j = 0; j < height; j++) { |