diff -r 2d4126d81ebb -r 167d9a91ef02 src/bmp.cpp
--- a/src/bmp.cpp	Wed Jan 10 18:44:52 2007 +0000
+++ b/src/bmp.cpp	Wed Jan 10 18:56:51 2007 +0000
@@ -5,6 +5,7 @@
 #include "gfx.h"
 #include "bmp.h"
 #include "macros.h"
+#include "helpers.hpp"
 
 void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file) {
 	buffer->pos      = -1;
@@ -328,7 +329,7 @@
 		}
 		if (info->palette_size == 0) info->palette_size = 1 << info->bpp;
 
-		data->palette = calloc(info->palette_size, sizeof(*(data->palette)));
+		CallocT(&data->palette, info->palette_size);
 		if (data->palette == NULL) return false;
 
 		for (i = 0; i < info->palette_size; i++) {
@@ -350,7 +351,7 @@
 {
 	assert(info != NULL && data != NULL);
 
-	data->bitmap = calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte));
+	data->bitmap = (byte*)calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte));
 	if (data->bitmap == NULL) return false;
 
 	/* Load image */