Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #24547 from Shinryuuji/master

Browse source 
Add support for 8bpp bmp files
This commit is contained in:
Hein-Pieter van Braam 2019-04-23 06:35:25 +03:00 • committed by GitHub
commit fc2e2dfa43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/bmp/image_loader_bmp.h
View file

@ -37,6 +37,19 @@ class ImageLoaderBMP : public ImageFormatLoader {
protected:
static const unsigned BITMAP_SIGNATURE = 0x4d42;
enum bmp_compression_s {
BI_RGB = 0x00,
BI_RLE8 = 0x01,
BI_RLE4 = 0x02,
BI_BITFIELDS = 0x03,
BI_JPEG = 0x04,
BI_PNG = 0x05,
BI_ALPHABITFIELDS = 0x06,
BI_CMYK = 0x0b,
BI_CMYKRLE8 = 0x0c,
BI_CMYKRLE4 = 0x0d
};
struct bmp_header_s {
struct bmp_file_header_s {
uint16_t bmp_signature;
@ -57,15 +70,6 @@ protected:
uint32_t bmp_pixels_per_meter_y;
uint32_t bmp_colors_used;
uint32_t bmp_important_colors;
uint32_t bmp_red_mask;
uint32_t bmp_green_mask;
uint32_t bmp_blue_mask;
uint32_t bmp_alpha_mask;
uint32_t bmp_cs_type;
uint32_t bmp_endpoints[9];
uint32_t bmp_gamma_red;
uint32_t bmp_gamma_green;
uint32_t bmp_gamma_blue;
} bmp_info_header;
};