diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-25 13:43:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 13:43:14 +0200 |
| commit | 1cd8dda461091a0c0dec0b53146699c428ee8ab6 (patch) | |
| tree | 2847b799791d5fb325841ee4391bd50adf4903e4 /modules/bmp/image_loader_bmp.h | |
| parent | 80ad49748e5b4cf9f7f7672500e0212db4265f20 (diff) | |
| parent | 6484da572117eaee88567f7b167ab261e28e7873 (diff) | |
Merge pull request #28267 from Xrayez/fix-bmp-indexed-8-4-1
Load and import 4/1-bit BMP images
Diffstat (limited to 'modules/bmp/image_loader_bmp.h')
| -rw-r--r-- | modules/bmp/image_loader_bmp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/bmp/image_loader_bmp.h b/modules/bmp/image_loader_bmp.h index b27a47d402..0082cf778a 100644 --- a/modules/bmp/image_loader_bmp.h +++ b/modules/bmp/image_loader_bmp.h @@ -37,6 +37,9 @@ class ImageLoaderBMP : public ImageFormatLoader { protected: static const unsigned BITMAP_SIGNATURE = 0x4d42; + static const unsigned BITMAP_FILE_HEADER_SIZE = 14; // bmp_file_header_s + static const unsigned BITMAP_INFO_HEADER_MIN_SIZE = 40; // bmp_info_header_s + enum bmp_compression_s { BI_RGB = 0x00, BI_RLE8 = 0x01, @@ -76,6 +79,7 @@ protected: static Error convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const uint8_t *p_color_buffer, + const uint32_t color_table_size, const bmp_header_s &p_header); public: |