danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interlacing fixes (#182)

Browse source 
* Fix decoding interlaced images with height or width <= 2

* Add Issue 175 test case

* Deinterlace tiny images correctly
This commit is contained in:
Felix Hanau 2019-07-24 14:16:13 +01:00 committed by Josh Holmer
parent 4cb26d462e
commit 4adcc5e14a
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/interlace.rs
View file

@ -135,6 +135,19 @@ pub fn deinterlace_image(png: &PngImage) -> PngImage {
if current_pass == 3 && png.ihdr.height <= 4 {
current_pass += 1;
}
if current_pass == 4 && png.ihdr.width <= 2 {
current_pass += 1;
}
if current_pass == 5 && png.ihdr.height <= 2 {
current_pass += 1;
}
if current_pass == 6 && png.ihdr.width == 1 {
current_pass += 1;
}
if current_pass == 7 && png.ihdr.height == 1 {
break;
}
pass_constants = interlaced_constants(current_pass);
current_y = pass_constants.y_shift as usize;
}

18
tests/regression.rs
View file

@ -634,4 +634,20 @@ fn issue_175() {
ColorType::Grayscale,
BitDepth::One,
);
}
}
#[test]
fn issue_182() {
let input = "tests/files/issue-175.png";
let (output, mut opts) = get_opts(Path::new(input));
opts.interlace = Some(0);
test_it_converts(
input,
Some((output, opts)),
ColorType::Grayscale,
BitDepth::One,
ColorType::Grayscale,
BitDepth::One,
);
}