From 42f8026168c2fe166b9636c540adfb8352f2f353 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 23 Jan 2011 16:28:57 +0000 Subject: [PATCH] fix a couple void conversions git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10730 d7cf8633-e32d-0410-b094-e92efae38249 --- dpsoftrast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dpsoftrast.c b/dpsoftrast.c index b1a7ca68..014dc60d 100644 --- a/dpsoftrast.c +++ b/dpsoftrast.c @@ -458,7 +458,7 @@ int DPSOFTRAST_Texture_New(int flags, int width, int height, int depth) texture->size = size; // allocate the pixels now - texture->bytes = calloc(1, size); + texture->bytes = (unsigned char *)calloc(1, size); return texnum; } @@ -959,7 +959,7 @@ void DPSOFTRAST_Draw_LoadVertices(int firstvertex, int numvertices, bool needcol dpsoftrast.draw.maxvertices *= 2; if (dpsoftrast.draw.in_array4f[0]) free(dpsoftrast.draw.in_array4f[0]); - data = calloc(1, dpsoftrast.draw.maxvertices * sizeof(float[4])*(DPSOFTRAST_ARRAY_TOTAL*2 + 1)); + data = (float *)calloc(1, dpsoftrast.draw.maxvertices * sizeof(float[4])*(DPSOFTRAST_ARRAY_TOTAL*2 + 1)); for (i = 0;i < DPSOFTRAST_ARRAY_TOTAL;i++, data += dpsoftrast.draw.maxvertices * 4) dpsoftrast.draw.in_array4f[i] = data; for (i = 0;i < DPSOFTRAST_ARRAY_TOTAL;i++, data += dpsoftrast.draw.maxvertices * 4) -- 2.39.2