summaryrefslogtreecommitdiff
path: root/src/bmp.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-12-08 14:50:41 +0000
committerrubidium <rubidium@openttd.org>2007-12-08 14:50:41 +0000
commitf1e4914b5f379f9821274e8ddc4196b152fcc9b0 (patch)
treeb8ebe2d1af4279edf6f4a53f991c963c77f5bba0 /src/bmp.cpp
parent73c58d8a409d7e5f3dbb864be893a1c0b34defd6 (diff)
downloadopenttd-f1e4914b5f379f9821274e8ddc4196b152fcc9b0.tar.xz
(svn r11597) -Change: replace all remaining instances of (re|m|c)alloc with (Re|M|C)allocT and add a check for out-of-memory situations to the *allocT functions.
Diffstat (limited to 'src/bmp.cpp')
-rw-r--r--src/bmp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bmp.cpp b/src/bmp.cpp
index a96c3680c..fa78b55a8 100644
--- a/src/bmp.cpp
+++ b/src/bmp.cpp
@@ -354,7 +354,7 @@ bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
{
assert(info != NULL && data != NULL);
- data->bitmap = (byte*)calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte));
+ data->bitmap = CallocT<byte>(info->width * info->height * ((info->bpp == 24) ? 3 : 1));
if (data->bitmap == NULL) return false;
/* Load image */