diff options
author | smatz <smatz@openttd.org> | 2009-02-24 20:59:17 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2009-02-24 20:59:17 +0000 |
commit | d73c1fa7bfed01a187e14c4d86cde70e7121c51b (patch) | |
tree | 50574d6b6befd846433d33e7a7a619e719b57d0a /src/bmp.cpp | |
parent | 8beca127ddf8f97b76c4bd3491ead1f6954b115d (diff) | |
download | openttd-d73c1fa7bfed01a187e14c4d86cde70e7121c51b.tar.xz |
(svn r15568) -Cleanup: *allocT/AllocaM doesn't return NULL when allocating fails
Diffstat (limited to 'src/bmp.cpp')
-rw-r--r-- | src/bmp.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/bmp.cpp b/src/bmp.cpp index 7e025964e..ae277d7c8 100644 --- a/src/bmp.cpp +++ b/src/bmp.cpp @@ -331,7 +331,6 @@ bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data) if (info->palette_size == 0) info->palette_size = 1 << info->bpp; data->palette = CallocT<Colour>(info->palette_size); - if (data->palette == NULL) return false; for (i = 0; i < info->palette_size; i++) { data->palette[i].b = ReadByte(buffer); @@ -353,7 +352,6 @@ bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data) assert(info != NULL && data != NULL); data->bitmap = CallocT<byte>(info->width * info->height * ((info->bpp == 24) ? 3 : 1)); - if (data->bitmap == NULL) return false; /* Load image */ SetStreamOffset(buffer, info->offset); |