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

Refilter frames

Browse source
This commit is contained in:
Andrew 2025-01-14 20:20:49 +13:00 committed by Alejandro González
parent 09c4851118
commit cca23b5479
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/lib.rs
View file

@ -725,7 +725,11 @@ fn recompress_frames(png: &mut PngData, opts: &Options, deadline: Arc<Deadline>)
if !opts.idat_recoding || png.frames.is_empty() { if !opts.idat_recoding || png.frames.is_empty() {
return; return;
} }
let buffer_size = png.raw.ihdr.raw_data_size(); // Use the same filter chosen for the main image
// No filter means we failed to optimise the main image and we shouldn't bother trying here
let Some(filter) = png.filter else {
return;
};
png.frames png.frames
.par_iter_mut() .par_iter_mut()
.with_max_len(1) .with_max_len(1)
@ -734,9 +738,13 @@ fn recompress_frames(png: &mut PngData, opts: &Options, deadline: Arc<Deadline>)
if deadline.passed() { if deadline.passed() {
return; return;
} }
if let Ok(data) = deflate::inflate(&frame.data, buffer_size).and_then(|data| { let mut ihdr = png.raw.ihdr.clone();
ihdr.width = frame.width;
ihdr.height = frame.height;
if let Ok(data) = PngImage::new(ihdr, &frame.data).and_then(|image| {
let filtered = image.filter_image(filter, opts.optimize_alpha);
let max_size = AtomicMin::new(Some(frame.data.len() - 1)); let max_size = AtomicMin::new(Some(frame.data.len() - 1));
opts.deflate.deflate(&data, &max_size) opts.deflate.deflate(&filtered, &max_size)
}) { }) {
debug!( debug!(
"Recompressed fdAT #{:<2}: {} ({} bytes decrease)", "Recompressed fdAT #{:<2}: {} ({} bytes decrease)",