ICO: Change select best entry logic#3045
Draft
mpospelova wants to merge 1 commit into
Draft
Conversation
RunDevelopment
left a comment
RunDevelopment
left a comment
Member
There was a problem hiding this comment.
Thanks for working on this!
LGTM; Just one minor thing. Then this is ready to go.
Comment on lines
208
to
210
| if spec == SpecCompliance::Strict && bits_per_pixel > 256 { | ||
| return Err(DecoderError::IcoEntryTooManyBitsPerPixelOrHotspot.into()); | ||
| } |
Member
There was a problem hiding this comment.
Could you please move this back up to where bits_per_pixel is defined? This is a check for the raw data of the file, not on the value we infer.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
As discussed in #3032, this PR updates the best entry selection logic to match the one from Chrome: first, compare the area, and then bpp. This PR also adds logic to fill in missing bpp values (use
color_countto setbits_per_pixel = ceil(log2(color_count))).