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

Fix secondary palette sort

Browse source 
This was only working if the input image was already indexed
This commit is contained in:
Andrew 2024-02-18 20:05:56 +13:00 committed by andrews05
parent 0608ab9cab
commit a426fabe13
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/reduction/mod.rs
View file

@ -114,6 +114,7 @@ pub(crate) fn perform_reductions(
} }
// Attempt to reduce to indexed // Attempt to reduce to indexed
// Keep the existing `png` var in case it is grayscale - we can test both for depth reduction later
let mut indexed = None; let mut indexed = None;
if opts.color_type_reduction && !deadline.passed() { if opts.color_type_reduction && !deadline.passed() {
if let Some(reduced) = reduced_to_indexed(&png, opts.grayscale_reduction) { if let Some(reduced) = reduced_to_indexed(&png, opts.grayscale_reduction) {
@ -133,7 +134,8 @@ pub(crate) fn perform_reductions(
// Attempt to sort the palette using an alternative method // Attempt to sort the palette using an alternative method
if !cheap && opts.palette_reduction && !deadline.passed() { if !cheap && opts.palette_reduction && !deadline.passed() {
if let Some(reduced) = sorted_palette_battiato(&png) { // Make sure we use the `indexed` var if it exists
if let Some(reduced) = sorted_palette_battiato(indexed.as_ref().unwrap_or(&png)) {
eval.try_image(Arc::new(reduced)); eval.try_image(Arc::new(reduced));
evaluation_added = true; evaluation_added = true;
} }