diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-09 20:50:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 20:50:37 +0200 |
| commit | 6e3f47983cabb5f162eaec075d810f717985beda (patch) | |
| tree | f2565ddcf9ec448d73bd8ab82d179f030e2b8d48 /modules/bmp | |
| parent | 87f8feb3e5656a2c244bdb63c876c85fc92f46a1 (diff) | |
| parent | 89a8bbda0ae7ebd159d6ef2b0724964b3eb14943 (diff) | |
Merge pull request #48558 from mortarroad/master-fix-misaligned-bmp
fix misaligned loads in bmp loader
Diffstat (limited to 'modules/bmp')
| -rw-r--r-- | modules/bmp/image_loader_bmp.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/modules/bmp/image_loader_bmp.cpp b/modules/bmp/image_loader_bmp.cpp index c7fdf56af4..f22e74cafb 100644 --- a/modules/bmp/image_loader_bmp.cpp +++ b/modules/bmp/image_loader_bmp.cpp @@ -130,23 +130,19 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image, line_ptr += 1; } break; case 24: { - uint32_t color = *((uint32_t *)line_ptr); - - write_buffer[index + 2] = color & 0xff; - write_buffer[index + 1] = (color >> 8) & 0xff; - write_buffer[index + 0] = (color >> 16) & 0xff; + write_buffer[index + 2] = line_ptr[0]; + write_buffer[index + 1] = line_ptr[1]; + write_buffer[index + 0] = line_ptr[2]; write_buffer[index + 3] = 0xff; index += 4; line_ptr += 3; } break; case 32: { - uint32_t color = *((uint32_t *)line_ptr); - - write_buffer[index + 2] = color & 0xff; - write_buffer[index + 1] = (color >> 8) & 0xff; - write_buffer[index + 0] = (color >> 16) & 0xff; - write_buffer[index + 3] = color >> 24; + write_buffer[index + 2] = line_ptr[0]; + write_buffer[index + 1] = line_ptr[1]; + write_buffer[index + 0] = line_ptr[2]; + write_buffer[index + 3] = line_ptr[3]; index += 4; line_ptr += 4; @@ -172,11 +168,9 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image, const uint8_t *cb = p_color_buffer; for (unsigned int i = 0; i < color_table_size; ++i) { - uint32_t color = *((uint32_t *)cb); - - pal[i * 4 + 0] = (color >> 16) & 0xff; - pal[i * 4 + 1] = (color >> 8) & 0xff; - pal[i * 4 + 2] = (color)&0xff; + pal[i * 4 + 0] = cb[2]; + pal[i * 4 + 1] = cb[1]; + pal[i * 4 + 2] = cb[0]; pal[i * 4 + 3] = 0xff; cb += 4; |