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

Combine palette reduction and sorting

Browse source
This commit is contained in:
Andrew 2023-09-22 13:59:51 +12:00 committed by andrews05
parent 904beeec6b
commit 6763eea1e3
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/reduction/mod.rs
View file

@ -68,18 +68,29 @@ pub(crate) fn perform_reductions(
} }
} }
// Attempt to reduce the palette
// This may change bytes but should always be beneficial
if opts.palette_reduction && !deadline.passed() {
if let Some(reduced) = reduced_palette(&png, opts.optimize_alpha) {
png = Arc::new(reduced);
}
}
// Now retain the current png for the evaluator baseline // Now retain the current png for the evaluator baseline
// It will only be entered into the evaluator if there are also others to evaluate // It will only be entered into the evaluator if there are also others to evaluate
let mut baseline = png.clone(); let mut baseline = png.clone();
// Attempt to reduce and sort the palette
if opts.palette_reduction && !deadline.passed() {
if let Some(reduced) = reduced_palette(&png, opts.optimize_alpha) {
png = Arc::new(reduced);
// If the palette was reduced but the data is unchanged then this should become the baseline
if png.data == baseline.data {
baseline = png.clone();
}
}
if let Some(reduced) = sorted_palette(&png) {
png = Arc::new(reduced);
}
// If either action changed the data then enter this into the evaluator
if !Arc::ptr_eq(&png, &baseline) {
eval.try_image(png.clone());
evaluation_added = true;
}
}
// Attempt alpha removal // Attempt alpha removal
if opts.color_type_reduction && !deadline.passed() { if opts.color_type_reduction && !deadline.passed() {
if let Some(reduced) = reduced_alpha_channel(&png, opts.optimize_alpha) { if let Some(reduced) = reduced_alpha_channel(&png, opts.optimize_alpha) {
@ -95,15 +106,6 @@ pub(crate) fn perform_reductions(
} }
} }
// Attempt to sort the palette
if opts.palette_reduction && !deadline.passed() {
if let Some(reduced) = sorted_palette(&png) {
png = Arc::new(reduced);
eval.try_image(png.clone());
evaluation_added = true;
}
}
// Attempt to convert from indexed to channels // Attempt to convert from indexed to channels
// This may give a better result due to dropping the PLTE chunk // This may give a better result due to dropping the PLTE chunk
if !cheap && opts.color_type_reduction && !deadline.passed() { if !cheap && opts.color_type_reduction && !deadline.passed() {