equal
deleted
inserted
replaced
352 */ |
352 */ |
353 bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data) |
353 bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data) |
354 { |
354 { |
355 assert(info != NULL && data != NULL); |
355 assert(info != NULL && data != NULL); |
356 |
356 |
357 data->bitmap = (byte*)calloc(info->width * info->height, ((info->bpp == 24) ? 3 : 1) * sizeof(byte)); |
357 data->bitmap = CallocT<byte>(info->width * info->height * ((info->bpp == 24) ? 3 : 1)); |
358 if (data->bitmap == NULL) return false; |
358 if (data->bitmap == NULL) return false; |
359 |
359 |
360 /* Load image */ |
360 /* Load image */ |
361 SetStreamOffset(buffer, info->offset); |
361 SetStreamOffset(buffer, info->offset); |
362 switch (info->compression) { |
362 switch (info->compression) { |