godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix misaligned loads in bmp loader 

(cherry picked from commit 89a8bbda0a)
This commit is contained in:
Morris Tabor 2021-05-08 16:51:30 +02:00 committed by Rémi Verschelde
parent 9602dfad90
commit 4b221df06d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/bmp/image_loader_bmp.cpp
View File

@ -130,23 +130,19 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
line_ptr += 1; line_ptr += 1;
} break; } break;
case 24: { case 24: {
uint32_t color = *((uint32_t *)line_ptr); write_buffer[index + 2] = line_ptr[0];
write_buffer[index + 1] = line_ptr[1];
write_buffer[index + 2] = color & 0xff; write_buffer[index + 0] = line_ptr[2];
write_buffer[index + 1] = (color >> 8) & 0xff;
write_buffer[index + 0] = (color >> 16) & 0xff;
write_buffer[index + 3] = 0xff; write_buffer[index + 3] = 0xff;
index += 4; index += 4;
line_ptr += 3; line_ptr += 3;
} break; } break;
case 32: { case 32: {
uint32_t color = *((uint32_t *)line_ptr); write_buffer[index + 2] = line_ptr[0];
write_buffer[index + 1] = line_ptr[1];
write_buffer[index + 2] = color & 0xff; write_buffer[index + 0] = line_ptr[2];
write_buffer[index + 1] = (color >> 8) & 0xff; write_buffer[index + 3] = line_ptr[3];
write_buffer[index + 0] = (color >> 16) & 0xff;
write_buffer[index + 3] = color >> 24;
index += 4; index += 4;
line_ptr += 4; line_ptr += 4;
@ -172,11 +168,9 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
const uint8_t *cb = p_color_buffer; const uint8_t *cb = p_color_buffer;
for (unsigned int i = 0; i < color_table_size; ++i) { for (unsigned int i = 0; i < color_table_size; ++i) {
uint32_t color = *((uint32_t *)cb); pal[i * 4 + 0] = cb[2];
pal[i * 4 + 1] = cb[1];
pal[i * 4 + 0] = (color >> 16) & 0xff; pal[i * 4 + 2] = cb[0];
pal[i * 4 + 1] = (color >> 8) & 0xff;
pal[i * 4 + 2] = (color)&0xff;
pal[i * 4 + 3] = 0xff; pal[i * 4 + 3] = 0xff;
cb += 4; cb += 4;