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

Pull interlacing out of evaluator

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

39
src/lib.rs
View file

@ -491,7 +491,16 @@ fn optimize_png(
perform_strip(png, opts); perform_strip(png, opts);
let stripped_png = png.clone(); let stripped_png = png.clone();
// If alpha optimization is enabled, first perform a black alpha reduction // Interlacing is not part of the evaluator trials but must be done first to evaluate the rest correctly
let mut reduction_occurred = false;
if let Some(interlacing) = opts.interlace {
if let Some(reduced) = png.raw.change_interlacing(interlacing) {
png.raw = Arc::new(reduced);
reduction_occurred = true;
}
}
// If alpha optimization is enabled, perform a black alpha reduction before evaluating reductions
// This can allow reductions from alpha to indexed which may not have been possible otherwise // This can allow reductions from alpha to indexed which may not have been possible otherwise
if opts.optimize_alpha { if opts.optimize_alpha {
if let Some(reduced) = cleaned_alpha_channel(&png.raw) { if let Some(reduced) = cleaned_alpha_channel(&png.raw) {
@ -511,11 +520,12 @@ fn optimize_png(
false, false,
); );
perform_reductions(png.raw.clone(), opts, &deadline, &eval); perform_reductions(png.raw.clone(), opts, &deadline, &eval);
let (reduction_occurred, mut eval_filter) = if let Some(result) = eval.get_best_candidate() { let mut eval_filter = if let Some(result) = eval.get_best_candidate() {
*png = result.image; *png = result.image;
(result.is_reduction, Some(result.filter)) reduction_occurred = true;
Some(result.filter)
} else { } else {
(false, None) None
}; };
if opts.idat_recoding || reduction_occurred { if opts.idat_recoding || reduction_occurred {
@ -687,22 +697,9 @@ fn perform_reductions(
eval: &Evaluator, eval: &Evaluator,
) { ) {
// The eval baseline will be set from the original png only if we attempt any reductions // The eval baseline will be set from the original png only if we attempt any reductions
let mut baseline = Some(png.clone()); let baseline = png.clone();
let mut reduction_occurred = false; let mut reduction_occurred = false;
// must be done first to evaluate rest with the correct interlacing
if let Some(interlacing) = opts.interlace {
if let Some(reduced) = png.change_interlacing(interlacing) {
png = Arc::new(reduced);
eval.try_image(png.clone());
// If we're interlacing, we have to accept a possible file size increase
baseline = None;
}
if deadline.passed() {
return;
}
}
if opts.palette_reduction { if opts.palette_reduction {
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);
@ -751,10 +748,8 @@ fn perform_reductions(
} }
} }
if let Some(baseline) = baseline { if reduction_occurred {
if reduction_occurred { eval.set_baseline(baseline);
eval.set_baseline(baseline);
}
} }
} }