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

Break when best possible filter result found

Browse source
This commit is contained in:
Andrew 2024-11-26 21:22:10 +13:00 committed by andrews05
parent 1936861b91
commit f6842f24fb
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/png/mod.rs
View file

@ -341,9 +341,16 @@ impl PngImage {
let mut prev_line = Vec::new(); let mut prev_line = Vec::new();
let mut prev_pass: Option<u8> = None; let mut prev_pass: Option<u8> = None;
let mut f_buf = Vec::new(); let mut f_buf = Vec::new();
let mut best_possible = 0;
for line in self.scan_lines(false) { for line in self.scan_lines(false) {
if prev_pass != line.pass || line.data.len() != prev_line.len() { if prev_pass != line.pass || line.data.len() != prev_line.len() {
prev_line = vec![0; line.data.len()]; prev_line = vec![0; line.data.len()];
// Calculate the best possible entropy for this pass
best_possible = match filter {
RowFilter::Entropy => ilog2i(line.data.len() as u32 + 1) as i32,
RowFilter::BigEnt => ilog2i(line.data.len() as u32) as i32,
_ => 0,
}
} }
// Alpha optimisation may alter the line data, so we need a mutable copy of it // Alpha optimisation may alter the line data, so we need a mutable copy of it
let mut line_data = line.data.to_vec(); let mut line_data = line.data.to_vec();
@ -383,6 +390,10 @@ impl PngImage {
best_size = size; best_size = size;
std::mem::swap(&mut best_line, &mut f_buf); std::mem::swap(&mut best_line, &mut f_buf);
best_line_raw.clone_from(&line_data); best_line_raw.clone_from(&line_data);
if size == 0 {
// Best possible result
break;
}
} }
} }
} }
@ -406,6 +417,10 @@ impl PngImage {
best_size = size; best_size = size;
std::mem::swap(&mut best_line, &mut f_buf); std::mem::swap(&mut best_line, &mut f_buf);
best_line_raw.clone_from(&line_data); best_line_raw.clone_from(&line_data);
if size == best_possible {
// Best possible result
break;
}
} }
} }
} }
@ -425,6 +440,10 @@ impl PngImage {
best_size = size; best_size = size;
std::mem::swap(&mut best_line, &mut f_buf); std::mem::swap(&mut best_line, &mut f_buf);
best_line_raw.clone_from(&line_data); best_line_raw.clone_from(&line_data);
if size == 1 {
// Best possible result
break;
}
} }
} }
} }
@ -445,6 +464,10 @@ impl PngImage {
best_size = size; best_size = size;
std::mem::swap(&mut best_line, &mut f_buf); std::mem::swap(&mut best_line, &mut f_buf);
best_line_raw.clone_from(&line_data); best_line_raw.clone_from(&line_data);
if size == best_possible {
// Best possible result
break;
}
} }
} }
} }