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

Show zopfli iterations

Browse source
This commit is contained in:
Andrew 2025-01-24 17:34:28 +13:00
parent d8da0b2423
commit 00bff4d06d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/deflate/mod.rs
View file

@ -49,9 +49,9 @@ impl Display for Deflaters {
#[inline] #[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Libdeflater { compression } => Display::fmt(compression, f), Self::Libdeflater { compression } => Display::fmt(&format!("zc = {}", compression), f),
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
Self::Zopfli { .. } => Display::fmt("zopfli", f), Self::Zopfli { iterations } => Display::fmt(&format!("zopfli, zi = {}", iterations), f),
} }
} }
} }

6
src/lib.rs
View file

@ -474,7 +474,7 @@ fn optimize_raw(
if max_size.map_or(true, |max_size| result.estimated_output_size() < max_size) { if max_size.map_or(true, |max_size| result.estimated_output_size() < max_size) {
debug!("Found better result:"); debug!("Found better result:");
debug!(" zc = {} f = {}", deflater, result.filter); debug!(" {}, f = {}", deflater, result.filter);
return Some(result); return Some(result);
} }
None None
@ -525,7 +525,7 @@ fn perform_trials(
let mut result = eval_result?; let mut result = eval_result?;
// Recompress with the main deflater // Recompress with the main deflater
debug!("Trying filter {}, zc = {}", result.filter, opts.deflate); debug!("Trying filter {} with {}", result.filter, opts.deflate);
match opts.deflate.deflate(&result.filtered, max_size) { match opts.deflate.deflate(&result.filtered, max_size) {
Ok(idat_data) => { Ok(idat_data) => {
result.idat_data = idat_data; result.idat_data = idat_data;
@ -552,7 +552,7 @@ fn perform_trials(
} }
} }
debug!("Trying {} filters, zc = {}", filters.len(), opts.deflate); debug!("Trying {} filters with {}", filters.len(), opts.deflate);
let eval = Evaluator::new(deadline, filters, opts.deflate, opts.optimize_alpha); let eval = Evaluator::new(deadline, filters, opts.deflate, opts.optimize_alpha);
if let Some(max_size) = max_size { if let Some(max_size) = max_size {
eval.set_best_size(max_size); eval.set_best_size(max_size);

4
tests/flags.rs
View file

@ -181,9 +181,9 @@ fn verbose_mode() {
" 8-bit RGB, non-interlaced", " 8-bit RGB, non-interlaced",
" IDAT size = 113794 bytes", " IDAT size = 113794 bytes",
" File size = 114708 bytes", " File size = 114708 bytes",
"Trying 1 filters, zc = ", "Trying 1 filters with zc = ",
"Found better result:", "Found better result:",
" zc = 11 f = None", " zc = 11, f = None",
" IDAT size = ", " IDAT size = ",
" file size = ", " file size = ",
]; ];