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

Show file tree
Hide file tree
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
Next Next commit
Change parameter name
  • Loading branch information
@Hakerh400
Hakerh400 committed Jun 7, 2019
commit 621257ada0da3c2db3ecb72f128ed2d5c07cb936
6 changes: 3 additions & 3 deletions src/bmp/BMPParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ template <typename T, bool check> inline T Parser::get(){
return val;
}

template <typename T, bool check> inline T Parser::get(uint8_t* ptr){
template <typename T, bool check> inline T Parser::get(uint8_t* pointer){
if(check)
CHECK_OVERRUN(ptr, sizeof(T), T);
T val = *(T*)ptr;
CHECK_OVERRUN(pointer, sizeof(T), T);
T val = *(T*)pointer;
return val;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bmp/BMPParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace BMPParser{
std::string op = "";

template <typename T, bool check=true> inline T get();
template <typename T, bool check=true> inline T get(uint8_t* ptr);
template <typename T, bool check=true> inline T get(uint8_t* pointer);
std::string getStr(int len, bool reverse=false);
inline void skip(int len);
void calcMaskShift(uint32_t& shift, uint32_t& mask, double& multp);
Expand Down