Fix BMP palette loading #386
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hartwork
requested changes
Jan 25, 2025
| @@ -341,12 +343,14 @@ namespace LV { | |||
| return nullptr; | |||
| } | |||
|
|
|||
| if (bi_compression > 3) { | |||
| if (bi_compression >= 3) { | |||
There was a problem hiding this comment.
I'm not a big fan of approach "undocumented unnamed magic number". This seems to be 3 because BI_BITFIELDS == 3 in Windows. If we cannot use that constant without including Windows headers, let's either (a) add a good comment or (b) make our own copy of that constant (or both)?
| visual_log (VISUAL_LOG_ERROR, "Bitmap uses an invalid or unsupported compression scheme"); | ||
| fp.seekg (saved_stream_pos); | ||
| return nullptr; | ||
| } | ||
|
|
||
| fp.seekg (dib_header_pos + std::streampos {bi_size}, std::ios::beg); |
There was a problem hiding this comment.
Let's add comments (or make otherwise more obvious) that…
- that we're jumping to the start of the palette here (— we could also move the line_below_ comment
/* Load the palette */to better show it's part of palette loading?) - that this is the correct value (only) because we ruled out both
BI_BITFIELDSandBI_ALPHABITFIELDSearlier (referring to the first paragraph at https://en.wikipedia.org/wiki/BMP_file_format#Color_table)
There was a problem hiding this comment.
Good idea, let me make that change.
kaixiong
merged commit 1788dec
into
add-palette-iteration-comparison-api
6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the palette loading in the BMP image loader.
The bug is due to the loader reading from the wrong file offset.
BMP files begin with a fixed size file header and a DIB (device-independent bitmap) header that has been continually extended over the years. According to Wikipedia, there are 8 versions of the DIB header with differing sizes. They vary from the original 12 bytes to as large as 124 bytes in recent revisions. Each version subsumes the fields of previous versions. The colour table i.e. palette is found right after [1].
The loader currently reads part of the DIB header to get what it needs and proceeds to read the palette entries without accounting for the actual DIB header size. This patch fixes this by seeking to the end of the DIB header, utilizing the size given by the header's first field.
[1] Except when the compression schemes
BI_BITFIELDSorBI_ALPHABITFIELDSare used, which isn't supported by the loader.