Skip to content

Improvements to color cache #101

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

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Improvements to color cache #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions src/lossless.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ impl<R: BufRead> LosslessDecoder<R> {
.color_cache
.as_mut()
.ok_or(DecodingError::BitStreamError)?;
data[index * 4..][..4].copy_from_slice(&color_cache.lookup(key.into())?);
data[index * 4..][..4].copy_from_slice(&color_cache.lookup(key.into()));
index += 1;
}
}
Expand Down Expand Up @@ -665,6 +665,7 @@ struct ColorCache {
}

impl ColorCache {
#[inline(always)]
fn insert(&mut self, color: [u8; 4]) {
let [r, g, b, a] = color;
let color_u32 =
Expand All @@ -673,11 +674,9 @@ impl ColorCache {
self.color_cache[index as usize] = color;
}

fn lookup(&self, index: usize) -> Result<[u8; 4], DecodingError> {
match self.color_cache.get(index) {
Some(&value) => Ok(value),
None => Err(DecodingError::BitStreamError),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This branch should actually be unreachable because only valid indexes can be represented in the bitstream, so I've converted it to a panic

}
#[inline(always)]
fn lookup(&self, index: usize) -> [u8; 4] {
self.color_cache[index]
}
}

Expand Down