Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for various BMP headers and color depths #1435

Merged
merged 12 commits into from
Jun 10, 2019
Merged

Add support for various BMP headers and color depths #1435

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ca744e
Add support for BMP color palette
Hakerh400 Jun 5, 2019
1c2a47b
Some corrections
Hakerh400 Jun 5, 2019
f37329a
V3 header
Hakerh400 Jun 6, 2019
b295125
Fix overlapping structures
Hakerh400 Jun 6, 2019
e2de21f
V5 header and sRGB color space
Hakerh400 Jun 6, 2019
5b673f8
4-bit and 8-bit color depth
Hakerh400 Jun 6, 2019
2c957be
Allow inconsistent file size as long as it doesn't exceed the buffer
Hakerh400 Jun 6, 2019
d6e57ed
Update the changelog
Hakerh400 Jun 6, 2019
cb34f6e
Update comments
Hakerh400 Jun 6, 2019
cb293ee
Inline methods and parse alpha mask only for V3+ header
Hakerh400 Jun 7, 2019
621257a
Change parameter name
Hakerh400 Jun 7, 2019
385d71d
Simplify checks
Hakerh400 Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Simplify checks
  • Loading branch information
@Hakerh400
Hakerh400 committed Jun 7, 2019
commit 385d71dc59192b89b85d171dccd5b99888720352
30 changes: 10 additions & 20 deletions src/bmp/BMPParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ using namespace BMPParser;
#define U4UC() get<uint32_t, false>()

#define CHECK_OVERRUN(ptr, size, type) \
if(ptr + (size) - data > len){ \
if((ptr) + (size) - data > len){ \
setErr("unexpected end of file"); \
return type(); \
}
Expand Down Expand Up @@ -145,11 +145,11 @@ void Parser::parse(uint8_t *buf, int bufSize, uint8_t *format){
auto isComprValid = compr == 0 || compr == 3;
EX(!isComprValid, temp);

// Uncompressed 16-bit color is not supported
EU(compr == 0 && bpp == 16, "uncompressed 16-bit color");

// Also ensure that BI_BITFIELDS appears only with 16-bit or 32-bit color
if(compr == 3)
E(bpp != 16 && bpp != 32, "compression BI_BITFIELDS can be used only with 16-bit and 32-bit color depth");
// Ensure that BI_BITFIELDS appears only with 16-bit or 32-bit color
E(compr == 3 && !(bpp == 16 || bpp == 32), "compression BI_BITFIELDS can be used only with 16-bit and 32-bit color depth");

// Size of the image data
imgdSize = U4();
Expand All @@ -159,40 +159,30 @@ void Parser::parse(uint8_t *buf, int bufSize, uint8_t *format){

// Number of colors in the palette or 0 if no palette is present
palColNum = U4();
EU(palColNum && bpp > 8, "color palette and bit depth combination");
if(palColNum) paletteStart = data + dibSize + 14;

// Number of important colors used or 0 if all colors are important (generally ignored)
skip(4);

if(infoHeader >= 2){
Hakerh400 marked this conversation as resolved.
Show resolved Hide resolved
// If BI_BITFIELDS are used, calculate masks, otherwise ignore them
if(compr == 3){
// Convert each mask to bit offset for faster shifting
calcMaskShift(redShift, redMask, redMultp);
calcMaskShift(greenShift, greenMask, greenMultp);
calcMaskShift(blueShift, blueMask, blueMultp);
if(infoHeader >= 3) calcMaskShift(alphaShift, alphaMask, alphaMultp);
else skip(4);
if(status == Status::ERROR) return;
}else{
skip(16);
}

if(infoHeader >= 4){
if(!palColNum){
// Ensure that the color space is LCS_WINDOWS_COLOR_SPACE or sRGB
string colSpace = getStr(4, 1);
EU(colSpace != "Win " && colSpace != "sRGB", "color space \"" + colSpace + "\"");
}else{
skip(4);
}

// The rest 48 bytes are ignored for LCS_WINDOWS_COLOR_SPACE and sRGB
skip(48);
// Ensure that the color space is LCS_WINDOWS_COLOR_SPACE or sRGB
if(infoHeader >= 4 && !palColNum){
string colSpace = getStr(4, 1);
EU(colSpace != "Win " && colSpace != "sRGB", "color space \"" + colSpace + "\"");
}
}

if(palColNum)
paletteStart = ptr;
}

// Skip to the image data (there may be other chunks between, but they are optional)
Expand Down