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.

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

Reject RLE-compressed BMP files #8735

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Conversation

dhalbert
Copy link
Collaborator

Fixes #7450. Fixes #8374.

OnDiskBitmap did not check for compression values 1 and 2, which indicate RLE compression.

Tested with files from #8374 on a Matrix Portal S3. NYJ.bmp throws the new exception, as expected: it is RLE-compressed. NYJ1.bmp is not compressed and works.

@dhalbert dhalbert requested review from tannewt and jepler December 20, 2023 16:36
@dhalbert
Copy link
Collaborator Author

I have to get 36 bytes back in metro m0 pinyin:

253732 bytes used, -36 bytes free in flash firmware space out of 253696 bytes (247.75kB).

tannewt
tannewt previously approved these changes Dec 20, 2023
Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@dhalbert
Copy link
Collaborator Author

Some errors that were paraphrases of each other were consolidated to a single message. Some qstr refactoring was also done, though this sometimes produces little or no size improvement.

@dhalbert dhalbert requested a review from tannewt December 20, 2023 21:57
Copy link
Member

@jepler jepler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@dhalbert dhalbert merged commit bb178eb into adafruit:8.2.x Dec 22, 2023
440 checks passed
@dhalbert dhalbert deleted the no-rle-bmp branch December 22, 2023 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants