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

Display interlacing in format

Browse source
This commit is contained in:
Andrew 2022-12-08 17:13:53 +13:00
parent 84ba411c85
commit cd98a11c4c
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/lib.rs
View file

@ -470,20 +470,7 @@ fn optimize_png(
" {}x{} pixels, PNG format", " {}x{} pixels, PNG format",
png.raw.ihdr.width, png.raw.ihdr.height png.raw.ihdr.width, png.raw.ihdr.height
); );
if let Some(ref palette) = png.raw.palette { report_format(" ", &png.raw);
info!(
" {} bits/pixel, {} colors in palette",
png.raw.ihdr.bit_depth,
palette.len()
);
} else {
info!(
" {}x{} bits/pixel, {:?}",
png.raw.channels_per_pixel(),
png.raw.ihdr.bit_depth,
png.raw.ihdr.color_type
);
}
info!(" IDAT size = {} bytes", idat_original_size); info!(" IDAT size = {} bytes", idat_original_size);
info!(" File size = {} bytes", file_original_size); info!(" File size = {} bytes", file_original_size);
@ -528,6 +515,10 @@ fn optimize_png(
None None
}; };
if reduction_occurred {
report_format("Reducing image to ", &png.raw);
}
if opts.idat_recoding || reduction_occurred { if opts.idat_recoding || reduction_occurred {
let mut filters = opts.filter.clone(); let mut filters = opts.filter.clone();
let fast_eval = opts.fast_evaluation && (filters.len() > 1 || eval_filter.is_some()); let fast_eval = opts.fast_evaluation && (filters.len() > 1 || eval_filter.is_some());
@ -704,7 +695,6 @@ fn perform_reductions(
if let Some(reduced) = reduced_palette(&png, opts.optimize_alpha) { if let Some(reduced) = reduced_palette(&png, opts.optimize_alpha) {
png = Arc::new(reduced); png = Arc::new(reduced);
eval.try_image(png.clone()); eval.try_image(png.clone());
report_reduction(&png);
reduction_occurred = true; reduction_occurred = true;
} }
if deadline.passed() { if deadline.passed() {
@ -726,7 +716,6 @@ fn perform_reductions(
eval.try_image(Arc::new(reduced)); eval.try_image(Arc::new(reduced));
} }
} }
report_reduction(&png);
reduction_occurred = true; reduction_occurred = true;
} }
if deadline.passed() { if deadline.passed() {
@ -740,7 +729,6 @@ fn perform_reductions(
{ {
png = Arc::new(reduced); png = Arc::new(reduced);
eval.try_image(png.clone()); eval.try_image(png.clone());
report_reduction(&png);
reduction_occurred = true; reduction_occurred = true;
} }
if deadline.passed() { if deadline.passed() {
@ -841,20 +829,24 @@ impl Deadline {
} }
} }
/// Display the status of the image data after a reduction has taken place /// Display the format of the image data
fn report_reduction(png: &PngImage) { fn report_format(prefix: &str, png: &PngImage) {
if let Some(ref palette) = png.palette { if let Some(ref palette) = png.palette {
info!( info!(
"Reducing image to {} bits/pixel, {} colors in palette", "{}{} bits/pixel, {} colors in palette ({})",
prefix,
png.ihdr.bit_depth, png.ihdr.bit_depth,
palette.len() palette.len(),
png.ihdr.interlaced
); );
} else { } else {
info!( info!(
"Reducing image to {}x{} bits/pixel, {}", "{}{}x{} bits/pixel, {} ({})",
prefix,
png.channels_per_pixel(), png.channels_per_pixel(),
png.ihdr.bit_depth, png.ihdr.bit_depth,
png.ihdr.color_type png.ihdr.color_type,
png.ihdr.interlaced
); );
} }
} }