tuxmain/qoi
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix an edge case bug with non-reference encoding

Browse source
This commit is contained in:
Ivan Smirnov 2022-01-04 16:53:28 +03:00
parent 2999dc5a50
commit d5cfc60013
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/encode.rs
View file

@ -15,7 +15,7 @@ use crate::types::{Channels, ColorSpace};
use crate::utils::GenericWriter; use crate::utils::GenericWriter;
use crate::utils::{unlikely, BytesMut, Writer}; use crate::utils::{unlikely, BytesMut, Writer};
#[allow(clippy::cast_possible_truncation, unused_assignments)] #[allow(clippy::cast_possible_truncation, unused_assignments, unused_variables)]
fn encode_impl<W: Writer, const N: usize>(mut buf: W, data: &[u8]) -> Result<usize> fn encode_impl<W: Writer, const N: usize>(mut buf: W, data: &[u8]) -> Result<usize>
where where
Pixel<N>: SupportedChannels, Pixel<N>: SupportedChannels,
@ -28,6 +28,7 @@ where
let mut hash_prev = Pixel::<N>::new().with_a(0xff).hash_index(); let mut hash_prev = Pixel::<N>::new().with_a(0xff).hash_index();
let mut run = 0_u8; let mut run = 0_u8;
let mut px = Pixel::<N>::new().with_a(0xff); let mut px = Pixel::<N>::new().with_a(0xff);
let mut index_allowed = N == 3;
let n_pixels = data.len() / N; let n_pixels = data.len() / N;
@ -44,7 +45,7 @@ where
#[cfg(not(feature = "reference"))] #[cfg(not(feature = "reference"))]
{ {
// credits for the original idea: @zakarumych // credits for the original idea: @zakarumych
buf = buf.write_one(if run == 1 && i != 1 { buf = buf.write_one(if run == 1 && index_allowed {
QOI_OP_INDEX | (hash_prev as u8) QOI_OP_INDEX | (hash_prev as u8)
} else { } else {
QOI_OP_RUN | (run - 1) QOI_OP_RUN | (run - 1)
@ -56,6 +57,7 @@ where
} }
run = 0; run = 0;
} }
index_allowed = true;
let px_rgba = px.as_rgba(0xff); let px_rgba = px.as_rgba(0xff);
hash_prev = px_rgba.hash_index(); hash_prev = px_rgba.hash_index();
let index_px = &mut index[hash_prev as usize]; let index_px = &mut index[hash_prev as usize];