]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix a couple void conversions
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 23 Jan 2011 16:28:57 +0000 (16:28 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 23 Jan 2011 16:28:57 +0000 (16:28 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10730 d7cf8633-e32d-0410-b094-e92efae38249

dpsoftrast.c

index b1a7ca68bef72b984f489bf98a6c7e88f594cf0f..014dc60decf9b902bce2540493b3b57731b4a472 100644 (file)
@@ -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)